优化

assets/js/controllers/customform/customformCtrl.js

@@ -20786,7 +20786,7 @@ appFormly.run(function (formlyConfig, $parse) {
                 undefined
               );
             }
-          } else {
+          } else if(typeof field.key =='string') {
             $parse(field.key).assign(scope.model, undefined);
           }
         }
@@ -21795,7 +21795,7 @@ appFormly.controller("CustomformCtrl", [
                   if(vm.model.start_code == "close"&&(integralMechanism == 1 || (integralMechanism == 2 && $rootScope.user.userType.value == 2))){
                     $modal.open({
                       templateUrl: 'assets/views/incident/tpl/toIntegralMechanism.tpl.html',
-                      controller: function ($scope, $modalInstance, api_bpm_domain, incidentData, currentUserId, Alert, api_user_data,api_wechatfile,scope) {
+                      controller: function ($scope, $modalInstance, api_bpm_domain, incidentData, currentUserId, Alert, api_user_data,api_wechatfile,scope,api_bpm_data) {
                           console.log(incidentData,currentUserId);
                           $scope.flag = false;
                           $scope.complexityConfirm = {complexity:null,updateReason:''};
@@ -21811,8 +21811,14 @@ appFormly.controller("CustomformCtrl", [
                           $scope.list = [];
                           api_wechatfile.getDictionary({"key":"incident_complexity","type":"list"}).then(function(res){
                             $scope.list = res;
-                            $scope.complexity = $scope.complexityFn(incidentData.category);
-                            $scope.complexityConfirm.complexity = $scope.list.find(v=>v.value == $scope.complexity);
+                            if(incidentData.category && incidentData.category.id){
+                              api_bpm_data.fetchData("incidentCategory",incidentData.category.id).then(function(result){
+                                if(result.status == 200){
+                                  $scope.complexity = $scope.complexityFn(result.data);
+                                  $scope.complexityConfirm.complexity = $scope.list.find(v=>v.value == $scope.complexity);
+                                }
+                              })
+                            }
                           })
                           $scope.onChangeComplexity = function(item){
                             
@@ -22013,7 +22019,7 @@ appFormly.controller("CustomformCtrl", [
                   if($scope.formData.name === 'handlerform'&&(integralMechanism == 1 || (integralMechanism == 2 && $rootScope.user.userType.value == 2))){
                       $modal.open({
                         templateUrl: 'assets/views/incident/tpl/toIntegralMechanism.tpl.html',
-                        controller: function ($scope, $modalInstance, api_bpm_domain, incidentData, currentUserId, Alert, api_user_data,api_wechatfile,scope) {
+                        controller: function ($scope, $modalInstance, api_bpm_domain, incidentData, currentUserId, Alert, api_user_data,api_wechatfile,scope,api_bpm_data) {
                             console.log(incidentData,currentUserId);
                             $scope.flag = true;
                             $scope.complexityConfirm = {complexity:null,updateReason:''};
@@ -22029,8 +22035,14 @@ appFormly.controller("CustomformCtrl", [
                             $scope.list = [];
                             api_wechatfile.getDictionary({"key":"incident_complexity","type":"list"}).then(function(res){
                               $scope.list = res;
-                              $scope.complexity = $scope.complexityFn(incidentData.category);
-                              $scope.complexityConfirm.complexity = $scope.list.find(v=>v.value == $scope.complexity);
+                              if(incidentData.category && incidentData.category.id){
+                                api_bpm_data.fetchData("incidentCategory",incidentData.category.id).then(function(result){
+                                  if(result.status == 200){
+                                    $scope.complexity = $scope.complexityFn(result.data);
+                                    $scope.complexityConfirm.complexity = $scope.list.find(v=>v.value == $scope.complexity);
+                                  }
+                                })
+                              }
                             })
                             $scope.onChangeComplexity = function(item){
                               if($scope.complexityConfirm.complexity.value == $scope.complexity){

assets/js/controllers/desk/calllogCtrl.js

@@ -209,21 +209,21 @@ app.controller('calllogCtrl', ["$scope", "i18nService", "$rootScope", "$state",
             $scope.refreshData('expand-right', $scope.fileData);
         });
 
-        gridApi.selection.on.rowSelectionChanged($scope, function(scope) {
-            var j = 0;
-            for (var i = 0; i <= scope.grid.appScope.selected.items.length; i++) {
-                if (scope.grid.appScope.selected.items[i] == scope.entity) {
-                    j++;
-                    break;
-                }
-            }
-            // console.log("j="+j)
-            if (j == 1) {
-                scope.grid.appScope.selected.items.splice(i, 1);
-            } else {
-                scope.grid.appScope.selected.items.push(scope.entity)
-            }
-        });
+        // gridApi.selection.on.rowSelectionChanged($scope, function(scope) {
+        //     var j = 0;
+        //     for (var i = 0; i <= scope.grid.appScope.selected.items.length; i++) {
+        //         if (scope.grid.appScope.selected.items[i] == scope.entity) {
+        //             j++;
+        //             break;
+        //         }
+        //     }
+        //     // console.log("j="+j)
+        //     if (j == 1) {
+        //         scope.grid.appScope.selected.items.splice(i, 1);
+        //     } else {
+        //         scope.grid.appScope.selected.items.push(scope.entity)
+        //     }
+        // });
 
         gridApi.core.on.filterChanged($scope, function() {
             var grid = this.grid;

assets/js/controllers/system/processdesign/incidentplan/incidentSetUpCtrl.js

@@ -493,7 +493,15 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
                     if(angular.isDefined(data[i].branchUserGroups)){
                         data[i].branchUserGroups = data[i].branchUserGroups|| [];
                         if(data[i].branchUserGroups.length){
-                            object.branchUserGroups=data[i].branchUserGroups
+                            var arr_b = result.map(v=>({branchName:v.hosName,branchId:v.id,categoryId:data[i].id}));
+                            for (var j = 0; j < arr_b.length; j++) {
+                                for (var p = 0; p < data[i].branchUserGroups.length; p++) {
+                                    if(arr_b[j].branchId == data[i].branchUserGroups[p].branchId){
+                                        arr_b[j] = data[i].branchUserGroups[p];
+                                    }
+                                }
+                            }
+                            object.branchUserGroups=arr_b;
                         }else{
                             object.branchUserGroups = result.map(v=>({branchName:v.hosName,branchId:v.id,categoryId:data[i].id}))
                         }

assets/views/inspect/integral.html

@@ -4,7 +4,7 @@
     margin-right: 16px;
   }
   .wt_width5 {
-    width: 160px;
+    width: 60%;
     border-color: #dedede;
     float: right;
     height: 28px;