seimin %!s(int64=2) %!d(string=hai) anos
pai
achega
5ce58502a1
Modificáronse 2 ficheiros con 6 adicións e 4 borrados
  1. 2 1
      src/custom/seiminModel.vue
  2. 4 3
      src/views/processing.vue

+ 2 - 1
src/custom/seiminModel.vue

@@ -18,7 +18,7 @@
18 18
           </cube-select>
19 19
         </div>
20 20
         <!-- 选择审核人 -->
21
-        <div class="seiminModel_item">
21
+        <div class="seiminModel_item" v-if="(type === 'handler' && complexity != complexitySource) || type == 'now'">
22 22
           <label>审核人<span class="red">*</span>:</label>
23 23
           <cube-select
24 24
             v-model="auditor"
@@ -77,6 +77,7 @@ export default {
77 77
     changeHandler() {
78 78
       if (this.type === "handler" && this.complexitySource == this.complexity) {
79 79
         this.updateReason = "";
80
+        this.auditor = "";
80 81
       }
81 82
     },
82 83
     // 查询祖辈积分

+ 4 - 3
src/views/processing.vue

@@ -1717,7 +1717,7 @@ export default {
1717 1717
                   }).show();
1718 1718
                   return;
1719 1719
                 }
1720
-                if (!this.$refs.seiminModel.auditor) {
1720
+                if (this.$refs.seiminModel.complexitySource != this.$refs.seiminModel.complexity && !this.$refs.seiminModel.auditor) {
1721 1721
                   this.$createDialog({
1722 1722
                     type: "alert",
1723 1723
                     title: "操作失败",
@@ -1752,12 +1752,13 @@ export default {
1752 1752
                     //   this.$refs.seiminModel.complexity
1753 1753
                     //     ? result.find(v => v.value == 1)
1754 1754
                     //     : result.find(v => v.value == 0);
1755
-                    let auditState = result.find(v => v.value == 0);
1755
+                    // let auditState = result.find(v => v.value == 0);
1756
+                    let auditState = this.$refs.seiminModel.complexitySource != this.$refs.seiminModel.complexity ? result.find(v => v.value == 0) : result.find(v => v.value == 1);
1756 1757
                     let postData = {
1757 1758
                       incidentIntegral: {
1758 1759
                         incidentId: this.modelData.incident.id,
1759 1760
                         auditState: auditState,
1760
-                        auditUser: this.$refs.seiminModel.auditor,
1761
+                        auditUser: this.$refs.seiminModel.auditor || undefined,
1761 1762
                         handlerUser: this.loginUser.id,
1762 1763
                         handlerUserName: this.loginUser.name,
1763 1764
                         sourceScore: this.$refs.seiminModel.complexitySource,