From 6d3a27fcfa07432237458224f45db77640a5ccbf 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:50:53 +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?=E6=B5=81=E7=A8=8B=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StandardConsultationProcess.vue                           | 2 ++
 .../StandardEntryOrChangeProcess.vue                          | 4 +++-
 .../standardProcurementProcess/StandardProcurementProcess.vue | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue b/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue
index 1eb62a0f..a59d62b3 100644
--- a/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue
+++ b/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue
@@ -1164,6 +1164,7 @@ export default {
       if (!formData) {
         return
       }
+      formData.basicTaskInfoDTO.commitFlag = 1 // 同意就传1，驳回传2，其他都为空
       this.loading = true
       agreeConsultationProcess(formData).then(res => {
         if (res.success) {
@@ -1185,6 +1186,7 @@ export default {
       if (!formData) {
         return
       }
+      formData.basicTaskInfoDTO.commitFlag = 2 // 同意就传1，驳回传2，其他都为空
       this.loading = true
       rejectConsultationProcess(formData).then(res => {
         if (res.success) {
diff --git a/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue b/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue
index 6872df23..6f06f10c 100644
--- a/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue
+++ b/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue
@@ -907,7 +907,7 @@ export default {
       formData.businessId = this.businessId
       formData.draftId = this.$route.query.draftId
       // saveSource：从待办进入保存--1；发起/草稿页面--2
-      if (this.currentNode !== FGEntryChangeProcessNode.initiate.value || this.$route.query.processInstanceId) {
+      if (this.$route.query.processInstanceId) {
         formData.saveSource = 1
       } else {
         formData.saveSource = 2
@@ -962,6 +962,7 @@ export default {
       if (!formData) {
         return
       }
+      formData.basicTaskInfoDTO.commitFlag = 1 // 同意就传1，驳回传2，其他都为空
       this.loading = true
       agreeStandardECProcess(formData).then(res => {
         if (res.success) {
@@ -983,6 +984,7 @@ export default {
       if (!formData) {
         return
       }
+      formData.basicTaskInfoDTO.commitFlag = 2 // 同意就传1，驳回传2，其他都为空
       this.loading = true
       rejectStandardECProcess(formData).then(res => {
         if (res.success) {
diff --git a/src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue b/src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue
index 89363fba..744c5c10 100644
--- a/src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue
+++ b/src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue
@@ -523,6 +523,7 @@ export default {
       if (!formData) {
         return
       }
+      formData.basicTaskInfoDTO.commitFlag = 1 // 同意就传1，驳回传2，其他都为空
       this.loading = true
       agreeProcurementProcess(formData).then(res => {
         if (res.success) {
@@ -544,6 +545,7 @@ export default {
       if (!formData) {
         return
       }
+      formData.basicTaskInfoDTO.commitFlag = 2 // 同意就传1，驳回传2，其他都为空
       this.loading = true
       rejectProcurementProcess(formData).then(res => {
         if (res.success) {