diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index 92c075e4a..c93396988 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -443,32 +443,34 @@ - + - - - - - - - + @selection-change="selectThree" + > + + + + + + + + - + - - - - - - - + @selection-change="selectThree" + > + + + + + + + + { let index; index = this.breakdownList.findIndex(items => { - return items.itemsName === item.itemsName; + return items.itemsName === item.itemsName && items.projectName === item.projectName; }); if (index > -1) { this.breakdownList.splice(index, 1); @@ -874,6 +875,7 @@ export default { //保存事件 handleSave() { this.saveLoading = true; + this.listForm.breakdownList = this.breakdownList; let _formData = new FormData(); _formData.append("id", this.bpnId || ""); _formData.append("prcType", "5"); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index c73ea50ae..c56e7c3fd 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -731,6 +731,7 @@ export default { item.implementerId = this.$store.getters.userInfo.userId; item.implementer = this.$store.getters.userInfo.userName; }); + // this.commentText = '' this.dataList = item.step3DTOS; this.dataList.forEach(item => { this.$set(item,'complianceReasons', '') @@ -740,6 +741,7 @@ export default { }) } else { this.dataList = item.dataList; + // this.commentText = '' this.dataList.forEach(item => { item.implementerId = this.$store.getters.userInfo.userId; item.implementer = this.$store.getters.userInfo.userName; @@ -870,7 +872,7 @@ export default { saveBatchEditForm() { this.dataList.forEach(item => { this.selectList.forEach(items => { - if (item.itemNum === items.itemNum) { + if (item.itemNum === items.itemNum && item.projectName === items.projectName) { item.complianceReasons = this.batchEditForm.complianceReasons; //不合规 item.noCompliance = this.batchEditForm.noCompliance; @@ -881,6 +883,7 @@ export default { } }); }); + this.$refs.multipleTable.clearSelection() this.modalShowFlag = false; }, cancelBatchEditForm() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index 47848c7d6..365050bf3 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -568,6 +568,7 @@ export default { if(!this.commentText){ this.$message.warning('请填写审批意见') }else{ + this.isSubmit = true this.listForm.applyUpdUserId = this.dataList[0].distributePersonId this.listForm.commentText = this.commentText; this.listForm.dataList = this.dataList @@ -584,6 +585,7 @@ export default { this.$message.success(res.message) this.$router.push('/processCenter') } + this.isSubmit = false }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue index 9b38a0e3c..34161e456 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue @@ -553,6 +553,7 @@ export default { this.listForm.prcNum = this.prcNum this.listForm.prcName = this.prcName this.listForm.id = item.id + // this.commentText = '' this.dataList = item.dataList }) },