From ed63d88addbc94a37b3c7be88f748db4bdd833d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Sun, 7 Nov 2021 16:49:03 +0800
Subject: [PATCH] commit

---
 .../pages/creatProcess/xmpg2/step1-1.vue      |  5 ++++
 .../pages/creatProcess/xmpg2/step1.vue        |  5 ++++
 .../pages/creatProcess/xmpg2/step3.vue        |  6 ++++-
 .../pages/creatProcess/xmpg2/step5.vue        |  2 ++
 .../pages/creatProcess/xmqdqr/step2.vue       | 25 ++++++++++++++-----
 5 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
index 779a2bd7a..c42bee374 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
@@ -515,6 +515,11 @@ export default {
       this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId }, {
         _this: this
       }, res => {
+        res.data.records.forEach(item => {
+          if(item.zrbm === "[]"){
+            item.zrbm = ''
+          }
+        })
         this.listForm.dataList = res.data.records;
         this.dataList = res.data.records;
         let ids = [];
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
index b192d5f89..fbf732ac1 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
@@ -525,6 +525,11 @@ export default {
       this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId }, {
         _this: this
       }, res => {
+        res.data.records.forEach(item => {
+          if(item.zrbm === "[]"){
+            item.zrbm = ''
+          }
+        })
         this.listForm.dataList = res.data.records;
         this.dataList = res.data.records;
         this.listForm.dataList.forEach(item => {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
index 842ceab23..4e770b15a 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
@@ -337,7 +337,6 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
-      console.log(item);
       let routeUrl = this.$router.resolve({
         name: "OtherStandardDetails",
         params: {
@@ -400,6 +399,11 @@ export default {
           this.listForm["id"] = item.id;
           this.listForm.dataList = item.dataList;
           this.dataList = item.dataList;
+          this.dataList.forEach(item => {
+            if(item.zrbm === "[]"){
+              item.zrbm = ''
+            }
+          })
           this.dataList.distributePerson = item.dataList[0].distributePerson;
           this.listForm.breakdownList = item.breakdownList;
         } else {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
index 2b1b5616d..141206bc9 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
@@ -407,6 +407,7 @@ export default {
     },
     //动态表单读取
     getFormFieldList(item) {
+      console.log(item);
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
         if (item.form === undefined) {
@@ -472,6 +473,7 @@ export default {
     //提交事件
     handleSubmit() {
       this.isSubmit = true;
+      console.log(this.dataList);
       this.listForm.commentText = this.commentText;
       this.listForm.children = this.dataList[0].children
       this.listForm.dataList = this.dataList
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
index 2ad37bfa7..66fd6aece 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
@@ -382,21 +382,34 @@
       </div>
     </el-drawer>
     <ProcessFooter
-      :show-save="submitShow"
-      :show-transfer="submitShow"
-      :show-affirm="submitShow"
-      :show-submit="submitShow"
-      :show-confirm="acceptShow"
+      show-save
+      show-transfer
+      show-affirm
       :submitLoading="isSubmit"
       :transfer-loading="isTransfer"
       :saveLoading="saveLoading"
       @submit="handleSubmit"
       @transfer="handleTransfer"
       @save="handleSave"
-      @accept="handleAccept"
       :approval="true"
     >
     </ProcessFooter>
+<!--    <ProcessFooter-->
+<!--      :show-save="submitShow"-->
+<!--      :show-transfer="submitShow"-->
+<!--      :show-affirm="submitShow"-->
+<!--      :show-submit="submitShow"-->
+<!--      :show-confirm="acceptShow"-->
+<!--      :submitLoading="isSubmit"-->
+<!--      :transfer-loading="isTransfer"-->
+<!--      :saveLoading="saveLoading"-->
+<!--      @submit="handleSubmit"-->
+<!--      @transfer="handleTransfer"-->
+<!--      @save="handleSave"-->
+<!--      @accept="handleAccept"-->
+<!--      :approval="true"-->
+<!--    >-->
+<!--    </ProcessFooter>-->
     <!-- 福田全公司选人解决方案 -->
     <Role-tree
         check-box