From edff9d419875f4a749161de3694eddefbdc51872 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Wed, 24 Nov 2021 10:06:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step4.vue         | 36 +++++++------------
 1 file changed, 13 insertions(+), 23 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 6b47933c8..4ab48c3bf 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -1629,19 +1629,6 @@ export default {
         }
       })
     },
-    getTaskId () {
-      queryTaskFirst({
-        bpnId: this.$route.query.bpnId
-      }).then(res => {
-        let mes = JSON.parse(res.mes)
-        mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
-        this.roleForm = mes.roleForm
-        this.commentText = mes.commentText
-        this.taskIds=mes.taskIds
-        //表单文件处理
-        this.getFormFieldList(mes.form)
-      })
-    },
     choiceZRR1 (type, title, id) {
       this.drawerTitle = title
       this.modalShowFlag1 = true
@@ -2215,7 +2202,12 @@ export default {
           if (res) {
             const processForm = JSON.parse(res.mesg)
             this.commentText = processForm.commentText
-            this.getFormFieldList(processForm)
+            if (processForm.form === undefined) {
+              this.getFormFieldList(processForm)
+            } else {
+              //表单文件处理
+              this.getFormFieldList(processForm.form)
+            }
           }
         }).catch(e => {
           console.log("错误")
@@ -2238,7 +2230,6 @@ export default {
         this.form.prcName = this.prcName
         this.form['id'] = item.id
 
-        console.log("this.form",this.form);
 
         // 遍历对象
         for(const p in this.form) {
@@ -2328,22 +2319,22 @@ export default {
       this.form.country=this.countryArr;
       this.saveLoading = true
       let _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('id', this.bpnId)
+      // _formData.append('createUser', this.$store.getters.userInfo.userId)
+      // _formData.append('createUserName', this.$store.getters.userInfo.uName)
       _formData.append('prcType', '1')
       _formData.append('taskIds', this.taskIds)
       _formData.append('json', JSON.stringify({
         form: this.form,
         roleForm: this.roleForm,
         commentText: this.commentText,
-        taskInfo: '申请人修订',
-        taskIds:this.taskIds
+        // taskInfo: '申请人修订',
+        // taskIds:this.taskIds
       }))
-      saveTaskFirst(_formData).then(res => {
+      saveTaskForPub(_formData).then(res => {
         this.saveLoading = false
         this.$message.success('保存成功')
-        // this.bpnId = res.result
+        this.bpnId = res.result
       }).catch(e => {
         this.saveLoading = false
       })
@@ -2442,7 +2433,6 @@ export default {
     this.getData()
   },
   mounted () {
-    this.getTaskId()
     this.processTable()
     this.$http.get('sys/dictype/getDicTypeListCode', '', {
       _this: this