diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue index 68d026f42..e639c09e6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue @@ -524,21 +524,48 @@ export default { } this.qbfsForm.commentText = this.commentText 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.addLog(this.qbfsForm) - this.$message.success(res.message) - this.$router.push('/processCenter') - } - this.isSubmit = false - }, e => { - }); + if(this.type !== '5'){ + let params = { + json, + sort:this.qbfsForm.bussSort[0], + prcName:this.qbfsForm.esName + + } + this.endPrcName(params).then((res)=>{ + if(res){ + this.completeTask() + } + }) + }else{ + this.completeTask() + } + + }, + 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.addLog(this.qbfsForm) + this.$message.success(res.message) + this.$router.push('/processCenter') + } + this.isSubmit = false + }, e => { + }); + }, + endPrcName(params){ + return new Promise((resolve, reject)=>{ + this.$http._getData('lawss/activiti/endPrcName',params,{}).then(res => { + resolve(res) + }).catch(e=>{ + reject(e) + }) + }) }, addLog(qbzxdFrom){ let json = Object.assign(qbzxdFrom); diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index 0dab7a900..8598c5ead 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -1261,6 +1261,9 @@ if (res.ok) { if (res.message === '操作成功') { this.$message.success(tips + '成功') + if(this.DrawerType === 'add'){ + this.addForm.esId = res.data + } this.getData() if(this.DrawerType === 'add'){ this.addForm.addFlag = '1'