绩效统计修改

assets/js/controllers/report/chargingCtrl.js

@@ -42,7 +42,7 @@ app.controller("chartingCtrl", [
     // });
     // var apple_selected, tree, treedata_avm, treedata_geography;
     // var workspace = {};
-    $scope.parameters = {};
+    $scope.parameters = {userIds: []};
     $scope.allMoney = 0;
     $scope.category = {};
     $scope.reportName = "计费";
@@ -86,6 +86,25 @@ app.controller("chartingCtrl", [
     //     incidentCount: 12,
     //     name: "王磊"
     // }]
+    //受理人，处理人
+    var getUser = function (fieldatas) {
+      api_user_data.fetchDataList('user', fieldatas).then(function (data) {
+        $scope.userList = data.list;
+      });
+  }
+    //处理人过滤
+    $scope.onChangehandling = function (key = '') {
+      var filuser = {
+          "idx": 0,
+          "sum": 10,
+          "user": {
+              "name": key,
+              'selectType': "pinyin_qs",
+              engineer: 1,
+          }
+      }
+      getUser(filuser);
+    }
     // 切换院区
     $scope.changeBranch = function(){
       console.log($scope.parameters.branch);
@@ -219,6 +238,7 @@ app.controller("chartingCtrl", [
           startTime: $scope.starttimes,
           finishTime: $scope.endtimes,
           weight: $scope.allMoney,
+          userIds: $scope.parameters.userIds.length ? $scope.parameters.userIds.map(v => v.id).toString() : undefined
         })
         .then(function (response) {
           if (response) {

assets/views/report/charging.html

@@ -52,7 +52,7 @@
             <div class="row" style="padding-right: 0px !important;">
                 <form class="col-xs-12 col-sm-12 form-inline schesearchsize">
                     <div class="col-xs-12 col-sm-12">
-                        <span class="panel-title text-dark">日期选择:</span>
+                        <span class="panel-title text-dark">日期选择：</span>
                         <div class="form-group">
                             <input type="text" class="form-control" datepicker-popuptime="yyyy-MM-dd" ng-model="parameters.paramDateFrom" max-date="parameters.paramDateTo" is-open="startOpened" hour-time=true ng-init="startOpened = false" show-button-bar="false" ng-click="startOpen($event)"
                             />
@@ -104,12 +104,24 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <span class="panel-title text-dark pull-left">计费：</span>
+                            <span class="panel-title text-dark pull-left">发放金额：</span>
                             <div class="pull-right" style="width:158px">
                                 <input class="form-control" style="border-radius: 4px 0px 0px 4px !important" type="number" min="0" max="1000000000" ng-minlength="1" ng-maxlength="1000" ng-model="allMoney">
                             </div>
                         </div>
-                        
+                        <div class="form-group">
+                            <div class="panel-title text-dark pull-left">排除人员：</div>
+                            <ui-select class="pull-right" ng-model="parameters.userIds" theme="bootstrap" multiple style="width: 500px;">
+                                <ui-select-match placeholder="请选择排除人员">
+                                    {{$item.name}}
+                                </ui-select-match>
+                                <ui-select-choices repeat="item in userList"
+                                    refresh="onChangehandling($select.search)">
+                                    <div ng-bind-html="item.name | highlight: $select.search"></div>
+                                </ui-select-choices>
+                            </ui-select>
+                        </div>
+
                         <div class="form-group pull-right">
                             <div class="input-group">
                                 <div class="form-group margin-right-5">
@@ -136,10 +148,10 @@
                                 <thread>
                                     <tr class="grayground incidentsearchsize">
                                         <th ng-class="header.thclass" style="text-align: center;">处理人</th>
-                                        <th ng-class="header.thclass" style="text-align: center;">事件数（条）</th>
-                                        <th ng-class="header.thclass" style="text-align: center;">工时</th>
-                                        <th ng-class="header.thclass" style="text-align: center;">工时占比</th>
-                                        <th ng-class="header.thclass" style="text-align: center;">计费（元）</th>
+                                        <th ng-class="header.thclass" style="text-align: center;">工单数</th>
+                                        <th ng-class="header.thclass" style="text-align: center;">工价</th>
+                                        <th ng-class="header.thclass" style="text-align: center;">占比</th>
+                                        <th ng-class="header.thclass" style="text-align: center;">获得金额</th>
                                     </tr>
                                 </thread>
                                 <tbody class="tbody-hover">