From f302bda2ffb08f62a71eae1615ebcd102c629d44 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, 31 Mar 2022 17:36:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=BB=E6=96=AD=E3=80=91=E6=94=BF=E7=AD=96?=
 =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B=EF=BC=9A?=
 =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E4=BA=BA(=E8=B4=A3=E4=BB=BB=E5=B7=A5?=
 =?UTF-8?q?=E7=A8=8B=E5=B8=88)=E5=A1=AB=E5=86=99=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=EF=BC=8C=E5=A1=AB=E5=86=99=E5=9B=9E=E6=89=A7=E8=AF=B4=E6=98=8E?=
 =?UTF-8?q?=E5=90=8E=E7=82=B9=E5=87=BB=E4=BF=9D=E5=AD=98=EF=BC=8C=E7=84=B6?=
 =?UTF-8?q?=E5=90=8E=E8=BD=AC=E5=8A=9E=E7=BB=99=E8=83=A1=E5=9B=BD=E9=94=90?=
 =?UTF-8?q?=EF=BC=8C=E8=83=A1=E5=9B=BD=E9=94=90=E7=82=B9=E5=87=BB=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E5=90=8E=EF=BC=8C=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=8A=A5?=
 =?UTF-8?q?500=2052301?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/zczqyj/step2.vue       |  2 +-
 .../pages/creatProcess/zczqyj/step3.vue       | 49 +++++++++++--------
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/zczqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/zczqyj/step2.vue
index 60f6d66ab..df87b96d6 100644
--- a/src/pages/processCenter/pages/creatProcess/zczqyj/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/zczqyj/step2.vue
@@ -287,7 +287,7 @@ export default {
       json.responUserAndInstitutionNameMap = this.form.responUserAndInstitutionNameMap;
       let _formData = new FormData();
       _formData.append("id", this.bpnId || "");
-      _formData.append("prcType", "12");
+      _formData.append("prcType", "laws2");
       _formData.append("taskIds", this.taskIds);
       _formData.append("json", JSON.stringify({
         form: json,
diff --git a/src/pages/processCenter/pages/creatProcess/zczqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/zczqyj/step3.vue
index fec7ffee5..23655e4b9 100644
--- a/src/pages/processCenter/pages/creatProcess/zczqyj/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/zczqyj/step3.vue
@@ -384,26 +384,7 @@ export default {
     handleTabs(name) {
       this.active = name
     },
-    handleSave() {
-      this.saveLoading = true;
-      let _formData = new FormData();
-      let json = this.form
-      json.data = this.data
-      _formData.append("id", this.bpnId || "");
-      _formData.append("prcType", "3");
-      _formData.append("taskIds", this.taskIds);
-      _formData.append("json", JSON.stringify({
-        form: json,
-        commentText: this.commentText
-      }));
-      saveTaskForPub(_formData).then(res => {
-        this.saveLoading = false;
-        this.$message.success("保存成功");
-        this.bpnId = res.result;
-      }).catch(e => {
-        this.saveLoading = false;
-      });
-    },
+
     handleAccept() {
       this.isSubmit = true
       execTask({
@@ -416,6 +397,29 @@ export default {
         this.isSubmit = false
       })
     },
+    handleSave() {
+      this.saveLoading = true;
+      let json = this.json
+      json.commentText = this.commentText
+      json.info = this.data
+      json.form = this.form
+      let _formData = new FormData();
+      _formData.append("id", this.bpnId || "");
+      _formData.append("prcType", "laws2");
+      _formData.append("taskIds", this.taskIds);
+      _formData.append("json", JSON.stringify({
+        form: json,
+        dataList: this.data,
+        commentText: this.commentText
+      }));
+      saveTaskForPub(_formData).then(res => {
+        this.saveLoading = false;
+        this.$message.success("保存成功");
+        this.bpnId = res.result;
+      }).catch(e => {
+        this.saveLoading = false;
+      });
+    },
     handleSubmit() {
       if (this.data.length < 1) {
         this.$message.warning('请输入征求意见')
@@ -505,8 +509,11 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList(item) {
+      console.log(item);
       this.$nextTick(() => {
-        this.form = JSON.parse(JSON.stringify(item));
+        this.form = item.form ? JSON.parse(JSON.stringify(item.form.form)) :  JSON.parse(JSON.stringify(item));
+        this.data = item.form ? item.dataList : []
+        this.commentText = item.form ? item.commentText : ''
       });
     },
   },