diff --git a/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue b/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue index 216c638f21..b67133a5fb 100644 --- a/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue +++ b/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue @@ -135,7 +135,7 @@ tableStore.initColumn(TableKeyEnum.SYSTEM_ORGANIZATION, organizationColumns, 'drawer'); - const { propsRes, propsEvent, loadList, setKeyword } = useTable(postOrgTable, { + const { propsRes, propsEvent, loadList, setKeyword, setLoading } = useTable(postOrgTable, { tableKey: TableKeyEnum.SYSTEM_ORGANIZATION, scroll: { y: 'auto', x: '1300px' }, selectable: false, @@ -264,12 +264,15 @@ const handleRevokeDelete = async (record: TableData) => { try { + setLoading(true); await revokeDeleteOrg(record.id); Message.success(t('common.revokeDeleteSuccess')); fetchData(); } catch (error) { // eslint-disable-next-line no-console console.error(error); + } finally { + setLoading(false); } }; diff --git a/frontend/src/views/setting/system/organizationAndProject/components/userDrawer.vue b/frontend/src/views/setting/system/organizationAndProject/components/userDrawer.vue index ecb52caccd..187acd1e7b 100644 --- a/frontend/src/views/setting/system/organizationAndProject/components/userDrawer.vue +++ b/frontend/src/views/setting/system/organizationAndProject/components/userDrawer.vue @@ -79,6 +79,7 @@ { title: 'system.organization.email', dataIndex: 'email', + width: 200, }, { title: 'system.organization.phone',