seimin преди 2 години
родител
ревизия
023a525083

+ 8 - 0
assets/js/controllers/customform/customformCtrl.js

@@ -20808,6 +20808,14 @@ appFormly.controller("CustomformCtrl", [
20808
       //         $rootScope.selecthouseNumber = undefined;
20808
       //         $rootScope.selecthouseNumber = undefined;
20809
       //     }
20809
       //     }
20810
       // }
20810
       // }
20811
+      // 初始化的时候判断是否是简单处理
20812
+      if(modelWatch.model.incident.category){
20813
+          if (modelWatch.model.incident.category.hasSimple == 1) {
20814
+            vm.model.isHasSimple = true;
20815
+          }else{
20816
+            vm.model.isHasSimple = false;
20817
+          }
20818
+      }
20811
     }
20819
     }
20812
     if (angular.isDefined($state.current.pdKey) && $state.current.pdKey != "") {
20820
     if (angular.isDefined($state.current.pdKey) && $state.current.pdKey != "") {
20813
       pdKey = $state.current.pdKey;
20821
       pdKey = $state.current.pdKey;

+ 3 - 3
assets/js/controllers/system/processdesign/incidentplan/incidentSetUpCtrl.js

@@ -86,7 +86,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
86
     }
86
     }
87
     var childdata = {};
87
     var childdata = {};
88
     $scope.thisParent={};//当前点击节点的父节点
88
     $scope.thisParent={};//当前点击节点的父节点
89
-    $scope.userOrGroupType={type:2};//当前节点运维组/运维人员
89
+    $scope.userOrGroupType={type:0};//当前节点运维组/运维人员
90
     $scope.dataSave = [];//储存$scope.tree_data
90
     $scope.dataSave = [];//储存$scope.tree_data
91
     $scope.my_tree_handler = function(branch) {
91
     $scope.my_tree_handler = function(branch) {
92
         console.log($scope.dataSave)
92
         console.log($scope.dataSave)
@@ -128,7 +128,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
128
             $scope.userGroupChecked['groupCheck']=branch.group||{};
128
             $scope.userGroupChecked['groupCheck']=branch.group||{};
129
             $scope.userGroupChecked['userCheck']=branch.handleUser||{};
129
             $scope.userGroupChecked['userCheck']=branch.handleUser||{};
130
         }else{
130
         }else{
131
-            $scope.userOrGroupType['type']=2;
131
+            $scope.userOrGroupType['type']=0;
132
             $scope.userGroupChecked={}
132
             $scope.userGroupChecked={}
133
         }
133
         }
134
         // $scope.subdata=branch;
134
         // $scope.subdata=branch;
@@ -657,7 +657,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
657
     // 新增保存提交
657
     // 新增保存提交
658
     $scope.userGroupCheckedAdd={};//选中人/组数据
658
     $scope.userGroupCheckedAdd={};//选中人/组数据
659
     $scope.group_user_Add={};//选中人/组数据
659
     $scope.group_user_Add={};//选中人/组数据
660
-    $scope.userOrGroupTypeAdd={type:2};//运维组/运维人员
660
+    $scope.userOrGroupTypeAdd={type:0};//运维组/运维人员
661
     $scope.submitadd = function(formdata) {
661
     $scope.submitadd = function(formdata) {
662
         console.log(formdata)
662
         console.log(formdata)
663
         // var paret = {};
663
         // var paret = {};