From b973182064524a6fde0ea8c5c3a2f35a8ebccd31 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 16:48:15 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E3=80=81=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=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/NoMatchTrackingProcess.vue    | 9 +++++++--
 .../ProjectComplianceEvaluationProcess.vue               | 7 ++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/views/workCenter/noMatchTrackingProcess/NoMatchTrackingProcess.vue b/src/views/workCenter/noMatchTrackingProcess/NoMatchTrackingProcess.vue
index a6ee1995..f3dd7d1b 100644
--- a/src/views/workCenter/noMatchTrackingProcess/NoMatchTrackingProcess.vue
+++ b/src/views/workCenter/noMatchTrackingProcess/NoMatchTrackingProcess.vue
@@ -417,7 +417,7 @@ export default {
         if (res.success) {
           const { result = {} } = res
           // 草稿从json里取得
-          if (this.$route.query.draftId) {
+          if (result.infoJsonStr) {
             const draftResult = JSON.parse(result.infoJsonStr)
             this.processInfo = draftResult.processInfo
             this.businessInfo = draftResult.businessInfo
@@ -523,6 +523,7 @@ export default {
       const processInfo = Object.assign(this.processInfo, this.processInfoForm.getFieldsValue())
       const businessInfo = Object.assign(this.businessInfo, this.businessInfoForm.getFieldsValue())
       const approvalInfo = Object.assign(this.approvalInfo, this.approvalInfoForm.getFieldsValue())
+      approvalInfo.taskId = this.$route.query.taskId
       const userInfo = this.$refs.personnelInfo.getDataObj()
       const checkValueArr = Object.values({ ...processInfo, ...businessInfo, ...approvalInfo, ...userInfo })
       if (!checkValueArr.some(tt => !tt) && this.dataSource.length === 0) {
@@ -530,7 +531,11 @@ export default {
         this.$message.warning(this.$t('pleaseFillInAtLeastOneItem'))
         return
       }
-      const formData = { processInfo, businessInfo, approvalInfo, dataSource: this.dataSource, userInfo }
+      const formData = {
+        processInfo, businessInfo, approvalInfo, userInfo,
+        dataSource: this.dataSource,
+        basicTaskInfoDTO: approvalInfo
+      }
       this.loading = true
       saveNoMatchTrackingProcess({ infoJsonStr: JSON.stringify(formData) }).then(res => {
         if (res.success) {
diff --git a/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue b/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue
index 16613c92..f1e5cc01 100644
--- a/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue
+++ b/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue
@@ -897,8 +897,8 @@ export default {
         if (res.success) {
           const { result = {} } = res
           this.approvalInfo = Object.assign({}, result.basicTaskInfoDTO)
-          // 如果是草稿，会从json里取数据
-          if (this.$route.query.draftId) {
+          // 如果有草稿，会从json里取数据
+          if (result.infoJsonStr) {
             const draftResult = JSON.parse(result.infoJsonStr)
             // 发起节点数据处理
             if (this.currentNode === ProjectComplianceEvaluationProcessNode.initiate.value) {
@@ -1318,7 +1318,8 @@ export default {
       const params = {
         infoJsonStr: JSON.stringify(formData),
         basicProcessInfoDTO: processInfo,
-        draftId: this.$route.query.draftId
+        draftId: this.$route.query.draftId,
+        basicTaskInfoDTO: Object.assign(formData.approvalInfo, { taskId: this.$route.query.taskId })
       }
       this.loading = true
       saveProjectComplianceEvaluation(params).then(res => {