diff --git a/src/components/org/EditOrg.vue b/src/components/org/EditOrg.vue index 8a821c8ef..55bb7c6af 100644 --- a/src/components/org/EditOrg.vue +++ b/src/components/org/EditOrg.vue @@ -45,15 +45,13 @@ }, rules: { orgName: [ - { required: true, message: this.$t('org.orgNameRequired'), trigger: 'blur' }, - { min: 2, max: 50, message: this.$t('org.orgNameLength'), trigger: 'blur' } + { required: true, message: this.$t('org.orgName'), trigger: 'blur' } ], parentOrgId: [ - { required: true, message: this.$t('org.parentOrgRequired') } + { required: true, message: this.$t('org.parentOrg') } ], description: [ - { required: true, message: this.$t('org.descriptionRequired'), trigger: 'blur' }, - { max: 200, message: this.$t('org.descriptionMaxLength'), trigger: 'blur' } + { required: true, message: this.$t('org.description'), trigger: 'blur' } ], orgId: [ { required: true, message: this.$t('org.orgIdRequired') } @@ -92,6 +90,8 @@ this.$message.success(this.$t('common.operationSuccess')) this.visible = false this.$emit('refresh') + },err=>{ + this.$message.error(err) }) } }) diff --git a/src/components/org/OrgTree.vue b/src/components/org/OrgTree.vue index 0bb1430c4..4ee45f4bb 100644 --- a/src/components/org/OrgTree.vue +++ b/src/components/org/OrgTree.vue @@ -73,6 +73,11 @@ export default { this.$message.warning(this.$t('org.selectOrgFirst')) return } + if(this.currentNode.parentId == '-1'){ + this.$message.warning(this.$t('org.topOrg')) + return + } + console.log(this.currentNode) this.$refs.editOrg.show(this.currentNode) }, handleDeleteOrg() { diff --git a/src/views/org/orgLang.js b/src/views/org/orgLang.js index e36a34d22..1353d228c 100644 --- a/src/views/org/orgLang.js +++ b/src/views/org/orgLang.js @@ -29,6 +29,7 @@ export const messages = { confirmDeleteOrgRel: 'Are you sure to delete this organization relationship?', staffTitle: 'Staff', selectOrgFirst: 'Please select an organization first', + topOrg: 'The top organization cannot be modified', staff: { name: 'Name', phone: 'Phone', @@ -68,6 +69,7 @@ export const messages = { confirmDeleteOrgRel: '确定删除组织关系', staffTitle: '员工', selectOrgFirst: '请先选择一个组织', + topOrg: '一级组织不能修改', staff: { name: '员工名称', phone: '员工电话',