From 817d3f4feca0a2b62d47881398d2969b4470b61a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Sat, 2 Apr 2022 17:53:21 +0800
Subject: [PATCH] =?UTF-8?q?52402=20=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7=20=E9=A9=B3?=
 =?UTF-8?q?=E5=9B=9E=E5=88=B0=E7=AC=AC=E4=B8=80=E6=AD=A5=EF=BC=8C=E7=84=B6?=
 =?UTF-8?q?=E5=90=8E=E7=AC=AC=E4=B8=80=E6=AD=A5=E4=BF=AE=E6=94=B9=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=EF=BC=8C=E7=82=B9=E4=BF=9D=E5=AD=98=EF=BC=8C=E5=86=8D?=
 =?UTF-8?q?=E6=AC=A1=E6=9F=A5=E7=9C=8B=EF=BC=8C=E4=BF=9D=E5=AD=98=E5=A4=B1?=
 =?UTF-8?q?=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/qbzxdjhgk/step1-5.vue   | 16 ----------------
 .../pages/creatProcess/qbzxdjhgk/step1.vue     | 18 +++++++-----------
 2 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue
index 79536fb63..5f1b04b41 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue
@@ -234,22 +234,6 @@
           <!--                                        </el-form-item>-->
         </el-form>
       </div>
-      <div>
-        <el-collapse accordion>
-          <el-collapse-item title="审批意见">
-            <div style="margin: 10px 0;">
-              <el-input
-                type="textarea"
-                :rows="3"
-                resize="none"
-                disabled
-                placeholder="请输入意见"
-                v-model="commentText">
-              </el-input>
-            </div>
-          </el-collapse-item>
-        </el-collapse>
-      </div>
     </div>
     <div class="content" v-show="active === '3'">
       <div class="flow-list" style="height: 100%">
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
index 48cd54c04..a1885e5fe 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
@@ -284,7 +284,7 @@ export default {
       formLoading: false,
       approvalFlag: false,
       showFlag: true,
-      taskId: '',
+      taskIds: '',
       bpnId: '',
       drawerTitle: "",
       nodeList: [],
@@ -330,12 +330,12 @@ export default {
     };
   },
   mounted() {
-   this.taskId = this.$route.query.taskIds
+   this.taskIds = this.$route.query.taskIds
     this.bpnId = this.$route.query.bpnId
     if (this.bpnId !== undefined) {
       this.getData()
     }
-    if(this.taskId){
+    if(this.taskIds){
       this.approvalFlag = true
       this.processTable()
       //被驳回时调用
@@ -387,10 +387,9 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList(item) {
-      console.log(item);
-      let type = item.type || item.qbfsForm.type
+      this.toggleType= item.type || item.qbfsForm.type
       this.$nextTick(() => {
-        switch (type){
+        switch (this.toggleType){
           case '1':
             this.comName = "merge"
             break
@@ -446,7 +445,6 @@ export default {
         qbzxdFrom.type = this.toggleType
         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.userName)
         _formData.append('prcType', '25')
@@ -469,10 +467,8 @@ export default {
         qbzxdFrom.type = this.toggleType
         this.saveLoading = true
         let _formData = new FormData()
-        console.log(qbzxdFrom);
-        _formData.append('id', this.bpnId || '')
-        _formData.append('createUser', this.$store.getters.userInfo.userId)
-        _formData.append('createUserName', this.$store.getters.userInfo.userName)
+        _formData.append("id", this.bpnId || "");
+        _formData.append("taskIds", this.taskIds);
         _formData.append('prcType', '25')
         _formData.append('json', JSON.stringify({
           roleForm: this.roleForm,