审核功能

src/custom/seiminModel.vue

@@ -17,6 +17,15 @@
           >
           </cube-select>
         </div>
+        <!-- 选择审核人 -->
+        <div class="seiminModel_item">
+          <label>审核人<span class="red">*</span>：</label>
+          <cube-select
+            v-model="auditor"
+            :options="auditors"
+          >
+          </cube-select>
+        </div>
         <!-- <div
           class="seiminModel_item"
           v-if="(type === 'handler' && complexity != complexitySource) || type == 'now'"
@@ -58,6 +67,8 @@ export default {
       complexity: "",
       updateReason: "",
       complexityList: [],
+      auditor: "",
+      auditors: [],
       opts: {}
     };
   },
@@ -89,6 +100,7 @@ export default {
         .then(res => {
           this.complexitySource = this.complexityFn(this.category);
           this.complexity = this.complexityFn(this.category);
+          console.log(this.complexity)
           args.content = `您本次事件处理获得工时${this.complexitySource}，如遇问题对工时进行调整`;
           res.data.forEach((v, i) => {
             this.complexityList.push({
@@ -143,8 +155,30 @@ export default {
               isVisible: true
             });
           });
+          // 获取审核人
+          this.getAuditors();
         });
     },
+    // 获取审核人
+    getAuditors(){
+      this.$http
+        .post("service/user/data/fetchDataList/user", {
+          "idx": 0,
+          "sum": 9999,
+          "user": {
+              "roledata": { rolecode: "incident manager" }
+          }
+        })
+        .then(res => {
+          if(res.data.status == 200){
+            let userList = res.data.list || [];
+            this.auditors = userList.map(v => ({
+              text: v.name,
+              value: v.id
+            }))
+          }
+        })
+    },
     // 显示弹窗
     show(args = {}) {
       this.category = args.category;

src/views/Login.vue

@@ -183,6 +183,9 @@ export default {
               case "integralMechanism": //积分机制
                 localStorage.setItem("integralMechanism", v.valueconfig);
                 break;
+              case "integralRole": //积分控制角色
+                sessionStorage.setItem("integralRole", v.valueconfig);
+                break;
             }
           });
           this.roleHandler(user,requester);

src/views/closed.vue

@@ -93,7 +93,7 @@
               <span class="fr">{{ model.incident.category.category }}</span>
             </p>
             <p>
-              <span class="fl">关闭代码</span>
+              <span class="fl">处理结果</span>
               <span class="fr">{{
                 model.incident.closecode ? model.incident.closecode.name : ""
               }}</span>

src/views/newIncident.vue

@@ -338,6 +338,7 @@ export default {
       ifRoom: localStorage.getItem("ifRoom"), //是否增加房间号选择
       loginUser: JSON.parse(localStorage.getItem("loginUser")),
       integralMechanism: localStorage.getItem("integralMechanism"),
+      integralRole: localStorage.getItem("integralRole"),
       valConfig: JSON.parse(localStorage.getItem("valConfig")) - 0, //报修主体
       name: "",
       phone: "",
@@ -370,7 +371,7 @@ export default {
         emergency: "", //紧急度
         influence: "", //影响度
         handleCategory: "", //处理方式
-        closecode: "", //关闭代码
+        closecode: "", //处理结果
         handleDescription: "", //处理方案
         knowledge: false, //是否提交知识库
         handlerUser: "", //处理人
@@ -390,7 +391,7 @@ export default {
       emergencyArr: [], //紧急度数组
       influenceArr: [], //影响度数组
       handleCategoryArr: [], //处理方式数组
-      closecodeArr: [], //关闭代码数组
+      closecodeArr: [], //处理结果数组
       handlerUserArr: [], //处理人数组
       candidateGroupsArr: [], //处理组数组
       isShowDes: false,
@@ -601,11 +602,11 @@ export default {
         {
           type: "select",
           modelKey: "closecode",
-          label: "关闭代码:",
+          label: "处理结果:",
           props: {
             options: this.closecodeArr,
-            title: "请选择关闭代码",
-            placeholder: "请选择关闭代码"
+            title: "请选择处理结果",
+            placeholder: "请选择处理结果"
           },
           rules: {
             required: true
@@ -897,7 +898,7 @@ export default {
           that.fields[11].props.options = that.handleCategoryArr;
         });
     },
-    // 获取关闭代码
+    // 获取处理结果
     getClosecode() {
       var that = this;
       this.$http
@@ -1191,9 +1192,17 @@ export default {
       );
       console.log(that.modelData.incident.category.id, this.initSjList, "事件");
       // debugger;//测试
+      let integralRoles = [];
+      let currentUserRoles = [];
+      let intersection = [];
+      if(this.integralMechanism == 1){
+        integralRoles = sessionStorage.getItem("integralRole") ? sessionStorage.getItem("integralRole").split(',') : [];
+        currentUserRoles = this.loginUser.role ? this.loginUser.role.map(v=>String(v.id)) : [];
+        intersection = integralRoles.filter(function (val) { return currentUserRoles.indexOf(val) > -1 })
+      }
       if (
         this.order == 1 &&
-        (this.integralMechanism == 1 ||
+        ((this.integralMechanism == 1 && intersection.length) ||
           (this.integralMechanism == 2 && this.loginUser.userType.value == 2))
       ) {
         // 直接处理,积分机制
@@ -1212,6 +1221,7 @@ export default {
             },
             {
               click: () => {
+                console.log(this.$refs.seiminModel)
                 if (!this.$refs.seiminModel.complexity) {
                   this.$createDialog({
                     type: "alert",
@@ -1221,6 +1231,15 @@ export default {
                   }).show();
                   return;
                 }
+                if (!this.$refs.seiminModel.auditor) {
+                  this.$createDialog({
+                    type: "alert",
+                    title: "操作失败",
+                    content: "请选择审核人!",
+                    icon: "cubeic-wrong"
+                  }).show();
+                  return;
+                }
                 if (this.$refs.seiminModel.complexitySource != this.$refs.seiminModel.complexity && !this.$refs.seiminModel.updateReason.trim()) {
                   this.$createDialog({
                     type: "alert",
@@ -1283,9 +1302,17 @@ export default {
                 that.$refs.upload1.start();
               }
             }, 100);
+            let integralRoles = [];
+            let currentUserRoles = [];
+            let intersection = [];
+            if(this.integralMechanism == 1){
+              integralRoles = sessionStorage.getItem("integralRole") ? sessionStorage.getItem("integralRole").split(',') : [];
+              currentUserRoles = this.loginUser.role ? this.loginUser.role.map(v=>String(v.id)) : [];
+              intersection = integralRoles.filter(function (val) { return currentUserRoles.indexOf(val) > -1 })
+            }
             if (
               this.order == 1 &&
-              (this.integralMechanism == 1 ||
+              ((this.integralMechanism == 1 && intersection.length) ||
                 (this.integralMechanism == 2 &&
                   this.loginUser.userType.value == 2))
             ) {
@@ -1301,6 +1328,7 @@ export default {
                     incidentIntegral: {
                       incidentId: res.data.bussId,
                       auditState: auditState,
+                      auditUser: this.$refs.seiminModel.auditor,
                       handlerUser: this.loginUser.id,
                       handlerUserName: this.loginUser.name,
                       sourceScore: this.$refs.seiminModel.complexitySource,
@@ -1908,7 +1936,7 @@ export default {
     this.getInfluence();
     // 处理方式
     this.getHandleCategory();
-    // 关闭代码
+    // 处理结果
     this.getClosecode();
     // 处理人
     this.getHandlerUser();

src/views/processing.vue

@@ -465,7 +465,7 @@ export default {
       selectedPlaceName: "", //地点选中名称--seimin
       model: {
         handleCategory: "", //处理方式
-        closecode: "", //关闭代码
+        closecode: "", //处理结果
         category: [], //确认事件分类
         handleDescription: "", //处理方案
         knowledge: false, //是否提交知识库
@@ -484,7 +484,7 @@ export default {
       promptingStatus: "",
       order: 1, //处理方式  1：直接处理，2:升级，3:转派，4:协同
       handleCategoryArr: [], //处理方式数组
-      closecodeArr: [], //关闭代码数组
+      closecodeArr: [], //处理结果数组
       // handlerUserArr: [], //处理人数组
       synergeticList: [], //协同对象列表
       synergeticChecked: [], //选中协同对象
@@ -536,11 +536,11 @@ export default {
         {
           type: "select",
           modelKey: "closecode",
-          label: "关闭代码:",
+          label: "处理结果:",
           props: {
             options: this.closecodeArr,
-            title: "请选择关闭代码",
-            placeholder: "请选择关闭代码"
+            title: "请选择处理结果",
+            placeholder: "请选择处理结果"
           },
           rules: {
             required: true
@@ -1091,7 +1091,7 @@ export default {
           that.fields[0].props.options = that.handleCategoryArr;
         });
     },
-    // 获取关闭代码
+    // 获取处理结果
     getClosecode() {
       var that = this;
       this.$http
@@ -1679,9 +1679,17 @@ export default {
       that.model.fileUrl = "url";
       that.loadShow = true;
       //处理中,积分机制
+      let integralRoles = [];
+      let currentUserRoles = [];
+      let intersection = [];
+      if(this.integralMechanism == 1){
+        integralRoles = sessionStorage.getItem("integralRole") ? sessionStorage.getItem("integralRole").split(',') : [];
+        currentUserRoles = this.loginUser.role ? this.loginUser.role.map(v=>String(v.id)) : [];
+        intersection = integralRoles.filter(function (val) { return currentUserRoles.indexOf(val) > -1 })
+      }
       if (
         this.order == 1 &&
-        (this.integralMechanism == 1 ||
+        ((this.integralMechanism == 1 && intersection.length) ||
           (this.integralMechanism == 2 && this.loginUser.userType.value == 2))
       ) {
         //liaomingming
@@ -1709,6 +1717,15 @@ export default {
                   }).show();
                   return;
                 }
+                if (!this.$refs.seiminModel.auditor) {
+                  this.$createDialog({
+                    type: "alert",
+                    title: "操作失败",
+                    content: "请选择审核人!",
+                    icon: "cubeic-wrong"
+                  }).show();
+                  return;
+                }
                 console.log(this.$refs.seiminModel);
                 if (
                   this.$refs.seiminModel.complexitySource !=
@@ -1723,7 +1740,6 @@ export default {
                   }).show();
                   return;
                 }
-                //liaomingming
                 this.$http
                   .post("service/common/common/getDictionary", {
                     key: "incident_integral_state",
@@ -1741,6 +1757,7 @@ export default {
                       incidentIntegral: {
                         incidentId: this.modelData.incident.id,
                         auditState: auditState,
+                        auditUser: this.$refs.seiminModel.auditor,
                         handlerUser: this.loginUser.id,
                         handlerUserName: this.loginUser.name,
                         sourceScore: this.$refs.seiminModel.complexitySource,
@@ -1839,7 +1856,7 @@ export default {
     this.getImgs();
     // 处理方式
     this.getHandleCategory();
-    // 关闭代码
+    // 处理结果
     this.getClosecode();
     // 升级对象
     this.getUpUser();

src/views/solved.vue

@@ -96,7 +96,7 @@
             }}</span>
           </p>
           <p>
-            <span class="fl">关闭代码</span>
+            <span class="fl">处理结果</span>
             <span class="fr">{{
               model.incident.closecode ? model.incident.closecode.name : ""
             }}</span>

src/views/waitConfirm.vue

@@ -200,7 +200,7 @@
             <span class="fr showwrap">{{ model.incident.handleCategory }}</span>
           </p>
           <p>
-            <span class="fl">关闭代码</span>
+            <span class="fl">处理结果</span>
             <span class="fr">{{
               model.incident.closecode ? model.incident.closecode.name : ""
             }}</span>