增加院区

assets/js/controllers/customform/customformCtrl.js

@@ -11246,6 +11246,7 @@ appFormly.config(function config(formlyConfigProvider) {
                 $scope.$parent.$parent.$parent.model.incident.account = paramsModel.model.incident.requester.account;
               }
             }
+            
             //处理人根据事件分类自动带入baba
             if ($scope.options.templateOptions.onlyKey == "c_handlerUser") {
               console.log($scope.options.templateOptions.pkey);
@@ -12251,30 +12252,59 @@ appFormly.config(function config(formlyConfigProvider) {
                 .refreshData(options.templateOptions.APIService)
                 .then(function (result) {
                   //回显事件分类，带出绑定的人或组start caocao
-                  if (items.$parent.originalModel.incident && items.$parent.originalModel.incident.category) {
+                  if (options.templateOptions.onlyKey == 'cate_start' && items.$parent.originalModel.incident && items.$parent.originalModel.incident.category) {
                     console.log(result[options.templateOptions.optionsDataKey], items.$parent.model.category.id)
                     var item = result[options.templateOptions.optionsDataKey].find(function (v) {
                       return v.id == items.$parent.originalModel.incident.category.id;
                     })
                     console.log(item)//11615
                     if (item) {
-                      if (item.userOrGroupType === 1) {
-                        items.$parent.originalModel.start_code = 'assignment';
-                        items.$parent.originalModel.incident.handlerUser = { id: item.handleUser ? item.handleUser.id : undefined };
-                        items.$parent.originalModel.directClose = true;
-                        items.$parent.originalModel.isHandlerUser = false;
-                        setTimeout(function () { items.$parent.originalModel.isHandlerUser = true; }, 0)
-                      } else if (item.userOrGroupType === 2) {
-                        items.$parent.originalModel.start_code = 'assignment';
-                        items.$parent.originalModel.candidateGroups = item.group;
-                        items.$parent.originalModel.directClose = true;
-                        items.$parent.originalModel.isHandlerUser = false;
-                      } else {
-                        items.$parent.originalModel.start_code = 'close';
-                        items.$parent.originalModel.directClose = false;
-                        items.$parent.originalModel.isHandlerUser = false;
-                        delete items.$parent.originalModel.candidateGroups;
-                        delete items.$parent.originalModel.incident.handlerUser
+                      if(item.branchType == 0){
+                        if (item.userOrGroupType === 1) {
+                          items.$parent.originalModel.start_code = 'assignment';
+                          items.$parent.originalModel.incident.handlerUser = { id: item.handleUser ? item.handleUser.id : undefined };
+                          items.$parent.originalModel.directClose = true;
+                          items.$parent.originalModel.isHandlerUser = false;
+                          setTimeout(function () { items.$parent.originalModel.isHandlerUser = true; }, 0)
+                        } else if (item.userOrGroupType === 2) {
+                          items.$parent.originalModel.start_code = 'assignment';
+                          items.$parent.originalModel.candidateGroups = item.group;
+                          items.$parent.originalModel.directClose = true;
+                          items.$parent.originalModel.isHandlerUser = false;
+                        } else {
+                          items.$parent.originalModel.start_code = 'close';
+                          items.$parent.originalModel.directClose = false;
+                          items.$parent.originalModel.isHandlerUser = false;
+                          delete items.$parent.originalModel.candidateGroups;
+                          delete items.$parent.originalModel.incident.handlerUser
+                        }
+                      }else if(item.branchType == 1){
+                        // items.$parent.originalModel.incident.area.id
+                        options.templateOptions.APIService.fetchData('area',items.$parent.originalModel.incident.area.id).then(res=>{
+                          console.log(res)
+                          if(res.status == 200){
+                            // res.data.branch
+                              var branchUserGroup=item.branchUserGroups.find(v=>v.branchId==res.data.branch)||{};
+                              if(branchUserGroup.branchUserOrGroupType==1){
+                                items.$parent.originalModel.start_code='assignment';
+                                items.$parent.originalModel.incident.handlerUser={id:branchUserGroup.userId?branchUserGroup.userId:undefined};
+                                items.$parent.originalModel.directClose=true;
+                                items.$parent.originalModel.isHandlerUser=false;
+                                setTimeout(function(){items.$parent.originalModel.isHandlerUser=true;},0)
+                              }else if(branchUserGroup.branchUserOrGroupType===2){
+                                items.$parent.originalModel.start_code='assignment';
+                                items.$parent.originalModel.candidateGroups=branchUserGroup.groupId?branchUserGroup.groupId:undefined;
+                                items.$parent.originalModel.directClose=true;
+                                items.$parent.originalModel.isHandlerUser=false;
+                              }else{
+                                items.$parent.originalModel.start_code='close';
+                                items.$parent.originalModel.directClose=false;
+                                items.$parent.originalModel.isHandlerUser=false;
+                                delete items.$parent.originalModel.candidateGroups;
+                                delete items.$parent.originalModel.incident.handlerUser
+                              }
+                          }
+                        })
                       }
                     }
                   }

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

@@ -645,6 +645,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
         }
 
         var filedata = { "incidentcategory": formdata }
+        filedata.incidentcategory.branchType = Number(filedata.incidentcategory.branchType);
         console.log(filedata,$scope.userGroupChecked);
         // return;
         api_bpm_data.updData('incidentcategory', filedata).then(function(response) {