From 9e7526264d54a7bbb08bd485cb666ec97c05cf51 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, 12 May 2022 10:55:31 +0800
Subject: [PATCH] =?UTF-8?q?52749=20=E6=A0=87=E5=87=86=E8=B0=83=E7=A0=94?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=20=E6=B5=81=E7=A8=8B=E5=8F=91=E8=B5=B7=20?=
 =?UTF-8?q?=E5=9C=A8=E9=80=89=E4=BA=BA=E7=9A=84=E7=95=8C=E9=9D=A2=20?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=95=B0=E6=8D=AE=20=E6=9C=AA=E8=B7=B3?=
 =?UTF-8?q?=E5=87=BA=E9=A1=B5=E9=9D=A2=20=E7=82=B9=E5=87=BB=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=20=E6=B5=81=E7=A8=8B=E4=B8=A2=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzdy/step1.vue         | 39 ++++++++++++-------
 .../tabComponents/taskDraft/index.vue         |  2 +-
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
index c0847bffe..91c7fef8b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
@@ -269,7 +269,7 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import { saveTaskFirst } from 'api/process'
+import { queryTaskFirst, saveTaskFirst } from "api/process";
 import { taskDel } from 'api/process'
 export default {
   name: "bzdyStep1",
@@ -559,14 +559,13 @@ export default {
         this.saveLoading = false
       })
     },
-    handleSubmit(username) {
+    handleSubmit() {
       this.$refs['qbkwForm'].validate((valid) => {
         if (valid) {
           this.$refs['Form'].validate((valid) => {
             if (valid) {
               this.isSubmit = true
               this.$http.post('lawss/activiti/startProcessRollBack', {
-                id: this.bpnId || '',
                 createUser: this.$store.getters.userInfo.userId,
                 createUserName: this.$store.getters.userInfo.userName,
                 type: '2',
@@ -586,14 +585,12 @@ export default {
                   }, {}, res => {
                     if (res.success) {
                       this.$message.success('流程发起成功')
-                      if (this.bpnId !== '') {
-                        let taskId = {
-                          id: this.bpnId
-                        }
-                        taskDel(taskId).then(res=>{
-                          return res
-                        })
+                      let taskId = {
+                        id: this.$route.query.bpnId
                       }
+                      taskDel(taskId).then(res=>{
+                        return res
+                      })
                       this.$router.push('/processCenter')
                     }
                     this.isSubmit = false
@@ -612,12 +609,28 @@ export default {
         }
       })
     },
-    aa () {
-      return 11111
-    }
+    getData () {
+      queryTaskFirst({
+        bpnId: this.bpnId
+      }).then(res => {
+        this.bpnId = this.$route.query.bpnId
+        let mes = JSON.parse(res.mes)
+        if (mes.form.date) {
+          mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+        } else {
+          mes.form.date = ''
+        }
+        this.form = mes.form
+        this.roleForm = mes.roleForm
+        this.commentText1 = mes.commentText1 || ''
+      })
+    },
   },
   mounted () {
     this.bpnId = this.$route.query.bpnId
+    if (this.bpnId !== undefined) {
+      this.getData()
+    }
   },
 }
 </script>
diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
index 2388596ef..e6aed9d79 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
@@ -621,7 +621,7 @@ export default {
               // 法规入库及评估流程
         case '2':
           this.$router.push({
-            name: 'bzdyStep1-1',
+            name: 'bzdyStep1',
             query: {
               type: '2',
               processName: '标准调研流程',