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() + } }, } 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: '标准调研流程',