审核功能

assets/js/controllers/customform/customformCtrl.js

@@ -21916,6 +21916,9 @@ appFormly.controller("CustomformCtrl", [
             } else {
               console.log($scope.formData.url, "zzzz");
               var integralMechanism = sessionStorage.getItem('integralMechanism');
+              let integralRoles = [];
+              let currentUserRoles = [];
+              let intersection = [];
               switch ($scope.formData.url) {
                 case "start":
                   vm.model["initUser"] = $rootScope.user.id;
@@ -21998,13 +22001,21 @@ appFormly.controller("CustomformCtrl", [
                   }
                   // --------------------------- start----------------------------------------
                   // 积分机制,直接处理
-                  if(vm.model.start_code == "close"&&(integralMechanism == 1 || (integralMechanism == 2 && $rootScope.user.userType.value == 2))){
+                  // let integralRoles = [];
+                  // let currentUserRoles = [];
+                  // let intersection = [];
+                  if(integralMechanism == 1){
+                    integralRoles = sessionStorage.getItem("integralRole") ? sessionStorage.getItem("integralRole").split(',') : [];
+                    currentUserRoles = $rootScope.user.role ? $rootScope.user.role.map(v=>String(v.id)) : [];
+                    intersection = integralRoles.filter(function (val) { return currentUserRoles.indexOf(val) > -1 })
+                  }
+                  if(vm.model.start_code == "close"&&((integralMechanism == 1 && intersection.length) || (integralMechanism == 2 && $rootScope.user.userType.value == 2))){
                     $modal.open({
                       templateUrl: 'assets/views/incident/tpl/toIntegralMechanism.tpl.html',
                       controller: function ($scope, $modalInstance, api_bpm_domain, incidentData, currentUserId, Alert, api_user_data,api_wechatfile,scope,api_bpm_data) {
                           console.log(incidentData,currentUserId);
                           $scope.flag = false;
-                          $scope.complexityConfirm = {complexity:null,updateReason:''};
+                          $scope.complexityConfirm = {complexity:null,updateReason:'', auditor: undefined};
                           $scope.complexityFn = function(category){
                             if(category.complexity){
                               return category.complexity.value;
@@ -22026,6 +22037,25 @@ appFormly.controller("CustomformCtrl", [
                               })
                             }
                           })
+                          $scope.onChangehandling = function(key = ''){
+                            api_user_data.fetchDataList('user', {
+                              "idx": 0,
+                              "sum": 9999,
+                              "user": {
+                                  "name": key,
+                                  'selectType': "pinyin_qs",
+                                  "roledata": { rolecode: "incident manager" }
+                              }
+                            }).then(function(response) {
+                              if (response) {
+                                  if (response.status = 200) {
+                                      $scope.auditors = response.list;
+                                  }
+                              }
+                            })
+                          }
+                          $scope.auditors = [];
+                          $scope.onChangehandling();
                           $scope.onChangeComplexity = function(item){
                             
                           }
@@ -22038,6 +22068,14 @@ appFormly.controller("CustomformCtrl", [
                                   });
                                   return;
                               }
+                              if (!$scope.complexityConfirm.auditor){
+                                  Alert.swal({
+                                      title: "操作失败",
+                                      text: "请选择审核人!",
+                                      type: "error"
+                                  });
+                                  return;
+                              }
                               if ($scope.complexityConfirm.complexity.value != $scope.complexity&&!$scope.complexityConfirm.updateReason.trim()){
                                   Alert.swal({
                                       title: "操作失败",
@@ -22122,7 +22160,15 @@ appFormly.controller("CustomformCtrl", [
                             }
                           }
                         }
-                        if(vm.model.start_code == "close"&&(integralMechanism == 1 || (integralMechanism == 2 && $rootScope.user.userType.value == 2))){
+                        let integralRoles = [];
+                        let currentUserRoles = [];
+                        let intersection = [];
+                        if(integralMechanism == 1){
+                          integralRoles = sessionStorage.getItem("integralRole") ? sessionStorage.getItem("integralRole").split(',') : [];
+                          currentUserRoles = $rootScope.user.role ? $rootScope.user.role.map(v=>String(v.id)) : [];
+                          intersection = integralRoles.filter(function (val) { return currentUserRoles.indexOf(val) > -1 })
+                        }
+                        if(vm.model.start_code == "close"&&((integralMechanism == 1 && intersection.length) || (integralMechanism == 2 && $rootScope.user.userType.value == 2))){
                           api_wechatfile.getDictionary({"key":"incident_integral_state","type":"list"}).then(function(res){
                             var auditState = res.find(v=>v.value == 0);
                             var postData = { 
@@ -22134,6 +22180,7 @@ appFormly.controller("CustomformCtrl", [
                                 sourceScore:$scope.complexity,
                                 currentScore:$scope.complexityConfirm.complexity.value,
                                 updateReason:$scope.complexityConfirm.updateReason.trim() || undefined,
+                                auditUser: $scope.complexityConfirm.auditor.id
                               }
                             }
                             console.log(postData)
@@ -22222,13 +22269,21 @@ appFormly.controller("CustomformCtrl", [
                   }
                   console.log(vm);
                   // 积分机制,事件状态是“处理中”
-                  if($scope.formData.name === 'handlerform'&&(integralMechanism == 1 || (integralMechanism == 2 && $rootScope.user.userType.value == 2))){
+                  // let integralRoles = [];
+                  // let currentUserRoles = [];
+                  // let intersection = [];
+                  if(integralMechanism == 1){
+                    integralRoles = sessionStorage.getItem("integralRole") ? sessionStorage.getItem("integralRole").split(',') : [];
+                    currentUserRoles = $rootScope.user.role ? $rootScope.user.role.map(v=>String(v.id)) : [];
+                    intersection = integralRoles.filter(function (val) { return currentUserRoles.indexOf(val) > -1 })
+                  }
+                  if($scope.formData.name === 'handlerform'&&((integralMechanism == 1 && intersection.length) || (integralMechanism == 2 && $rootScope.user.userType.value == 2))){
                       $modal.open({
                         templateUrl: 'assets/views/incident/tpl/toIntegralMechanism.tpl.html',
                         controller: function ($scope, $modalInstance, api_bpm_domain, incidentData, currentUserId, Alert, api_user_data,api_wechatfile,scope,api_bpm_data) {
                             console.log(incidentData,currentUserId);
                             $scope.flag = true;
-                            $scope.complexityConfirm = {complexity:null,updateReason:''};
+                            $scope.complexityConfirm = {complexity:null,updateReason:'', auditor: undefined};
                             $scope.complexityFn = function(category){
                               if(category.complexity){
                                 return category.complexity.value;
@@ -22250,6 +22305,25 @@ appFormly.controller("CustomformCtrl", [
                                 })
                               }
                             })
+                            $scope.onChangehandling = function(key = ''){
+                              api_user_data.fetchDataList('user', {
+                                "idx": 0,
+                                "sum": 9999,
+                                "user": {
+                                    "name": key,
+                                    'selectType': "pinyin_qs",
+                                    "roledata": { rolecode: "incident manager" }
+                                }
+                              }).then(function(response) {
+                                if (response) {
+                                    if (response.status = 200) {
+                                        $scope.auditors = response.list;
+                                    }
+                                }
+                              })
+                            }
+                            $scope.auditors = [];
+                            $scope.onChangehandling();
                             $scope.onChangeComplexity = function(item){
                               if($scope.complexityConfirm.complexity.value == $scope.complexity){
                                 $scope.complexityConfirm.updateReason = '';
@@ -22264,6 +22338,14 @@ appFormly.controller("CustomformCtrl", [
                                     });
                                     return;
                                 }
+                                if (!$scope.complexityConfirm.auditor){
+                                    Alert.swal({
+                                        title: "操作失败",
+                                        text: "请选择审核人!",
+                                        type: "error"
+                                    });
+                                    return;
+                                }
                                 if ($scope.complexityConfirm.complexity.value != $scope.complexity&&!$scope.complexityConfirm.updateReason.trim()){
                                     Alert.swal({
                                         title: "操作失败",
@@ -22284,6 +22366,7 @@ appFormly.controller("CustomformCtrl", [
                                       sourceScore:$scope.complexity,
                                       currentScore:$scope.complexityConfirm.complexity.value,
                                       updateReason:$scope.complexityConfirm.updateReason.trim() || undefined,
+                                      auditUser: $scope.complexityConfirm.auditor.id
                                     }
                                   }
                                   console.log(postData)

assets/js/controllers/loginCtrl.js

@@ -43,6 +43,9 @@ app.controller('LoginCtrl', ['$rootScope', '$scope', '$state', '$translate', '$l
                               case "integralMechanism": //积分机制
                                 sessionStorage.setItem("integralMechanism", v.valueconfig);
                                 break;
+                              case "integralRole": //积分控制角色
+                                sessionStorage.setItem("integralRole", v.valueconfig);
+                                break;
                             }
                         });
                     }

assets/views/incident/tpl/toIntegralMechanism.tpl.html

@@ -22,6 +22,22 @@
             </div>
         </div>
     </div>
+    <div class="form-group incidentsearch" style="margin:0 auto;width: 300px;">
+        <div class="input-group" style="margin:8px 0 0;">
+            <div class="control-label pull-left margin-top-5 margin-right-5">
+                <label class="demoincident">审核人<span class="red">*</span></label>:</div>
+            <div class="pull-right">
+                <ui-select class="pull-left" style="width:220px" ng-model="complexityConfirm.auditor" theme="bootstrap">
+                    <ui-select-match placeholder="">
+                        {{$select.selected.name}}
+                    </ui-select-match>
+                    <ui-select-choices repeat="item in auditors | filter:{$:$select.search}" refresh="onChangehandling($select.search)">
+                        <div ng-bind-html="item.name | highlight: $select.search"></div>
+                    </ui-select-choices>
+                </ui-select>
+            </div>
+        </div>
+    </div>
     <div class="form-group incidentsearch" style="margin:0 auto;width: 300px;" ng-if="complexityConfirm.complexity.value != complexity">
         <div class="input-group" style="margin:8px 0 0;">
             <div class="control-label pull-left margin-top-5 margin-right-5">

assets/views/inspect/integral.html

@@ -1,8 +1,4 @@
 <style type="text/css">
-  .incidentsearch {
-    width: 20% !important;
-    margin-right: 16px;
-  }
   .wt_width5 {
     width: 60%;
     border-color: #dedede;
@@ -11,11 +7,6 @@
     border-radius: 2px !important;
   }
 
-  .iptSize {
-    width: 60% !important;
-    height: 28px !important;
-  }
-
   .tree-control .tree-input {
     min-height: 28px !important;
   }
@@ -23,21 +14,22 @@
   .searchBtnBox > .btn {
     margin: 0 8px 10px 0;
   }
+  .selectzise {
+    width: 160px;
+  }
+  .wt_width3 {
+      width: 160px;
+      height: 28px !important;
+      border-radius: 2px !important;
+  }
 </style>
 <div ng-controller="integralCtrl">
-  <!-- <section id="page-title">
-        <div class="row">
-            <div class="col-sm-8">
-                <h1 class="mainTitle">积分管理</h1><span class="mainDescription">积分管理列表，可对巡检进行修改，新增，删除</span></div>
-        </div>
-    </section> -->
   <section id="page-title">
     <div class="row">
-      <!-- <i class="iconfont icon-bianji pull-left"></i> -->
       <div class="col-sm-8">
         <h1 class="mainTitle">
           事件审核管理<i
-            tooltip="事件审核管理列表，可对巡检进行修改"
+            tooltip="事件审核管理列表"
             tooltip-placement="right"
             class="fa ti-help-alt margin-left-10 fontcolor-five pointfont"
           ></i>
@@ -45,83 +37,17 @@
       </div>
     </div>
   </section>
-  <!-- <div class="col-xs-2 col-md-2 col-sm-2">
-        <h5 class="over-title margin-bottom-15"><i class="fa fa-building-o" /><span class="text-bold">巡检类型</span></h5>
-        <div>
-            <div class="row">
-                <div class="panel panel-white">
-                    <div class="panel-body">
-                        <div class="box-tree">
-                            <span ng-if="doing_async">...加载中...</span>
-                            <abn-tree tree-data="my_data" tree-control="my_tree" on-select="my_tree_handler(branch)" expand-level="2" initial-selection="Granny Smith" icon-leaf="ti-file" icon-expand="ti-plus" icon-collapse="ti-minus"></abn-tree>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div> -->
   <div class="schuback" id="searchid">
     <div class="row" style="padding-right: 0px !important">
       <div class="col-xs-12">
-        <div class="col-xs-10" style="padding-right: 0px !important">
+        <div class="col-xs-9" style="padding-right: 0px !important">
           <form class="form-inline incidentsearchsize">
-            <!-- <div class="form-group incidentsearch">
-              <div>
-                <div class="control-label pull-left" style="padding-top: 4px">
-                  计划主题:
-                </div>
-                <input
-                  class="form-control pull-right inputcolor iptSize"
-                  style="border-color: #dedede; color: #93989e"
-                  type="text"
-                  ng-model="fileData.inspection.title"
-                  placeholder=""
-                />
-              </div>
-            </div>
-            <div class="form-group incidentsearch">
-              <div class="pull-left" style="padding-top: 4px">巡检范围:</div>
-              <div class="pull-right iptSize" style="display: inline">
-                <div>
-                  <multi-select-tree
-                    ng-model="inspecttype.type"
-                    data-input-model="my_data"
-                    data-output-model="inspectdata.type"
-                    theme="bootstrap"
-                    multi-select="false"
-                    data-default-label=""
-                    data-callback="onFilterCallback(item)"
-                    data-select-only-leafs="true"
-                    reset-search-input="false"
-                    data-trans-label="label"
-                    data-switch-view="false"
-                  ></multi-select-tree>
-                </div>
-              </div>
-            </div>
             <div class="form-group incidentsearch">
-              <div class="pull-left" style="padding-top: 4px">执行人:</div>
-              <ui-select
-                class="pull-right iptSize"
-                ng-model="fileData.inspection.executeUser"
-                theme="bootstrap"
-              >
-                <ui-select-match placeholder="">
-                  {{$select.selected.name}}
-                </ui-select-match>
-                <ui-select-choices repeat="item in executeUserData">
-                  <div
-                    ng-bind-html="item.name | highlight: $select.search"
-                  ></div>
-                </ui-select-choices>
-              </ui-select>
-            </div> -->
-            <div class="form-group incidentsearch wt_width">
               <div class="">
                 <div class="control-label pull-left margin-top-5">
                   登记时间:
                 </div>
-                <input
+                <input style="margin-right:24px;width: 60%;"
                   type="text"
                   class="incidentsearchsize wt_width5"
                   datepicker-popuptime="yyyy-MM-dd"
@@ -136,10 +62,10 @@
                 />
               </div>
             </div>
-            <div class="form-group incidentsearch wt_width">
+            <div class="form-group incidentsearch">
               <div class="">
                 <div class="control-label pull-left margin-top-5">至</div>
-                <input
+                <input style="margin-right:24px;width: 60%;"
                   type="text"
                   class="selectzise incidentsearchsize wt_width5"
                   datepicker-popuptime="yyyy-MM-dd"
@@ -155,9 +81,9 @@
               </div>
             </div>
             <div class="form-group incidentsearch">
-              <div class="pull-left" style="padding-top: 4px">审核状态:</div>
-              <ui-select
-                class="pull-right iptSize"
+              <div class="control-label pull-left margin-top-5">审核状态:</div>
+              <ui-select style="margin-right:24px;width: 60%;"
+                class="pull-right iptSize wt_width1 wt_width3"
                 ng-model="fileData.incidentIntegral.auditState"
                 theme="bootstrap"
               >
@@ -170,27 +96,57 @@
                   ></div>
                 </ui-select-choices>
               </ui-select>
+              <button style="position:absolute;right:0;padding:4px;" ng-click="fileData.incidentIntegral.auditState = undefined" class="btn btn-default">
+                <span class="glyphicon glyphicon-trash"></span>
+              </button>
             </div>
-            <div class="form-group incidentsearch" ng-if="isIncidentManager">
-              <div class="pull-left" style="padding-top: 4px">处理人:</div>
-              <ui-select
-                class="pull-right iptSize"
-                ng-model="fileData.incidentIntegral.handlerUser"
-                theme="bootstrap"
-              >
-                <ui-select-match placeholder="">
-                  {{$select.selected.name}}
-                </ui-select-match>
-                <ui-select-choices repeat="item in createUserData" refresh="getCreateUser($select.search)">
-                  <div
-                    ng-bind-html="item.name | highlight: $select.search"
-                  ></div>
-                </ui-select-choices>
-              </ui-select>
+            <div class="form-group incidentsearch">
+              <div class="selectuiSearch">
+                <div class="control-label pull-left margin-top-5">处理人:</div>
+                <ui-select style="margin-right:24px;width: 60%;"
+                  class="pull-right selectzise wt_width1 wt_width3"
+                  ng-model="fileData.incidentIntegral.handlerUser"
+                  theme="bootstrap"
+                >
+                  <ui-select-match placeholder="">
+                    {{$select.selected.name}}
+                  </ui-select-match>
+                  <ui-select-choices repeat="item in createUserData" refresh="getCreateUser($select.search)">
+                    <div
+                      ng-bind-html="(item.name + '(' + item.account + ')') | highlight: $select.search"
+                    ></div>
+                  </ui-select-choices>
+                </ui-select>
+                <button style="position:absolute;right:0;padding:4px;" ng-click="fileData.incidentIntegral.handlerUser = undefined" class="btn btn-default">
+                  <span class="glyphicon glyphicon-trash"></span>
+                </button>
+              </div>
+            </div>
+            <div class="form-group incidentsearch">
+              <div class="selectuiSearch">
+                <div class="control-label pull-left margin-top-5">审核人:</div>
+                <ui-select style="margin-right:24px;width: 60%;"
+                  class="pull-right selectzise wt_width1 wt_width3"
+                  ng-model="fileData.incidentIntegral.auditUser"
+                  theme="bootstrap"
+                >
+                  <ui-select-match placeholder="">
+                    {{$select.selected.name}}
+                  </ui-select-match>
+                  <ui-select-choices repeat="item in auditUsersData" refresh="getAuditUsers($select.search)">
+                    <div
+                      ng-bind-html="(item.name + '(' + item.account + ')') | highlight: $select.search"
+                    ></div>
+                  </ui-select-choices>
+                </ui-select>
+                <button style="position:absolute;right:0;padding:4px;" ng-click="fileData.incidentIntegral.auditUser = undefined" class="btn btn-default">
+                  <span class="glyphicon glyphicon-trash"></span>
+                </button>
+              </div>
             </div>
           </form>
         </div>
-        <div class="col-xs-2">
+        <div class="col-xs-3">
           <div>
             <!-- <div class="centerdiv-one"></div> -->
             <div class="pull-left margin-top-10 searchBtnBox">
@@ -243,37 +199,6 @@
     </div>
   </div>
   <div class="tableList" ui-i18n="{{lang}}">
-    <!-- <div class="col-xs-2 col-md-2 col-sm-2">
-            <h5 class="over-title margin-bottom-15"><i class="fa fa-building-o" /><span class="text-bold">巡检类型</span></h5>
-            <div>
-                <div class="row">
-                    <div class="panel panel-white">
-                        <div class="panel-body">
-                            <div class="box-tree">
-                                <span ng-if="doing_async">...加载中...</span>
-                                <abn-tree tree-data="my_data" tree-control="my_tree" on-select="my_tree_handler(branch)" expand-level="2" initial-selection="Granny Smith" icon-leaf="ti-file" icon-expand="ti-plus" icon-collapse="ti-minus"></abn-tree>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div> -->
-    <!-- <div class="col-xs-10"> -->
-
-    <!-- <div class="margin-bottom-10">
-            <a ladda="ldloading.expand_right" class="btn btn-primary" data-style="expand-right" ng-click="reload()">
-                <span translate="list.button.REFRESH">Refresh Data</span>
-                <i class="ti-reload" />
-            </a>
-            <button type="button" id="addData" class="btn btn-success" ng-click="addData()">
-                    <span translate="list.button.CREATE">Add Data</span>
-                    <i class="ti-plus"/>
-                </button>
-            <button type="button" id="removeData" class="btn btn-warning" ng-click="removeData()" ng-disabled="selected.items.length==0">
-                    <span translate=" list.button.REMOVE ">Remove First Row</span>
-                    <i class="ti-trash "/>
-                </button>
-        </div> -->
     <div class=" ">
       <div
         id="grid1 "