diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue index e45012b6b..9963976a9 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue @@ -397,26 +397,38 @@ export default { this.qbfsForm.bafzFlag = '0' this.qbfsForm.dataList = this.dataList; let json = JSON.stringify(this.qbfsForm); - this.$http.post("lawss/activiti/completeTask", { - taskIds: this.$route.query.taskIds, - userId: this.$store.getters.userInfo.userId, - json: json - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); + let params = { + type: this.qbfsForm.nextStatus, + id: this.qbfsForm.standId, + } + this.$http._getData('lawss/sarBussionessStand/repeal',params,{}).then(res => { + if(res && res.ok){ + this.completeTask(json) } - this.isSubmit = false; - }, e => { - }); + }).catch(e=>{ + console.log(e) + }) }else{ this.$message.warning('请完善基础信息') } }) }, - + completeTask(json){ + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.$route.query.taskIds, + userId: this.$store.getters.userInfo.userId, + json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + this.isSubmit = false; + }, e => { + }); + }, handleTabs(name) { this.active = name; }, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue index 00ad7ef10..c1f364321 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue @@ -553,8 +553,8 @@ export default { if (res.success) { this.addLog(this.qbfsForm) this.$message.success(res.message) - if(this.type === '4'){ - this.batchToDoTasks(data).then((result)=>{ + if(this.type === '4' && data.isNot === '1'){ + this.batchToDoTasks(data.ids).then((result)=>{ if(result.success){ console.log(result) this.$router.push('/processCenter') diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index 0d5eabad8..ea15f9894 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -919,6 +919,15 @@ export default { } }) } + }else{ + this.$router.push({ + name: 'qbzxdjhgkStep1', + query: { + type: '25', + processName: '企标制修订计划管控', + bpnId: id + } + }) } break