From f8b075c8a48308d43a5421b503c5ee32584cac75 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Wed, 27 Dec 2023 13:42:30 +0800
Subject: [PATCH] =?UTF-8?q?feature(=E4=BA=A7=E5=93=81=E6=A0=87=E5=87=86):?=
 =?UTF-8?q?=20=E6=A0=87=E5=87=86=E5=8C=96=E5=A4=8D=E5=AE=A1=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E6=B7=BB=E5=8A=A0=E4=BF=9D=E5=AD=98=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/qbrk-product/step7.vue  | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue
index 6c8cc4f30..98fc78aa4 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue
@@ -140,15 +140,16 @@
     <!--        保存||提交-->
     <ProcessFooter
       v-show="verifySarStandard"
-      :show-save="false"
       show-over2
       show-submit2
       show-transfer
+      show-save
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
       @transfer="handleTransfer"
       @submit2="handle2"
       @over2="handle1"
+      @save="handleSave"
     />
     <el-dialog
       v-dragDialogWidth
@@ -532,7 +533,7 @@ import formList from './common/formList.vue'
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import { saveTaskFirst, queryTaskFirst, getBusStandFileByAttId, inboundLiaisonDetail, changeAssigneeNew } from 'api/process';
+import { saveTaskFirst, saveTaskForPub, queryTaskFirst, getBusStandFileByAttId, inboundLiaisonDetail, changeAssigneeNew } from 'api/process';
 import { getEvaluationIndex } from 'api/businessApi';
 import TreeSelect from '@/components/treeSelect/treeSelect.vue';
 import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
@@ -2163,21 +2164,22 @@ export default {
       // if(item.country !== undefined && item.country !== null){
       //   this.sarStandardsInfoEO.country = item.country.split(",");
       // }
-
+      this.isSubmit = true
       this.saveLoading = true
       const _formData = new FormData()
       // _formData.append('id', this.bpnId)
       _formData.append('createUser', this.$store.getters.userInfo.userId)
       _formData.append('createUserName', this.$store.getters.userInfo.uName)
+      _formData.append('taskIds', this.taskIds)
       _formData.append('prcType', 'buss2')
       _formData.append('prcName', '企标制修订-产品标准')
       _formData.append('json', JSON.stringify({
         taskInfo: this.taskInfo,
         form: this.form,
         roleForm: this.roleForm,
-        commentText: this.commentText
+        commentText: this.formTongGuo.commentText
       }))
-      saveTaskFirst(_formData).then(res => {
+      saveTaskForPub(_formData).then(res => {
         this.$message.success('保存成功')
         // this.bpnId = res.result
       }).finally(() => {
@@ -2441,7 +2443,11 @@ export default {
             pId: this.pId
           }).then(res => {
             if (res) {
-              const processForm = JSON.parse(res.mesg)
+              const mesg = JSON.parse(res.mesg)
+              const processForm = mesg.form || mesg
+              if (mesg.form) {
+                this.formTongGuo.commentText = mesg.commentText
+              }
               const dateArr = []
               if(processForm.commentCycleStart && processForm.commentCycleEnd) {
                 dateArr[0] = processForm.commentCycleStart