From 2d73e6c41708bc3c8fc0ad0b69ce67d2ce615616 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 21 Apr 2022 11:11:37 +0800
Subject: [PATCH] =?UTF-8?q?52646=20=E3=80=90=E7=BA=BF=E4=B8=8A=E3=80=91?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B-?=
 =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=85=A5=E5=BA=93=20=E4=BF=AE=E8=AE=A2?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=20=E5=9B=9E=E6=89=A7=E8=AF=B4=E6=98=8E?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=20=E6=97=A0=E6=B3=95=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processCenter/pages/creatProcess/bzrk/step2.vue    |  2 +-
 .../processCenter/pages/creatProcess/bzrk/step4.vue    | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index 7d991ee2e..27c206b68 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -707,7 +707,7 @@
       </div>
     </div>
     <div class="content" v-if="active === '3'">
-      <div class="flow-list">
+      <div >
         <el-table
           height="100%"
           ref="selection"
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index bf2950723..01ac0985b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -1563,6 +1563,7 @@ export default {
   data() {
     return {
       submitType: '',
+      bpnId: '',
       modalShowRoleFlag: false,
       fileList: [],
       caFileList: [],
@@ -2612,6 +2613,7 @@ export default {
             } else {
               //表单文件处理
               this.getFormFieldList(processForm.form)
+              this.commentText = processForm.form.commentText
             }
           }
         }).catch(e => {
@@ -2623,6 +2625,7 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList(item) {
+      console.log(item);
       this.$nextTick(() => {
         this.form = JSON.parse(JSON.stringify(item))
         this.defaultCheckedKeys = [this.form.standSystem];
@@ -2665,7 +2668,6 @@ export default {
     //   })
     // },
     initializeFileList(property, value) {
-      console.log(property);
       switch (property) {
         case 'xgd':
           this.getFileList(value, this.xgdFileList);
@@ -2758,9 +2760,10 @@ export default {
       //表单文件处理
       this.fileInfoHandle();
       this.form.country = this.countryArr;
+      this.form.commentText = this.commentText;
       this.saveLoading = true
       let _formData = new FormData()
-      _formData.append('id', this.bpnId)
+      _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')
@@ -2843,6 +2846,8 @@ export default {
                 this.form.commentText = this.commentText
                 this.form.approvalOpinion = this.approvalOpinion
                 const json = JSON.stringify(this.form);
+                console.log(json);
+                return;
                 this.$http.post('lawss/activiti/completeTask', {
                   taskIds: this.taskIds,
                   userId: this.userId,
@@ -2924,6 +2929,7 @@ export default {
     this.getData()
   },
   mounted() {
+    this.bpnId = this.$route.query.bpnId
     this.processTable()
     this.$http.get('sys/dictype/getDicTypeListCode', '', {
       _this: this