分院区修复

assets/js/controllers/customform/customformCtrl.js

@@ -12259,6 +12259,7 @@ appFormly.config(function config(formlyConfigProvider) {
                     })
                     console.log(item)//11615
                     if (item) {
+                      items.$parent.originalModel.incident.branchType = item.branchType;
                       if(item.branchType == 0){
                         if (item.userOrGroupType === 1) {
                           items.$parent.originalModel.start_code = 'assignment';
@@ -12279,30 +12280,32 @@ appFormly.config(function config(formlyConfigProvider) {
                           delete items.$parent.originalModel.incident.handlerUser
                         }
                       }else if(item.branchType == 1){
+                        items.$parent.originalModel.incident.branchUserGroups = item.branchUserGroups;
                         // 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){
+                            items.$parent.originalModel.incident.branchId = res.data.branch;
                             // 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
-                              }
+                            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
+                            }
                           }
                         })
                       }
@@ -20839,7 +20842,7 @@ appFormly.controller("CustomformCtrl", [
       //     }
       // }
       // 初始化的时候判断是否是简单处理
-      if(modelWatch.model.incident.category){
+      if(modelWatch.model && modelWatch.model.incident && modelWatch.model.incident.category){
           if (modelWatch.model.incident.category.hasSimple == 1) {
             vm.model.isHasSimple = true;
           }else{