时间分类添加分院区设置

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

@@ -358,10 +358,24 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
     function convertchildToTree(datum,type) {
         if(type === '事件分类'){
             $scope.subdata = {};
+            if(datum.branchUserGroups){
+                for (var i = 0; i < datum.branchUserGroups.length; i++) {
+                    if(datum.branchUserGroups[i].userId){
+                        datum.branchUserGroups[i].user = {id:datum.branchUserGroups[i].userId,name:datum.branchUserGroups[i].userName};
+                        delete datum.branchUserGroups[i].userId;
+                        delete datum.branchUserGroups[i].userName;
+                    }
+                    if(datum.branchUserGroups[i].groupId){
+                        datum.branchUserGroups[i].group = {id:datum.branchUserGroups[i].groupId,groupName:datum.branchUserGroups[i].groupName};
+                        delete datum.branchUserGroups[i].groupId;
+                        delete datum.branchUserGroups[i].groupName;
+                    }
+                }
+            }
             if (datum.parent) {
-                $scope.subdata = { 'id': datum.id, 'category': datum.label, 'group': datum.group||{}, 'hasPlace': datum.hasPlace, 'hasSimple': datum.hasSimple, 'priority': datum.priority, 'complexity': datum.complexity,  'parent': datum.parent }
+                $scope.subdata = { 'id': datum.id, 'category': datum.label, 'group': datum.group||{}, 'hasPlace': datum.hasPlace, 'hasSimple': datum.hasSimple, 'priority': datum.priority, 'complexity': datum.complexity,  'parent': datum.parent, branchType:datum.branchType,branchUserGroups:datum.branchUserGroups||[] }
             } else {
-                $scope.subdata = { 'id': datum.id, 'category': datum.label, 'group': datum.group||{}, 'hasSimple': datum.hasSimple, 'hasPlace': datum.hasPlace, 'priority': datum.priority, 'complexity': datum.complexity }
+                $scope.subdata = { 'id': datum.id, 'category': datum.label, 'group': datum.group||{}, 'hasSimple': datum.hasSimple, 'hasPlace': datum.hasPlace, 'priority': datum.priority, 'complexity': datum.complexity, branchType:datum.branchType,branchUserGroups:datum.branchUserGroups||[] }
             }
         }else if(type === '巡检范围'){
             $scope.sub1data = {};
@@ -436,55 +450,71 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
         $scope.my_data = [];
         
         $scope.doing_async = true;
-        var data = { "idx": 0, "sum": 1000 };
-        api_bpm_data.fetchDataList('incidentcategory', data).then(function(response) {
-            var data = response.list;
-            var objects = [];
-            // $scope.parentdata = data;
-            for (var i = 0; i < data.length; i++) {
-                var object = {};
-                object.id = data[i].id;
-                if (angular.isDefined(data[i].parent)) {
-                    object.parent = data[i].parent;
-                }
-                if (angular.isDefined(data[i].hasPlace)) {
-                    object.hasPlace = data[i].hasPlace;
-                }
-                if (angular.isDefined(data[i].hasSimple)) {
-                    object.hasSimple = data[i].hasSimple;
-                }
-                if (angular.isDefined(data[i].group)) {
-                    object.group = data[i].group||{};
-                }
-                if (angular.isDefined(data[i].priority)) {
-                    object.priority = data[i].priority;
-                }
-                if (angular.isDefined(data[i].complexity)) {
-                    object.complexity = data[i].complexity;
-                }
-                if (angular.isDefined(data[i].handleUser)) {
-                    object.handleUser = data[i].handleUser||{};
-                }
-                if(angular.isDefined(data[i].userOrGroupType)){
-                    object.userOrGroupType=data[i].userOrGroupType;
+        api_bpm_data.fetchDataList('branch', { "idx": 0, "sum": 1000 }).then(function(result) {
+            result = result.list || [];
+            $scope.adddata = {branchType:0,branchUserGroups:result.map(v=>({branchName:v.hosName,branchId:v.id}))}
+            api_bpm_data.fetchDataList('incidentcategory', { "idx": 0, "sum": 1000 }).then(function(response) {
+                var data = response.list;
+                var objects = [];
+                // $scope.parentdata = data;
+                for (var i = 0; i < data.length; i++) {
+                    var object = {};
+                    object.id = data[i].id;
+                    if (angular.isDefined(data[i].parent)) {
+                        object.parent = data[i].parent;
+                    }
+                    if (angular.isDefined(data[i].hasPlace)) {
+                        object.hasPlace = data[i].hasPlace;
+                    }
+                    if (angular.isDefined(data[i].hasSimple)) {
+                        object.hasSimple = data[i].hasSimple;
+                    }
+                    if (angular.isDefined(data[i].group)) {
+                        object.group = data[i].group||{};
+                    }
+                    if (angular.isDefined(data[i].priority)) {
+                        object.priority = data[i].priority;
+                    }
+                    if (angular.isDefined(data[i].complexity)) {
+                        object.complexity = data[i].complexity;
+                    }
+                    if (angular.isDefined(data[i].handleUser)) {
+                        object.handleUser = data[i].handleUser||{};
+                    }
+                    if(angular.isDefined(data[i].userOrGroupType)){
+                        object.userOrGroupType=data[i].userOrGroupType;
+                    }
+                    if(angular.isDefined(data[i].managerUser)){
+                        object.managerUser=data[i].managerUser||{};
+                    }
+                    if(angular.isDefined(data[i].branchType)){
+                        object.branchType=data[i].branchType||0;
+                    }
+                    if(angular.isDefined(data[i].branchUserGroups)){
+                        data[i].branchUserGroups = data[i].branchUserGroups|| [];
+                        if(data[i].branchUserGroups.length){
+                            object.branchUserGroups=data[i].branchUserGroups
+                        }else{
+                            object.branchUserGroups = result.map(v=>({branchName:v.hosName,branchId:v.id,categoryId:data[i].id}))
+                        }
+                    }else{
+                        object.branchUserGroups = result.map(v=>({branchName:v.hosName,branchId:v.id,categoryId:data[i].id}))
+                    }
+                    object.label = data[i].category;
+                    object.state = {
+                        "opened": true
+                    };
+                    object.typeName = "type";
+                    $scope.showAddSolutionType = true;
+                    $scope.showReviewKnowledgeType = true;
+                    objects.push(object);
                 }
-                if(angular.isDefined(data[i].managerUser)){
-                    object.managerUser=data[i].managerUser||{};
+                $scope.my_data = convertParentToChildList(objects);
+                $scope.tree_data = angular.copy($scope.my_data);
+                if ($scope.my_data.length > 0) {
+                    $scope.doing_async = false;
                 }
-                object.label = data[i].category;
-                object.state = {
-                    "opened": true
-                };
-                object.typeName = "type";
-                $scope.showAddSolutionType = true;
-                $scope.showReviewKnowledgeType = true;
-                objects.push(object);
-            }
-            $scope.my_data = convertParentToChildList(objects);
-            $scope.tree_data = angular.copy($scope.my_data);
-            if ($scope.my_data.length > 0) {
-                $scope.doing_async = false;
-            }
+            });
         });
     };
     $scope.try_async_1load = function() {
@@ -524,7 +554,8 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
 
     /* -----start submit incidet category----- */
     $scope.userGroupChecked={};//选中人/组数据
-    $scope.submitchange = function(formdata) {
+    $scope.submitchange = function(formdata1) {
+        var formdata = angular.copy(formdata1);
         // if (formdata.hasArea) {
         //     formdata.hasArea = 1;
         //     formdata.hasPlace = 1;
@@ -557,17 +588,52 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
             delete formdata.parent
         }
         // console.log(formdata)
-        if($scope.userOrGroupType.type){
-            formdata.userOrGroupType=$scope.userOrGroupType.type
-        }
-        if($scope.userGroupChecked&&$scope.userGroupChecked.groupCheck){
-            formdata.group={id:$scope.userGroupChecked.groupCheck.id};
-            // delete formdata.handleUser;
-        }
-        if($scope.userGroupChecked&&$scope.userGroupChecked.userCheck){
-            formdata.handleUser={id:$scope.userGroupChecked.userCheck.id};
-            // delete formdata.group;
+        // if($scope.userOrGroupType.type){
+        //     formdata.userOrGroupType=$scope.userOrGroupType.type
+        // }
+        // if($scope.userGroupChecked&&$scope.userGroupChecked.groupCheck){
+        //     formdata.group={id:$scope.userGroupChecked.groupCheck.id};
+        //     // delete formdata.handleUser;
+        // }
+        // if($scope.userGroupChecked&&$scope.userGroupChecked.userCheck){
+        //     formdata.handleUser={id:$scope.userGroupChecked.userCheck.id};
+        //     // delete formdata.group;
+        // }
+        // ------------------------ start----------------------------
+        if($scope.subdata.branchType == 1){
+            delete formdata.handleUser;
+            delete formdata.group;
+            delete formdata.userOrGroupType;
+            for (var i = 0; i < formdata.branchUserGroups.length; i++) {
+                if(formdata.branchUserGroups[i].branchUserOrGroupType){
+                    formdata.branchUserGroups[i].branchUserOrGroupType = Number(formdata.branchUserGroups[i].branchUserOrGroupType);
+                }
+                if(formdata.branchUserGroups[i].user && formdata.branchUserGroups[i].branchUserOrGroupType == 1){
+                    formdata.branchUserGroups[i].userId=formdata.branchUserGroups[i].user.id;
+                    delete formdata.branchUserGroups[i].user;
+                    delete formdata.branchUserGroups[i].groupId;
+                }
+                if(formdata.branchUserGroups[i].group && formdata.branchUserGroups[i].branchUserOrGroupType == 2){
+                    formdata.branchUserGroups[i].groupId=formdata.branchUserGroups[i].group.id;
+                    delete formdata.branchUserGroups[i].group;
+                    delete formdata.branchUserGroups[i].userId;
+                }
+            }
+        }else if($scope.subdata.branchType == 0){
+            formdata.branchUserGroups = [];
+            if($scope.userOrGroupType.type){
+                formdata.userOrGroupType=$scope.userOrGroupType.type
+            }
+            if($scope.userGroupChecked&&$scope.userGroupChecked.groupCheck){
+                formdata.group={id:$scope.userGroupChecked.groupCheck.id};
+                delete formdata.handleUser;
+            }
+            if($scope.userGroupChecked&&$scope.userGroupChecked.userCheck){
+                formdata.handleUser={id:$scope.userGroupChecked.userCheck.id};
+                delete formdata.group;
+            }
         }
+        // ------------------------ end----------------------------
         if($scope.subdata.complexity){
             formdata.complexity=$scope.subdata.complexity
         }
@@ -658,7 +724,8 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
     $scope.userGroupCheckedAdd={};//选中人/组数据
     $scope.group_user_Add={};//选中人/组数据
     $scope.userOrGroupTypeAdd={type:0};//运维组/运维人员
-    $scope.submitadd = function(formdata) {
+    $scope.submitadd = function(formdata1) {
+        var formdata = angular.copy(formdata1);
         console.log(formdata)
         // var paret = {};
         // var filedata = {};
@@ -696,18 +763,41 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
             formdata['parentCategory'] = { "id": formdata.parent.id };
             delete formdata.parent
         }
-        if($scope.userOrGroupTypeAdd.type){
-            formdata.userOrGroupType=$scope.userOrGroupTypeAdd.type
-        }
-        if($scope.userGroupCheckedAdd&&$scope.userGroupCheckedAdd.groupCheck){
-            formdata.group={id:$scope.userGroupCheckedAdd.groupCheck.id};
-            // delete formdata.handleUser;
-        }
-        if($scope.userGroupCheckedAdd&&$scope.userGroupCheckedAdd.userCheck){
-            formdata.handleUser={id:$scope.userGroupCheckedAdd.userCheck.id};
-            // delete formdata.group;
+        if($scope.adddata.branchType == 1){
+            delete formdata.handleUser;
+            delete formdata.group;
+            delete formdata.userOrGroupType;
+            for (var i = 0; i < formdata.branchUserGroups.length; i++) {
+                if(formdata.branchUserGroups[i].branchUserOrGroupType){
+                    formdata.branchUserGroups[i].branchUserOrGroupType = Number(formdata.branchUserGroups[i].branchUserOrGroupType);
+                }
+                if(formdata.branchUserGroups[i].user && formdata.branchUserGroups[i].branchUserOrGroupType == 1){
+                    formdata.branchUserGroups[i].userId=formdata.branchUserGroups[i].user.id;
+                    delete formdata.branchUserGroups[i].user;
+                    delete formdata.branchUserGroups[i].groupId;
+                }
+                if(formdata.branchUserGroups[i].group && formdata.branchUserGroups[i].branchUserOrGroupType == 2){
+                    formdata.branchUserGroups[i].groupId=formdata.branchUserGroups[i].group.id;
+                    delete formdata.branchUserGroups[i].group;
+                    delete formdata.branchUserGroups[i].userId;
+                }
+            }
+        }else if($scope.adddata.branchType == 0){
+            formdata.branchUserGroups = [];
+            if($scope.userOrGroupTypeAdd.type){
+                formdata.userOrGroupType=$scope.userOrGroupTypeAdd.type
+            }
+            if($scope.userGroupCheckedAdd&&$scope.userGroupCheckedAdd.groupCheck){
+                formdata.group={id:$scope.userGroupCheckedAdd.groupCheck.id};
+                delete formdata.handleUser;
+            }
+            if($scope.userGroupCheckedAdd&&$scope.userGroupCheckedAdd.userCheck){
+                formdata.handleUser={id:$scope.userGroupCheckedAdd.userCheck.id};
+                delete formdata.group;
+            }
         }
         
+        
         var filedata = { "incidentcategory": formdata }
         console.log(filedata);
         // return;

assets/views/system/processdesign/incidentplan/incidentSetUp.html

@@ -217,6 +217,7 @@
         border: 1px solid #eeeeee;
         margin: 14px;
         padding-top: 14px;
+        padding-bottom: 140px;
         height: 402px;
         overflow: auto;
     }
@@ -442,9 +443,6 @@
     .userGroupType label input{
         margin-right: 5px;
     }
-    .group,.user{
-        margin-bottom: 140px;
-    }
     /* 事件分类结束 */
 </style>
 
@@ -573,6 +571,22 @@
                                     </div>
                                 </div>
                                 <div class="tab-mainDiv-body-lineDiv-50">
+                                    <div class="tab-mainDiv-body-lable">
+                                        是否分院区处理:
+                                    </div>
+                                    <div class="tab-mainDiv-body-content userGroupType">
+                                        <label>
+                                            <input type="radio" value="1" ng-model="subdata.branchType"
+                                                name="branchType">是
+                                        </label>
+                                        <label>
+                                            <input type="radio" value="0" ng-model="subdata.branchType"
+                                                name="branchType">否
+                                        </label>
+                                    </div>
+                                </div>
+                                <!-- 分院区处理-否 -->
+                                <div class="tab-mainDiv-body-lineDiv-50" ng-if="subdata.branchType == 0">
                                     <div class="tab-mainDiv-body-lable">运维组/运维人员:</div>
                                     <div class="userGroupType">
                                         <label>
@@ -607,6 +621,42 @@
                                         </ui-select>
                                     </div>
                                 </div>
+                                <!-- 分院区处理-是 -->
+                                <div class="tab-mainDiv-body-lineDiv-50" ng-if="subdata.branchType == 1" ng-repeat="item in subdata.branchUserGroups">
+                                    <div class="tab-mainDiv-body-lable">{{item.branchName}} - 运维组/运维人员:</div>
+                                    <div class="userGroupType">
+                                        <label>
+                                            <input type="radio" value="2" ng-model="item.branchUserOrGroupType"
+                                                name="{{'branchUserOrGroupType'+ item.branchId +'sub'}}">运维组
+                                        </label>
+                                        <label>
+                                            <input type="radio" value="1" ng-model="item.branchUserOrGroupType"
+                                                name="{{'branchUserOrGroupType'+ item.branchId + 'sub'}}">运维人员
+                                        </label>
+                                    </div>
+                                    <div class="group" ng-if="item.branchUserOrGroupType==2">
+                                        <ui-select class="tab-mainDiv-body-content" ng-model="item.group"
+                                            theme="bootstrap">
+                                            <ui-select-match placeholder="">
+                                                {{$select.selected.groupName}}
+                                            </ui-select-match>
+                                            <ui-select-choices repeat="item in groupList | filter: $select.search">
+                                                <div ng-bind-html="item.groupName | highlight: $select.search"></div>
+                                            </ui-select-choices>
+                                        </ui-select>
+                                    </div>
+                                    <div class="user" ng-if="item.branchUserOrGroupType==1">
+                                        <ui-select class="tab-mainDiv-body-content" ng-model="item.user"
+                                            theme="bootstrap">
+                                            <ui-select-match placeholder="">
+                                                {{$select.selected.name}}
+                                            </ui-select-match>
+                                            <ui-select-choices repeat="item in userList | filter: $select.search">
+                                                <div ng-bind-html="item.name | highlight: $select.search"></div>
+                                            </ui-select-choices>
+                                        </ui-select>
+                                    </div>
+                                </div>
                                 
                                 
                                 <!-- <div class="tab-mainDiv-body-lineDiv-50">
@@ -736,6 +786,22 @@
                                         </div>
                                     </div>
                                     <div class="tab-mainDiv-body-lineDiv-50">
+                                        <div class="tab-mainDiv-body-lable">
+                                            是否分院区处理:
+                                        </div>
+                                        <div class="tab-mainDiv-body-content userGroupType">
+                                            <label>
+                                                <input type="radio" value="1" ng-model="adddata.branchType"
+                                                    name="branchType">是
+                                            </label>
+                                            <label>
+                                                <input type="radio" value="0" ng-model="adddata.branchType"
+                                                    name="branchType">否
+                                            </label>
+                                        </div>
+                                    </div>
+                                    <!-- 分院区处理-否 -->
+                                    <div class="tab-mainDiv-body-lineDiv-50" ng-if="adddata.branchType == 0">
                                         <div class="tab-mainDiv-body-lable">运维组/运维人员:</div>
                                         <div class="userGroupType">
                                             <label>
@@ -770,6 +836,43 @@
                                             </ui-select>
                                         </div>
                                     </div>
+                                    <!-- 分院区处理-是 -->
+                                    <div class="tab-mainDiv-body-lineDiv-50" ng-if="adddata.branchType == 1" ng-repeat="item in adddata.branchUserGroups">
+                                        <div class="tab-mainDiv-body-lable">{{item.branchName}} - 运维组/运维人员:</div>
+                                        <div class="userGroupType">
+                                            <label>
+                                                <input type="radio" value="2" ng-model="item.branchUserOrGroupType"
+                                                    name="{{'branchUserOrGroupType'+ item.branchId +'add'}}">运维组
+                                            </label>
+                                            <label>
+                                                <input type="radio" value="1" ng-model="item.branchUserOrGroupType"
+                                                    name="{{'branchUserOrGroupType'+ item.branchId +'add'}}">运维人员
+                                            </label>
+                                        </div>
+                                        <div class="group" ng-if="item.branchUserOrGroupType==2">
+                                            <ui-select class="tab-mainDiv-body-content" ng-model="item.group"
+                                                theme="bootstrap">
+                                                <ui-select-match placeholder="">
+                                                    {{$select.selected.groupName}}
+                                                </ui-select-match>
+                                                <ui-select-choices repeat="item in groupList | filter: $select.search">
+                                                    <div ng-bind-html="item.groupName | highlight: $select.search"></div>
+                                                </ui-select-choices>
+                                            </ui-select>
+                                        </div>
+                                        <div class="user" ng-if="item.branchUserOrGroupType==1">
+                                            <ui-select class="tab-mainDiv-body-content" ng-model="item.user"
+                                                theme="bootstrap">
+                                                <ui-select-match placeholder="">
+                                                    {{$select.selected.name}}
+                                                </ui-select-match>
+                                                <ui-select-choices repeat="item in userList | filter: $select.search">
+                                                    <div ng-bind-html="item.name | highlight: $select.search"></div>
+                                                </ui-select-choices>
+                                            </ui-select>
+                                        </div>
+                                    </div>
+                                    
                                 <!-- <div class="tab-mainDiv-body-lineDiv-50">
                                     <div class="tab-mainDiv-body-lable">关联组:</div>
                                     <ui-select class="tab-mainDiv-body-content" ng-model="adddata.group" theme="bootstrap">