From 7cf665e7c877b90f6b3f49dc22b267340184435c Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Fri, 12 May 2023 16:50:13 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=BA=9F=E6=AD=A2=E6=B5=81=E7=A8=8B=20?= =?UTF-8?q?=E6=89=B9=E5=87=86=E5=88=99=E5=BA=9F=E9=99=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbfz/step7.vue | 40 ++++++++++++------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue index e45012b6b..3754d4649 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.result){ + this.completeTask() } - this.isSubmit = false; - }, e => { - }); + }).catch(e=>{ + console.log(e) + }) }else{ this.$message.warning('请完善基础信息') } }) }, - + completeTask(){ + 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"); + } + this.isSubmit = false; + }, e => { + }); + }, handleTabs(name) { this.active = name; }, From e4c2234f16539459713cb4959e0a5cd09204ffed Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 15 May 2023 11:48:29 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=8D=89=E7=A8=BF-=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/processList/tabComponents/taskDraft/index.vue | 9 +++++++++ 1 file changed, 9 insertions(+) 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 From bfbbee0e900e7b8d300c2121665dff028acb7ed9 Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 15 May 2023 16:35:03 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E5=90=8D=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/qbzxdjhgk/step5.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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') From 5d2aca2b495ae3b76f0dec1321bfd0a705a8d4bf Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Mon, 15 May 2023 18:03:58 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=BA=9F=E6=AD=A2?= =?UTF-8?q?=E6=89=B9=E5=87=86=E6=B5=81=E7=A8=8B=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbfz/step7.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue index 3754d4649..9963976a9 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue @@ -402,8 +402,8 @@ export default { id: this.qbfsForm.standId, } this.$http._getData('lawss/sarBussionessStand/repeal',params,{}).then(res => { - if(res && res.result){ - this.completeTask() + if(res && res.ok){ + this.completeTask(json) } }).catch(e=>{ console.log(e) @@ -413,11 +413,11 @@ export default { } }) }, - completeTask(){ + completeTask(json){ this.$http.post("lawss/activiti/completeTask", { taskIds: this.$route.query.taskIds, userId: this.$store.getters.userInfo.userId, - json: json + json }, { _this: this }, res => {