事件分类新增事件分类管理员

assets/js/controllers/system/notificationCtrl.js

@@ -11,6 +11,7 @@ app.controller('notificationCtr', ["$rootScope", "$scope", "$state", "$timeout",
     $scope.listData = [
         { "name": "报修流程" },
         { "name": "事件流程" }
+        // { "name": "上下班管理" }
     ];
     //转换通知规则
     $scope.computedRule = function (data, id) {

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

@@ -117,6 +117,9 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
         
         convertchildToTree(branch);
         console.log(branch)
+        if(branch.managerUser){
+            $scope.subdata.managerUser = branch.managerUser
+        }
         if(branch.userOrGroupType){
             $scope.userOrGroupType['type']=branch.userOrGroupType;
             $scope.userGroupChecked['groupCheck']=branch.group||{};
@@ -330,6 +333,9 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
                 if(angular.isDefined(data[i].userOrGroupType)){
                     object.userOrGroupType=data[i].userOrGroupType;
                 }
+                if(angular.isDefined(data[i].managerUser)){
+                    object.managerUser=data[i].managerUser||{};
+                }
                 object.label = data[i].category;
                 // object.actions = data[i][3]; //权限部分
                 // object.group = "1";
@@ -411,6 +417,9 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
         if($scope.subdata.priority){
             formdata.priority=$scope.subdata.priority
         }
+        if($scope.subdata.managerUser){
+            formdata.managerUser=$scope.subdata.managerUser
+        }
 
         var filedata = { "incidentcategory": formdata }
         console.log(filedata);
@@ -440,6 +449,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
     $scope.userGroupCheckedAdd={};//选中人/组数据
     $scope.userOrGroupTypeAdd={};//运维组/运维人员
     $scope.submitadd = function(formdata) {
+        console.log(formdata)
         // var paret = {};
         // var filedata = {};
         // filedata = angular.copy(formdata);
@@ -1182,6 +1192,24 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
         })
     }
     $scope.getUserList()
+    // 获取事件分类人员
+    $scope.getUserList1=function(){
+        var postData={
+            idx: 0, 
+            sum: 1000, 
+            user: {
+                name:'', 
+                selectType: "pinyin_qs",
+                roledata:{
+                    rolecode:'incident-category-manager'
+                }
+            }
+        }
+        api_user_data.fetchDataList('user',postData).then(res=>{
+            $scope.userList1=res.list;
+        })
+    }
+    $scope.getUserList1()
 
 
 

assets/views/system/notification.html

@@ -248,6 +248,74 @@
             </tr>
           </tbody>
         </table>
+        <!-- 上下班管理 -->
+        <table hidden class="jry_table" ng-if="leftListIdx==1" cellspacing="0" cellpadding="20"
+          style="font-weight:normal !important;margin-bottom: 15px;table-layout:fixed">
+          <thread>
+            <tr>
+              <th style="width:6%">
+                序号
+              </th>
+              <th style="width:10%">
+                通知流程
+              </th>
+              <th style="width:10%">
+                流程节点
+              </th>
+              <th style="width:10%">
+                状态
+              </th>
+              <th style="width:12%">
+                被通知人
+              </th>
+              <th style="width:18%">
+                通知规则
+              </th>
+              <th style="width:18%">
+                通知模式
+              </th>
+              <th style="width:10%">
+                是否开启
+              </th>
+              <th style="width:6%">
+                操作
+              </th>
+            </tr>
+          </thread>
+          <tbody class="tbody-hover">
+            <tr ng-repeat="rowData in sjList" ng-class="$index%2==1?'bgGray':''">
+              <td style="width:6%">
+                {{$index+1}}
+              </td>
+              <td style="width:10%">
+                {{rowData.processName}}
+              </td>
+              <td style="width:10%">
+                {{rowData.processNode}}
+              </td>
+              <td style="width:10%">
+                {{rowData.processStatus}}
+              </td>
+              <td style="width:12%">
+                {{rowData.notifiedPerson}}
+              </td>
+              <td style="width:18%">
+                {{computedRule(rowData.noticeRule,rowData.id)}}
+              </td>
+              <td style="width:18%">
+                {{rowData.messageStationFlag ==1?'站内消息':''}}
+                {{rowData.shortMessageFlag ==1?',短信':''}}
+                {{rowData.wechatMessageFlag ==1?',微信':''}}
+              </td>
+              <td style="width:10%">
+                {{rowData.flag ==1?'是':'否'}}
+              </td>
+              <td style="width:6%" class="bianji">
+                <span ng-click="editClick(rowData)">设置</span>
+              </td>
+            </tr>
+          </tbody>
+        </table>
       </div>
     </div>
   </div>

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

@@ -552,6 +552,18 @@
                                     </ui-select>
                                 </div>
                                 <div class="tab-mainDiv-body-lineDiv-50">
+                                    <div class="tab-mainDiv-body-lable">分类管理员:</div>
+                                    <ui-select class="tab-mainDiv-body-content" ng-model="subdata.managerUser"
+                                            theme="bootstrap">
+                                        <ui-select-match placeholder="">
+                                            {{$select.selected.name}}
+                                        </ui-select-match>
+                                        <ui-select-choices repeat="item in userList1 | filter: $select.search">
+                                            <div ng-bind-html="item.name | highlight: $select.search"></div>
+                                        </ui-select-choices>
+                                    </ui-select>
+                                </div>
+                                <div class="tab-mainDiv-body-lineDiv-50">
                                     <div class="tab-mainDiv-body-lable">运维组/运维人员:</div>
                                     <div class="userGroupType">
                                         <label>
@@ -586,6 +598,7 @@
                                         </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="subdata.group" theme="bootstrap">
@@ -700,6 +713,18 @@
                                         </ui-select>
                                     </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.managerUser"
+                                                theme="bootstrap">
+                                            <ui-select-match placeholder="">
+                                                {{$select.selected.name}}
+                                            </ui-select-match>
+                                            <ui-select-choices repeat="item in userList1 | filter: $select.search">
+                                                <div ng-bind-html="item.name | highlight: $select.search"></div>
+                                            </ui-select-choices>
+                                        </ui-select>
+                                    </div>
+                                    <div class="tab-mainDiv-body-lineDiv-50">
                                         <div class="tab-mainDiv-body-lable">运维组/运维人员:</div>
                                         <div class="userGroupType">
                                             <label>