diff --git a/src/views/account_center/organization/edit.vue b/src/views/account_center/organization/edit.vue index e7d3bd6..1ca7d61 100644 --- a/src/views/account_center/organization/edit.vue +++ b/src/views/account_center/organization/edit.vue @@ -40,7 +40,7 @@ const formRef = shallowRef() const popupRef = shallowRef>() const mode = ref('add') const popupTitle = computed(() => { - return mode.value == 'edit' ? '编辑部门' : '新增部门' + return mode.value == 'edit' ? '编辑组织' : '新增组织' }) const formData = reactive({ id: '', diff --git a/src/views/account_center/sub_account/components/organization/message-box.vue b/src/views/account_center/sub_account/components/organization/message-box.vue new file mode 100644 index 0000000..56879a7 --- /dev/null +++ b/src/views/account_center/sub_account/components/organization/message-box.vue @@ -0,0 +1,25 @@ + + + + diff --git a/src/views/account_center/sub_account/components/organization/organization-tree.vue b/src/views/account_center/sub_account/components/organization/organization-tree.vue index 028131c..0ee1cbb 100644 --- a/src/views/account_center/sub_account/components/organization/organization-tree.vue +++ b/src/views/account_center/sub_account/components/organization/organization-tree.vue @@ -60,7 +60,7 @@ const props = defineProps({ type: [String, Number] } }) -const emit = defineEmits(['setGroupLeader']) +const emit = defineEmits(['setGroupLeader', 'handleOrganization', 'handleDelete']) const defaultProps = { children: 'children', label: 'name', @@ -90,10 +90,10 @@ const handleCommand = (args: any[], data: Tree) => { const command = args[0] switch (command) { case 'editOrganization': - parent?.fetchOrganizationList() + emit('handleOrganization', 'edit', data) break case 'deleteOrganization': - parent?.fetchOrganizationList() + emit('handleDelete', data) break case 'setGroupLeader': emit('setGroupLeader', data) diff --git a/src/views/account_center/sub_account/components/organization/structure.vue b/src/views/account_center/sub_account/components/organization/structure.vue index ed9360d..5385f48 100644 --- a/src/views/account_center/sub_account/components/organization/structure.vue +++ b/src/views/account_center/sub_account/components/organization/structure.vue @@ -18,8 +18,13 @@