diff --git a/src/pages/src/components/organization/mixin.js b/src/pages/src/components/organization/mixin.js index 83c9ab761..ee5dd6008 100644 --- a/src/pages/src/components/organization/mixin.js +++ b/src/pages/src/components/organization/mixin.js @@ -142,6 +142,9 @@ export default { // 删除 deleteDepartment(node) { this.stopBubbling(node); + if (!node.activated) { + this.$emit('deleteDepartment', node); + } if (node.has_children || node.default || (node.activated && node.configured)) { node.showDeleteTips = false; return; diff --git a/src/pages/src/views/organization/tree/OrganizationTree.vue b/src/pages/src/views/organization/tree/OrganizationTree.vue index 932a4e217..64b25cba8 100644 --- a/src/pages/src/views/organization/tree/OrganizationTree.vue +++ b/src/pages/src/views/organization/tree/OrganizationTree.vue @@ -249,7 +249,7 @@ export default { let text = ''; if (node.default) { text = this.$t('默认目录不能被删除'); - } else if (node.activated && node.configured) { + } else if (node.activated || node.configured) { text = this.$t('请先停用,方可删除目录'); } else if (node.has_children) { text = this.$t('非空组织不能删除');