From e15e9574a8607392653458c48f07aacaa10df226 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 7 Feb 2022 16:51:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E8=8D=89=E7=A8=BF=E5=8F=8A=E6=95=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzpg/step1.vue         | 15 ++++--
 .../tabComponents/taskDraft/index.vue         | 49 +++----------------
 2 files changed, 18 insertions(+), 46 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
index b83cd4a39..f506012a9 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
@@ -1125,10 +1125,17 @@ export default {
         bpnId: this.$route.query.bpnId
       }).then(res => {
         let mes = JSON.parse(res.mes);
-        this.listForm = mes.listForm;
-        this.dataList = mes.listForm.dataList
-        this.roleForm = mes.roleForm;
-        this.commentText = mes.commentText;
+        if(!mes.json){
+          this.listForm = mes.form
+          this.dataList = mes.form.dataList;
+          this.roleForm = mes.roleForm
+          this.commentText = mes.commentText
+        }else{
+          this.listForm = mes.json.form;
+          this.dataList = mes.json.form.dataList
+          this.roleForm =  mes.json.roleForm;
+          this.commentText = mes.json.commentText;
+        }
       });
     },
   },
diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
index d9d3608df..0019a5ff9 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
@@ -616,49 +616,14 @@ export default {
           }
           break
         case '5':
-          if(mes !== null && mes.taskInfo !== null){
-            if (mes.taskInfo === '选择已拆分标准') {
-              this.$router.push({
-                name: 'xmpgStep1-1',
-                query: {
-                  type: '5',
-                  processName: '项目合规评估流程-标准',
-                  bpnId: id,
-                  verifySarStandard: true,
-                }
-              })
+          this.$router.push({
+            name: 'bzpgStep1',
+            query: {
+              type: '5',
+              processName: '项目合规评估流程-标准',
+              bpnId: id
             }
-            // else if (mes.taskInfo === '分发责任人分发任务') {
-            //   this.$router.push({
-            //     name: 'bzqdfbStep1-3',
-            //     query: {
-            //       type: '5',
-            //       processName: '项目合规评估流程-标准',
-            //       bpnId: id
-            //     }
-            //   })
-            // }else if (mes.taskInfo === '责任人填写评估反馈') {
-            //   this.$router.push({
-            //     name: 'bzqdfbStep1-3',
-            //     query: {
-            //       type: '5',
-            //       processName: '项目合规评估流程-标准',
-            //       bpnId: id
-            //     }
-            //   })
-            // }
-          }else {
-            this.$router.push({
-              name: 'xmpgStep1-1',
-              query: {
-                type: '5',
-                processName: '项目合规评估流程-标准',
-                bpnId: id,
-                verifySarStandard: true,
-              }
-            })
-          }
-
+          })
           break
         case '6':
           this.$router.push({