diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 5c11c4174..8adb96b92 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -128,8 +128,8 @@ - - + + - + @@ -1662,6 +1662,12 @@ export default { replaceLoading: true, replacePage: 1, rules: { + standSystem: [ + {required: true, message: '请选择标准体系', trigger: 'change'} + ], + treeListName: [ + {required: true, message: '请选择归档位置', trigger: 'blur'} + ], standSort: [ {required: true, message: '请选择标准类别', trigger: 'change'} ], @@ -2501,6 +2507,9 @@ export default { this.form.treeListName = checkedData.menuName this.form.treeListId = checkedData.id } + this.$nextTick(_ => { + this.$refs.form.validateField('treeListName') + }) this.modalShowTree = false } @@ -2940,7 +2949,9 @@ export default { this.modelFunc() }, watch: { - + 'form.treeListName'(val) { + console.log(this.form.treeListName) + }, 'form.country': { handler(val) { if (val !== '' && val !== null && typeof (val) !== 'undefined') { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index c18cabc9c..f0a787ece 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -860,8 +860,9 @@ export default { return }else{ for (let i = 0; i < this.dataList.length; i++) { - if (this.dataList[i].complianceReasons !== "" || (this.dataList[i].noCompliance !== "" && this.dataList[i].countermeasures !== "" && this.dataList[i].completionTime !== undefined) || (this.dataList[i].complianceReasons === "" && this.dataList[i].noCompliance === "" && this.dataList[i].countermeasures === "" && this.dataList[i].completionTime === undefined)) { + if (this.dataList[i].complianceReasons || this.dataList[i].remarks || (this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime !== undefined) || (this.dataList[i].complianceReasons === "" && this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime === undefined)) { this.comFlag = 0; + return; } else { this.comFlag++; }