From 70584a93045b101d8602ce66e3d27112b5df4985 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Mon, 4 Apr 2022 18:03:51 +0800
Subject: [PATCH] feat: There is no way the, bug #52330

---
 src/pages/processCenter/pages/creatProcess/zcrk/step1.vue  | 7 ++++++-
 .../pages/processList/tabComponents/taskDraft/index.vue    | 6 +++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
index 4c02c93ad..1a2f957ca 100644
--- a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
@@ -1430,13 +1430,18 @@
                 }).then(res => {
                     this.verifySarStandard = this.$route.query.verifySarStandard
                     let mes = JSON.parse(res.mes)
-                    mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+                    console.log(mes)
                     this.form = mes.form
+                    this.form.date = new Date(this.$moment(this.form.date).format('YYYY-MM-DD'))
                     let dateArr = []
                     if(mes.commentCycleStart && mes.commentCycleEnd){
                         dateArr[0] = mes.commentCycleStart
                         dateArr[1] = mes.commentCycleEnd
                         this.commentCycleDate = dateArr
+                    }else if(mes.form.commentCycleStart && mes.form.commentCycleEnd){
+                        dateArr[0] = mes.form.commentCycleStart
+                        dateArr[1] = mes.form.commentCycleEnd
+                        this.commentCycleDate = dateArr
                     }
                     this.form['lawsSyqy'] = this.filterObj(this.form['lawsSyqy'])
                     this.form['lawsSycx'] = this.filterObj(this.form['lawsSycx'])
diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
index ff3bb2a95..2388596ef 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
@@ -817,9 +817,9 @@ export default {
             }
           })
           break
-              // 标准入库、
+              // 政策入库、
         case 'laws1':
-          if(mes !== null && mes.taskInfo !== null){
+            if(mes !== null && mes.taskInfo !== null && mes.taskInfo !== undefined) {
             if (mes.taskInfo === '申请人发起') {
               this.$router.push({
                 name: 'zcrkStep1',
@@ -843,7 +843,7 @@ export default {
             }
           }else {
             this.$router.push({
-              name: 'zcrkStep3',
+              name: 'zcrkStep1',
               query: {
                 type: '1',
                 processName: '申请人发起流程',