diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index d0dc8ab97..b809e03e2 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -23,6 +23,8 @@ + 立项 + 合并 延期 @@ -31,8 +33,6 @@ 更名 - 立项 - @@ -270,11 +270,11 @@ export default { }, data() { return { - toggleType: '1', + toggleType: '5', comFlag: 1, active: "1", commentText: "", - comName: "merge", + comName: "establish", qbfsForm: {}, formLoading: false, approvalFlag: false, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index ad6f211cc..2835e2d62 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -738,7 +738,6 @@ export default { this.$set(item,'countermeasures', '') this.$set(item,'completionTime', '') }) - } else { this.dataList = item.dataList; this.dataList.forEach(item => { @@ -811,33 +810,45 @@ export default { }, //提交事件 handleSubmit() { - this.handlePrice() - if(this.comFlag > 0) { - this.$message.warning('请填写完整的不符合项信息') - this.comFlag = 0 + let submitFlag = 0; + this.dataList.forEach(item => { + if(item.complianceReasons || item.noCompliance){ + submitFlag = 1 + } + return + }) + if(submitFlag === 0 ){ + this.$message.warning('请至少对一条信息进行评估') }else{ - this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; - this.listForm.commentText = this.commentText; - this.listForm.approvalOpinion = ""; - this.listForm.signFlag = ""; - this.listForm.dataList = this.dataList; - const json = JSON.stringify(this.listForm); - this.isSubmit = true; - 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 => { + this.handlePrice() + if(this.comFlag > 0) { + this.$message.warning('请填写完整的不符合项信息') + this.comFlag = 0 + }else{ + this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; + this.listForm.commentText = this.commentText; + this.listForm.approvalOpinion = ""; + this.listForm.signFlag = ""; + this.listForm.dataList = this.dataList; + const json = JSON.stringify(this.listForm); + this.isSubmit = true + return + 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 => { - }); + }); + } } }, //批量编辑 diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index 5b8749ebf..b13ecf8a2 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -794,33 +794,44 @@ export default { }, //提交事件 handleSubmit() { - this.handlePrice() - if(this.comFlag > 0) { - this.$message.warning('请填写完整的不符合项信息') - this.comFlag = 0 + let submitFlag = 0; + this.dataList.forEach(item => { + if(item.complianceReasons || item.noCompliance){ + submitFlag = 1 + } + return + }) + if(submitFlag === 0 ){ + this.$message.warning('请至少对一条信息进行评估') }else{ - this.listForm.dataList.forEach(item => { - if(item.workPeople === '请选择责任人'){ - item.workPeople = '' - } - }) - this.isSubmit = true; - this.listForm.commentText = this.commentText; - const json = JSON.stringify(this.listForm); - 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 => { - }); + this.handlePrice() + if(this.comFlag > 0) { + this.$message.warning('请填写完整的不符合项信息') + this.comFlag = 0 + }else{ + this.listForm.dataList.forEach(item => { + if(item.workPeople === '请选择责任人'){ + item.workPeople = '' + } + }) + this.isSubmit = true; + this.listForm.commentText = this.commentText; + const json = JSON.stringify(this.listForm); + 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 => { + }); + } } }, //标准表格选择框改变