From bb7e444dba2ff5d9597e4ac13adf33ed0cd68607 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= <zhaoxiaox0053@163.com>
Date: Wed, 3 Jan 2024 14:17:25 +0800
Subject: [PATCH] =?UTF-8?q?fix=2080109=EF=BC=88=E5=A4=84=E7=90=86=E4=BA=86?=
 =?UTF-8?q?=E6=8A=84=E9=80=81=E4=BA=BA=E5=91=98=E4=BF=9D=E5=AD=98=E8=8D=89?=
 =?UTF-8?q?=E7=A8=BF=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../NoMatchTrackingProcess.vue                |  9 +-------
 .../ProjectComplianceEvaluationProcess.vue    | 21 ++++++++++++++++---
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/views/workCenter/noMatchTrackingProcess/NoMatchTrackingProcess.vue b/src/views/workCenter/noMatchTrackingProcess/NoMatchTrackingProcess.vue
index 1685423b..52ea1e83 100644
--- a/src/views/workCenter/noMatchTrackingProcess/NoMatchTrackingProcess.vue
+++ b/src/views/workCenter/noMatchTrackingProcess/NoMatchTrackingProcess.vue
@@ -262,6 +262,7 @@ export default {
           dataIndex: 'standardName',
           title: this.$t('standardName'),
           width: 150,
+          align: 'center',
           scopedSlots: { customRender: 'detail' }
         },
         // 条款号
@@ -296,14 +297,6 @@ export default {
           align: 'center',
           scopedSlots: { customRender: 'text' }
         },
-        // 责任部门
-        {
-          dataIndex: 'departmentId_dictText',
-          title: this.$t('projectLibrary.vehicleItemLibrary.responsibleDepartment'),
-          width: 120,
-          align: 'center',
-          scopedSlots: { customRender: 'text' }
-        },
         // 设计工程师
         {
           dataIndex: 'engineerId_dictText',
diff --git a/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue b/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue
index 7d637a73..e03577f5 100644
--- a/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue
+++ b/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue
@@ -244,7 +244,9 @@
                            :label="$t('workCenter.projectComplianceEvaluationProcess.ccPerson')">
                 <user-selection :placeholder="$t('pleaseSelect') + $t('workCenter.projectComplianceEvaluationProcess.ccPerson')"
                                 type="checkbox"
-                                v-decorator="['carbonCopyPersonnels', validatorRules.carbonCopyPersonnels]" />
+                                :name-str="dispatchInfo.carbonCopyPersonnels_dictText"
+                                v-decorator="['carbonCopyPersonnels', validatorRules.carbonCopyPersonnels]"
+                                @nameChange="handleCarbonCopyNameChange" />
               </a-form-item>
             </a-col>
           </a-row>
@@ -894,6 +896,7 @@ export default {
           // 如果是草稿，会从json里取数据
           if (this.$route.query.draftId) {
             const draftResult = JSON.parse(result.infoJsonStr)
+            // 发起节点数据处理
             if (this.currentNode === ProjectComplianceEvaluationProcessNode.initiate.value) {
               // 步骤条回显
               this.currentStep = draftResult.currentStep
@@ -902,9 +905,11 @@ export default {
               this.projectId = this.projectDataSource[0].id
               // 标准信息
               this.standardDataSource = draftResult.standardList
-              // 业务分派信息
-              this.dataSource = draftResult.dispatchList
             }
+            // 业务分派信息
+            this.dataSource = draftResult.dispatchList
+            // 抄送人员
+            this.dispatchInfo = Object.assign({}, draftResult.carbonCopyPersonnels)
             // 流程审批信息
             this.approvalInfo = Object.assign({}, draftResult.approvalInfo)
           } else {
@@ -927,6 +932,10 @@ export default {
             if (this.approvalInfoForm) {
               this.approvalInfoForm.setFieldsValue(this.approvalInfo)
             }
+            // 抄送信息回显
+            if (this.dispatchInfoForm) {
+              this.dispatchInfoForm.setFieldsValue(this.dispatchInfo)
+            }
           })
         }
       }).finally(() => {
@@ -1250,6 +1259,7 @@ export default {
       const formData = {}
       // 流程信息
       const processInfo = Object.assign(this.processInfo, this.processInfoForm.getFieldsValue())
+      // 发起节点数据处理
       if (this.currentNode === ProjectComplianceEvaluationProcessNode.initiate.value) {
         // 记录当前在哪一步
         formData.currentStep = this.currentStep
@@ -1270,6 +1280,8 @@ export default {
       formData.dispatchList = this.dataSource
       // 流程审批信息
       formData.approvalInfo = Object.assign(this.approvalInfo, this.approvalInfoForm.getFieldsValue())
+      // 抄送人员
+      formData.carbonCopyPersonnels = Object.assign(this.dispatchInfo, this.dispatchInfoForm.getFieldsValue())
       const params = {
         infoJsonStr: JSON.stringify(formData),
         basicProcessInfoDTO: processInfo,
@@ -1395,6 +1407,9 @@ export default {
     },
     showContent (text) {
       this.$refs.clauseDetail.open(text)
+    },
+    handleCarbonCopyNameChange (name) {
+      this.dispatchInfo.carbonCopyPersonnels_dictText = name
     }
   },
   beforeRouteLeave (to, form, next) {