diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue index edfd581ec..3d030eea3 100644 --- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue @@ -245,7 +245,7 @@
-
+
- +
-
+
{ - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - this.isSubmit = false - }, e => { + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ + this.isSubmit = true + this.wbbzform.signFlag = '0', + this.wbbzform.passUser = this.$store.getters.userInfo.userId, + this.wbbzform.commentText = this.commentText; + this.wbbzform.participantsData = this.participantsData + this.wbbzform.associationData = this.associationData + var json = JSON.stringify( this.wbbzform) + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + this.isSubmit = false + }, e => { - }); + }); + } }, }, mounted() { diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue index 0f9969045..d999dc6d1 100644 --- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue @@ -198,7 +198,7 @@
- +
-
+
{ - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - this.isSubmit = false - }, e => { + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ + this.isSubmit = true + this.wbbzform.bzFlag = '2', + this.wbbzform.passUser = this.$store.getters.userInfo.userId, + this.wbbzform.commentText = this.commentText; + this.wbbzform.participantsData = this.participantsData + this.wbbzform.associationData = this.associationData + var json = JSON.stringify( this.wbbzform) + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + this.isSubmit = false + }, e => { - }); + }); + } }, }, mounted() { diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step1-5.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step1-5.vue index 0a73bf5d8..9cce7ecc6 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step1-5.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step1-5.vue @@ -74,7 +74,7 @@
-
+
-
+
-
+
-
+
-
+