diff --git a/jero-web/src/views/projectManagement/components/batchSettingPersonnel.vue b/jero-web/src/views/projectManagement/components/batchSettingPersonnel.vue index 365b07c73..4f35950e6 100644 --- a/jero-web/src/views/projectManagement/components/batchSettingPersonnel.vue +++ b/jero-web/src/views/projectManagement/components/batchSettingPersonnel.vue @@ -254,7 +254,7 @@ verifyDutyList: [], formInline: {}, rules: {}, - ids: [], + ids: [] } }, mounted() { @@ -299,7 +299,7 @@ this.$message.success(this.$t('OperationSuccessful')) this.visible = false this.confirmLoading = false - this.$emit('batSettingList') + this.$emit('batchSettingPersonnelForm') } else { this.$message.warning(this.$t('operationFailed')) this.confirmLoading = false diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 87b5e6a24..7ad82c138 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1165,12 +1165,12 @@ } } for (let i = 0; i < content.length; i++) { - if (!content[i].dutyTerritory) { + if (!content[i].dutyTerritory_dictText) { this.$message.warning(this.$t('theSelectedDataResponsibilityFieldCannotEmpty')) return } for (let j = 1; j < content.length; j++) { - if (content[i].dutyTerritory != content[j].dutyTerritory || !content[i].dutyTerritory) { + if (content[i].dutyTerritory_dictText != content[j].dutyTerritory_dictText || !content[i].dutyTerritory_dictText) { this.$message.warning(this.$t('theInconsistentSameResponsibility')) return }