From 630ec95d208cd8195b641482a9cf95e774d5ec05 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Wed, 13 Dec 2023 17:31:15 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=81=E6=A0=87=E7=A8=BD=E6=9F=A5?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E4=BC=9A=E7=AD=BE=E8=A1=A8=E5=8D=95=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EnterpriseStandardInspectionPlanFlow.vue  | 38 +++++++++----------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue b/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue
index 751faf21..4a272f2a 100644
--- a/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue
@@ -71,7 +71,7 @@
           <div class="form-flex-item custom-flex-form-item">
             <a-form-item v-if="isCountersign" :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('workCenter.esInspectionPlan.countersignRelevantPersonnel')">
               <user-selection :placeholder="$t('pleaseSelect') + $t('workCenter.esInspectionPlan.countersignRelevantPersonnel')"
-                              type="checkbox" :nameStr="involveNameStr"
+                              type="checkbox" :nameStr="info.countersignDictText"
                               v-decorator="['involveList', validatorRules.countersignRelevantPersonnel]" />
             </a-form-item>
           </div>
@@ -208,10 +208,7 @@ export default {
       // 流程审批信息表单
       approvalInfoForm: this.$form.createForm(this),
       // 是否会签
-      isCountersign: null,
-      url: {
-        list: '' // 人员信息右侧表的分页查询接口
-      }
+      isCountersign: null
     }
   },
   computed: {
@@ -224,10 +221,6 @@ export default {
     },
     processDisabled () {
       return this.currentNode !== EsInspectionPlan.initiate.value
-    },
-    // 会签人员回显
-    involveNameStr () {
-      return (this.info.map && this.info.map.involveListDictText) || ''
     }
   },
   created () {
@@ -282,7 +275,6 @@ export default {
         if (res.success) {
           const data = res.result || {}
           const processAll = data.processAll || {}
-          const map = data.map || {}
           const processApprovalRecord = data.processApprovalRecord || {}
           this.info = data
           // 页面回显
@@ -291,13 +283,19 @@ export default {
             dueTime: processAll.dueTime,
             prcMes: processAll.prcMes
           })
-          this.countersignForm && this.countersignForm.setFieldsValue({
-            pass: this.convertPass(map.pass)
-          })
           this.approvalInfoForm && this.approvalInfoForm.setFieldsValue({
             commitText: processApprovalRecord.commitText,
             commitFile: processApprovalRecord.commitFile
           })
+          // 回显会签表单
+          this.$nextTick(() => {
+            this.countersignForm && this.countersignForm.setFieldsValue({
+              pass: data.countersignTag,
+              involveList: data.countersign || ''
+            })
+          })
+          // 触发会签改变
+          this.changeIsCountersign(data.countersignTag)
         }
       }).finally(() => {
         this.loading = false
@@ -360,10 +358,13 @@ export default {
 
       // 处理其他参数
       params.map = Object.assign({}, formDataList[1], getPersonInfo)
+      // 会签表单放到对象最外层单独存储业务信息，params.map里是流程用的
       if (params.map.pass) {
+        params.countersignTag = params.map.pass
         params.map.pass = this.convertPass(params.map.pass)
       }
       if (params.map.involveList && typeof params.map.involveList === 'string') {
+        params.countersign = params.map.involveList
         params.map.involveList = params.map.involveList.split(',')
       }
 
@@ -542,14 +543,11 @@ export default {
     changeIsCountersign (val) {
       if (val === '1') {
         this.isCountersign = true
-        // 回显列表
-        this.info.map && this.info.map.involveList && this.countersignForm && this.countersignForm.setFieldsValue({
-          involveList: this.info.map.involveList
-        })
-      } else if (val === '0') {
-        this.isCountersign = false
       } else {
-        this.isCountersign = null
+        // 清空会签人员
+        this.countersignForm.setFieldsValue({ involveList: undefined })
+        this.info.countersignDictText = ''
+        this.isCountersign = false
       }
     },
     // pass数据字典值和布尔值互相转换