Browse Source

三方公司统计

seimin 11 months ago
parent
commit
79738e8dab

+ 11 - 1
assets/js/controllers/report/event_formCtrl.js

@@ -522,6 +522,10 @@ app.controller('event_formCtrl', ["$scope", "$rootScope", "$state", "$timeout",
522
             value: $scope.groupSelected[1]//选中
522
             value: $scope.groupSelected[1]//选中
523
         };
523
         };
524
         $scope.own.duty && $scope.tap == 'CLRZ' && $scope.mdxquery();
524
         $scope.own.duty && $scope.tap == 'CLRZ' && $scope.mdxquery();
525
+
526
+        $scope.companySelected = [];
527
+        $scope.companySelectedOne.value = {id:-1,name:''};
528
+        $scope.own.duty && $scope.tap == 'SFGS' && $scope.mdxquery();
525
     }
529
     }
526
     // 获取院区
530
     // 获取院区
527
     $scope.branchs = [];
531
     $scope.branchs = [];
@@ -981,12 +985,16 @@ app.controller('event_formCtrl', ["$scope", "$rootScope", "$state", "$timeout",
981
                 api_user_data.fetchDataList('company', {
985
                 api_user_data.fetchDataList('company', {
982
                     idx: 0,
986
                     idx: 0,
983
                     sum: 1000,
987
                     sum: 1000,
984
-                    company: {}
988
+                    company: {
989
+                        "duty": $scope.own.duty || undefined,
990
+                    }
985
                 }).then(res => {
991
                 }).then(res => {
986
                     if (res.status == 200) {
992
                     if (res.status == 200) {
987
                         $scope.companySelected = res.list;//下拉框数据
993
                         $scope.companySelected = res.list;//下拉框数据
988
                         // 请求列表
994
                         // 请求列表
989
                         var postData = {
995
                         var postData = {
996
+                            "dutyId": $scope.own.duty ? $scope.own.duty.id : undefined,
997
+                            "branchId": $scope.own.duty ? undefined: ($scope.own.branch ? $scope.own.branch.id : undefined),
990
                             "startTime": moment($scope.starttimesModel).format('YYYY-MM-DD'),
998
                             "startTime": moment($scope.starttimesModel).format('YYYY-MM-DD'),
991
                             "endTime": moment($scope.endtimesModel).format('YYYY-MM-DD'),
999
                             "endTime": moment($scope.endtimesModel).format('YYYY-MM-DD'),
992
                             "sortData": name,
1000
                             "sortData": name,
@@ -1147,6 +1155,8 @@ app.controller('event_formCtrl', ["$scope", "$rootScope", "$state", "$timeout",
1147
                 postData.key = 'mdv2_incident_repot_handle';
1155
                 postData.key = 'mdv2_incident_repot_handle';
1148
                 break;
1156
                 break;
1149
             case 'SFGS'://三方公司
1157
             case 'SFGS'://三方公司
1158
+                postData.dutyId = $scope.own.duty ? $scope.own.duty.id : undefined;
1159
+                postData.branchId = $scope.own.duty ? undefined : ($scope.own.branch ? $scope.own.branch.id : undefined);
1150
                 postData.key = 'mdv2_incident_repot_company';
1160
                 postData.key = 'mdv2_incident_repot_company';
1151
                 postData.titles = [($scope.sfgs_list[0]&&$scope.sfgs_list[0].userName)?'人员名称':'公司名称', '人员总数', '事件数量', '平均响应时长', '平均解决时长'];
1161
                 postData.titles = [($scope.sfgs_list[0]&&$scope.sfgs_list[0].userName)?'人员名称':'公司名称', '人员总数', '事件数量', '平均响应时长', '平均解决时长'];
1152
                 if($scope.sfgs_list[0]&&$scope.sfgs_list[0].userName){
1162
                 if($scope.sfgs_list[0]&&$scope.sfgs_list[0].userName){

+ 2 - 2
assets/views/report/event_form.html

@@ -84,7 +84,7 @@
84
                         </div>
84
                         </div>
85
                     </div>
85
                     </div>
86
                     <!-- 院区 -->
86
                     <!-- 院区 -->
87
-                    <div class="selectSj P-0 fl" ng-if="tap != 'SFGS'">
87
+                    <div class="selectSj P-0 fl">
88
                         <div class="selectSj-hd">院区:</div>
88
                         <div class="selectSj-hd">院区:</div>
89
                         <ui-select class="sj-select" ng-model="own.branch" theme="bootstrap" ng-change="changeBranch()">
89
                         <ui-select class="sj-select" ng-model="own.branch" theme="bootstrap" ng-change="changeBranch()">
90
                             <ui-select-match placeholder="选择院区" allow-clear>
90
                             <ui-select-match placeholder="选择院区" allow-clear>
@@ -96,7 +96,7 @@
96
                         </ui-select>
96
                         </ui-select>
97
                     </div>
97
                     </div>
98
                     <!-- 责任科室 -->
98
                     <!-- 责任科室 -->
99
-                    <div class="selectSj P-0 fl" ng-if="tap != 'SFGS'">
99
+                    <div class="selectSj P-0 fl">
100
                         <div class="selectSj-hd">责任科室:</div>
100
                         <div class="selectSj-hd">责任科室:</div>
101
                         <ui-select class="sj-select" ng-model="own.duty" theme="bootstrap" ng-change="changeDuty()">
101
                         <ui-select class="sj-select" ng-model="own.duty" theme="bootstrap" ng-change="changeDuty()">
102
                             <ui-select-match placeholder="选择责任科室" allow-clear>
102
                             <ui-select-match placeholder="选择责任科室" allow-clear>