From 038e7d3554d07e64f9f240533326f1f953e84813 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= <zhaoxiaox0053@163.com>
Date: Fri, 12 Jan 2024 11:56:29 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93/?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4=E3=80=81=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81=E3=80=81=E6=B3=95=E8=A7=84=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E5=BC=BA=E5=88=B6=E6=92=A4=E5=9B=9E=E5=8F=82=E6=95=B0=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StandardConsultationProcess.vue           |  4 +++
 .../StandardEntryOrChangeProcess.vue          | 27 ++++++++++++++-----
 .../StandardProcurementProcess.vue            |  4 +++
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue b/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue
index d63c8465..ad87ebe8 100644
--- a/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue
+++ b/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue
@@ -1140,6 +1140,10 @@ export default {
       let func
       if (!this.currentNode || (this.currentNode.indexOf(ConsultationProcess.initiate.value) === 0 && !this.$route.query.processInstanceId)) {
         func = initiateConsultationProcess
+        const saveForm = this.dealFormData(true)
+        if (saveForm) {
+          formData.infoJsonStr = JSON.stringify(saveForm)
+        }
       } else {
         func = submitConsultationProcess
       }
diff --git a/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue b/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue
index cff3c73f..1b0911d9 100644
--- a/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue
+++ b/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue
@@ -871,10 +871,7 @@ export default {
       }
       return flag
     },
-    /**
-     * 保存
-     */
-    handleSave () {
+    dealSaveJsonData () {
       const formInline = Object.assign({ ...this.defaultValue }, { ...this.formInline })
       Object.keys(formInline).forEach(res => {
         if (formInline[res] instanceof Array) {
@@ -902,11 +899,23 @@ export default {
       if (!Object.values(params).some(tt => !!tt || tt === 0)) {
         // 提示至少填写一项
         this.$message.warning(this.$t('pleaseFillInAtLeastOneItem'))
+        return false
+      }
+      return formData
+    },
+    /**
+     * 保存
+     */
+    handleSave () {
+      const saveForm = this.dealSaveJsonData()
+      if (!saveForm) {
         return
       }
-      formData.infoJsonStr = JSON.stringify(formData)
-      formData.businessId = this.businessId
-      formData.draftId = this.$route.query.draftId
+      const formData = {
+        infoJsonStr: JSON.stringify(saveForm),
+        businessId: this.businessId,
+        draftId: this.$route.query.draftId
+      }
       // saveSource：从待办进入保存--1；发起/草稿页面--2
       if (this.$route.query.processInstanceId) {
         formData.saveSource = 1
@@ -936,6 +945,10 @@ export default {
       let submitFunc
       if (this.currentNode === FGEntryChangeProcessNode.initiate.value && !this.$route.query.processInstanceId) {
         submitFunc = initiateStandardECProcess
+        const saveForm = this.dealSaveJsonData()
+        if (saveForm) {
+          formData.infoJsonStr = JSON.stringify(saveForm)
+        }
       } else {
         submitFunc = agreeStandardECProcess
       }
diff --git a/src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue b/src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue
index 48d89635..797b1421 100644
--- a/src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue
+++ b/src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue
@@ -496,6 +496,10 @@ export default {
       let submitFunc
       if (this.currentNode === ProcurementProcessNodes.initiate.value && !this.$route.query.processInstanceId) {
         submitFunc = initProcurementProcess
+        const saveForm = this.dealFormData(true)
+        if (saveForm) {
+          formData.infoJsonStr = JSON.stringify(saveForm)
+        }
       } else {
         submitFunc = agreeProcurementProcess
       }