From 1dcf21204e1e2488684919071ad7606fbdd06aab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= <zhaoxiaox0053@163.com>
Date: Wed, 10 Jan 2024 17:55:23 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E3=80=81=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?=
 =?UTF-8?q?=E8=B7=9F=E8=B8=AA=E4=BF=9D=E5=AD=98=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../NoMatchTrackingProcess.vue                | 12 +++++----
 .../ProjectComplianceEvaluationProcess.vue    | 27 ++++++++++++-------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/views/workCenter/noMatchTrackingProcess/NoMatchTrackingProcess.vue b/src/views/workCenter/noMatchTrackingProcess/NoMatchTrackingProcess.vue
index f3dd7d1b..3cc6243a 100644
--- a/src/views/workCenter/noMatchTrackingProcess/NoMatchTrackingProcess.vue
+++ b/src/views/workCenter/noMatchTrackingProcess/NoMatchTrackingProcess.vue
@@ -531,13 +531,15 @@ export default {
         this.$message.warning(this.$t('pleaseFillInAtLeastOneItem'))
         return
       }
-      const formData = {
-        processInfo, businessInfo, approvalInfo, userInfo,
-        dataSource: this.dataSource,
-        basicTaskInfoDTO: approvalInfo
+      const formData = { processInfo, businessInfo, approvalInfo, userInfo, dataSource: this.dataSource }
+      const params = {
+        draftId: this.$route.query.draftId,
+        infoJsonStr: JSON.stringify(formData),
+        basicTaskInfoDTO: approvalInfo,
+        basicProcessInfoDTO: processInfo
       }
       this.loading = true
-      saveNoMatchTrackingProcess({ infoJsonStr: JSON.stringify(formData) }).then(res => {
+      saveNoMatchTrackingProcess(params).then(res => {
         if (res.success) {
           this.$message.success(res.message)
           this.goBack()
diff --git a/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue b/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue
index f1e5cc01..a39df5ee 100644
--- a/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue
+++ b/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue
@@ -258,7 +258,7 @@
       </template>
 
       <!--流程审批信息-->
-      <template v-if="showDispatchAndApprovalInfo">
+      <div v-show="showDispatchAndApprovalInfo">
         <div class="process-part-title">{{ $t('processApprovalInformation') }}</div>
         <a-form :form="approvalInfoForm">
           <!--备注-->
@@ -274,7 +274,7 @@
             <j-upload v-decorator="['handleFile']" return-id />
           </a-form-item>
         </a-form>
-      </template>
+      </div>
     </div>
 
     <!--人员信息-->
@@ -904,12 +904,14 @@ export default {
             if (this.currentNode === ProjectComplianceEvaluationProcessNode.initiate.value) {
               // 步骤条回显
               this.currentStep = draftResult.currentStep
-              // 项目信息
-              this.projectDataSource = draftResult.projectList || []
-              this.projectId = this.projectDataSource.length > 0 ? this.projectDataSource[0].id : null
-              // 标准信息
-              this.standardDataSource = draftResult.standardList
             }
+            // 项目信息
+            this.projectDataSource = draftResult.projectList || []
+            this.projectId = this.projectDataSource.length > 0 ? this.projectDataSource[0].id : null
+            // 标准信息
+            this.standardDataSource = draftResult.standardList
+            // 流程信息
+            this.processInfo = Object.assign({}, draftResult.basicProcessInfoDTO)
             // 业务分派信息
             this.dataSource = draftResult.dispatchList
             // 抄送人员
@@ -925,10 +927,10 @@ export default {
               item.tableRowKey = index
               return item
             })
+            // 流程信息
+            this.processInfo = Object.assign({}, result.basicProcessInfoDTO)
           }
-          // 流程信息
-          this.processInfo = Object.assign({}, result.basicProcessInfoDTO)
-          this.businessId = result.businessId
+          this.businessId = result.businessId || this.$route.query.projectId
           this.$nextTick(() => {
             if (this.processInfoForm) {
               this.processInfoForm.setFieldsValue(this.processInfo)
@@ -1302,6 +1304,9 @@ export default {
         } else {
           formData.standardList = this.standardDataSource
         }
+      } else {
+        formData.projectList = this.projectDataSource
+        formData.standardList = this.standardDataSource
       }
       // 分发列表
       formData.dispatchList = this.dataSource
@@ -1309,6 +1314,8 @@ export default {
       formData.approvalInfo = Object.assign(this.approvalInfo, this.approvalInfoForm.getFieldsValue())
       // 抄送人员
       formData.carbonCopyPersonnels = Object.assign(this.dispatchInfo, this.dispatchInfoForm.getFieldsValue())
+      // 流程信息
+      formData.basicProcessInfoDTO = processInfo
       const checkParams = Object.values({ ...formData.approvalInfo, ...processInfo, ...formData.carbonCopyPersonnels })
       if (!checkParams.some(tt => !!tt)) {
         // 提示至少填写一项