diff --git a/src/components/PersonnelInfo.vue b/src/components/PersonnelInfo.vue index 5847ff09..e4ec4f7b 100644 --- a/src/components/PersonnelInfo.vue +++ b/src/components/PersonnelInfo.vue @@ -93,6 +93,14 @@ export default { type: String, required: false, default: null + }, + // 不需要做必填校验的字段,用于应对第一个节点选没选人决定节点跳不跳过的问题 + notPermissField: { + type: Array, + required: false, + default: () => { + return [] + } } }, data () { @@ -160,9 +168,13 @@ export default { // } // } console.log(personnelObj) - if (!Object.values(personnelObj).every(v => !!v)) { - this.$message.warning(this.$t('pleaseEnterPersonnelInfo')) - personnelObj = false + for (const item in personnelObj) { + if (!this.notPermissField.includes(item) && !personnelObj[item]) { + // 不在不需要做必填校验的字段里,说明是必填并且没有数据 + this.$message.warning(this.$t('pleaseEnterPersonnelInfo')) + personnelObj = false + break + } } return personnelObj }, diff --git a/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue b/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue index 2481c40e..6663cc8e 100644 --- a/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue +++ b/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue @@ -78,7 +78,7 @@