From fe28e0b569d6829c696e59dbe4f6fd766120ef10 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 24 Dec 2021 14:05:45 +0800 Subject: [PATCH] commit --- .../pages/creatProcess/zcch/step1-1.vue | 33 +++++++------------ .../pages/creatProcess/zcrh/step1-1.vue | 33 +++++++------------ 2 files changed, 24 insertions(+), 42 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/zcch/step1-1.vue b/src/pages/processCenter/pages/creatProcess/zcch/step1-1.vue index 6002f4bfb..09a5b3717 100644 --- a/src/pages/processCenter/pages/creatProcess/zcch/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/zcch/step1-1.vue @@ -774,28 +774,19 @@ this.$refs['Form'].validate((valid) => { if (valid) { this.isSubmit = true - this.$http.get('lawss/activiti/startProcess', { - type: '18' + var json = Object.assign(this.rhform, this.roleForm) + json.commentText = this.commentText + json.data1 = this.data1 + json.data2 = this.data2 + this.$http.post('lawss/activiti/completeTask', { + json: JSON.stringify(json), + taskId: res.data, + userId: this.$store.getters.userInfo.userId }, {}, res => { - if (res.ok) { - var json = Object.assign(this.rhform, this.roleForm) - json.commentText = this.commentText - json.data1 = this.data1 - json.data2 = this.data2 - this.$http.post('lawss/activiti/completeTask', { - json: JSON.stringify(json), - taskId: res.data, - userId: this.$store.getters.userInfo.userId - }, {}, res => { - if (res.success) { - this.$message.success('流程发起成功') - this.$router.push('/processCenter') - this.isSubmit = false - } else { - this.$message.warning('流程启动失败') - this.isSubmit = false - } - }) + if (res.success) { + this.$message.success('流程发起成功') + this.$router.push('/processCenter') + this.isSubmit = false } else { this.$message.warning('流程启动失败') this.isSubmit = false diff --git a/src/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue b/src/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue index 9dfef74cb..6c8116174 100644 --- a/src/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue @@ -752,28 +752,19 @@ this.$refs['Form'].validate((valid) => { if (valid) { this.isSubmit = true - this.$http.get('lawss/activiti/startProcess', { - type: '17' + var json = Object.assign(this.rhform, this.roleForm) + json.commentText = this.commentText + json.data1 = this.data1 + json.data2 = this.data2 + this.$http.post('lawss/activiti/completeTask', { + json: JSON.stringify(json), + taskId: res.data, + userId: this.$store.getters.userInfo.userId }, {}, res => { - if (res.ok) { - var json = Object.assign(this.rhform, this.roleForm) - json.commentText = this.commentText - json.data1 = this.data1 - json.data2 = this.data2 - this.$http.post('lawss/activiti/completeTask', { - json: JSON.stringify(json), - taskId: res.data, - userId: this.$store.getters.userInfo.userId - }, {}, res => { - if (res.success) { - this.$message.success('流程发起成功') - this.$router.push('/processCenter') - this.isSubmit = false - } else { - this.$message.warning('流程启动失败') - this.isSubmit = false - } - }) + if (res.success) { + this.$message.success('流程发起成功') + this.$router.push('/processCenter') + this.isSubmit = false } else { this.$message.warning('流程启动失败') this.isSubmit = false