diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index 0aaef349e..f307e3bb8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -155,6 +155,21 @@ +
+ + +
+ + +
+
+
+
@@ -735,6 +750,7 @@ export default { pageSizeNo: this.$store.getters.userInfo.configContent }, standList: [], //新添加的标准 + commentText: '', modalshowflag: false, // drawer开关 modalshowflag2: false, nodeList2: [], @@ -1052,6 +1068,7 @@ export default { if (this.dataList.length < 1) { this.$message.warning("标准不能为空"); } else { + this.listForm.commentText = this.commentText var json = Object.assign(this.listForm, this.roleForm); this.$refs["qdfbForm"].validate((valid) => { if (valid) { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue index ade22d84d..1060f42c4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue @@ -134,6 +134,21 @@
+
+ + +
+ + +
+
+
+
@@ -421,6 +436,7 @@ export default { totalNo: 0, prcNum: '', pageSizeNo: this.$store.getters.userInfo.configContent, + commentText:'', listForm: { listName: "", //清单名称 // applyRegion: "", //适用区域 @@ -677,6 +693,7 @@ export default { }, //提交事件 handleSubmit() { + this.listForm.commentText = this.commentText const json = JSON.stringify(this.listForm); this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue index 358b5f851..bb2722e67 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue @@ -384,14 +384,15 @@ export default { }, //驳回事件 beforeBack() { - this.listForm.approvalOpinion = "1"; - this.handleSubmit(); - }, - //提交事件 - handleSubmit() { if (this.commentText === null || this.commentText === undefined || this.commentText === "") { this.$message.warning("请填写审批意见"); } else { + this.listForm.approvalOpinion = "1"; + this.handleSubmit(); + } + }, + //提交事件 + handleSubmit() { this.isSubmit = true this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); @@ -408,7 +409,6 @@ export default { } this.isSubmit = false }); - } }, //选择标准取消事件 closeDrawer() { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 24ecd52e3..1ab67aba8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -158,6 +158,21 @@
+
+ + +
+ + +
+
+
+
@@ -712,6 +727,7 @@ export default { pageSizeNo: this.$store.getters.userInfo.configContent }, standList: [], //新添加的标准 + commentText: '', modalshowflag: false, // drawer开关 modalshowflag2: false, nodeList2: [], @@ -1024,6 +1040,7 @@ export default { if (this.dataList.length < 1) { this.$message.warning("标准不能为空"); } else { + this.listForm.commentText = this.commentText var json = Object.assign(this.listForm, this.roleForm); this.$refs["qdfbForm"].validate((valid) => { if (valid) { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index f651fe48e..0fea2918a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -387,9 +387,6 @@ export default { }, //提交事件 handleSubmit() { - if (this.commentText === null || this.commentText === undefined || this.commentText === "") { - this.$message.warning("请填写会签意见"); - }else{ this.isSubmit = true this.listForm.commentText = this.commentText; this.listForm.approvalOpinion = ""; @@ -410,7 +407,6 @@ export default { }, e => { }); - } }, //选择标准取消事件 closeDrawer() { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index 8c29d742e..3761e3f62 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -149,6 +149,21 @@
+
+ + +
+ + +
+
+
+
@@ -392,6 +407,7 @@ export default { // 当前流程类型(1待办/2已办) processType: 1, searching: false, + commentText:'', standardTypeOptions: [ { value: "INLAND", @@ -711,6 +727,7 @@ export default { }, //提交事件 handleSubmit() { + this.listForm.commentText = this.commentText const json = JSON.stringify(this.listForm); this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index 0d8cf9310..cec4dac2b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -401,9 +401,6 @@ export default { }, //提交事件 handleSubmit() { - if (this.commentText === null || this.commentText === undefined || this.commentText === "") { - this.$message.warning("请填写审批意见"); - } else { this.isSubmit = true this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); @@ -420,7 +417,6 @@ export default { } this.isSubmit = false }); - } }, //选择标准取消事件 closeDrawer() {