diff --git a/src/api/tenant/index.ts b/src/api/tenant/index.ts index 35c4285..1a74bf2 100644 --- a/src/api/tenant/index.ts +++ b/src/api/tenant/index.ts @@ -75,6 +75,13 @@ export const exportTenant = (params: Partial) => { responseType: 'blob', }); }; +// 租户删除 +export const deleteTenant = (data: { id: number }) => { + return request({ + url: `/tenant/${data.id}/delete`, + method: 'post', + }); +}; // 获取子账号列表参数 type TenantUserListDTO = { @@ -154,4 +161,11 @@ export const enableTenantUser = (data: { id: number }) => { method: 'post', data, }); -}; \ No newline at end of file +}; +// 租户子账号删除 +export const deleteTenantUser = (data: { id: number }) => { + return request({ + url: `/tenant/user/${data.id}/delete`, + method: 'post', + }); +}; diff --git a/src/views/pages/tenant/add.vue b/src/views/pages/tenant/add.vue index 5e6e290..a33183b 100644 --- a/src/views/pages/tenant/add.vue +++ b/src/views/pages/tenant/add.vue @@ -139,7 +139,7 @@ async function submit() { updateTenant(params).then((res) => { if (res.code === 200) { if(oldPhone.value !== formData.phone) { - ElMessage.success('租户手机号已更新,如需使用新手机号作为子账号登录,请手动修改!'); + ElMessage.success('租户手机号已更新,如需使用新手机号作为子账号登录,请手动修改默认子账号!'); } else { ElMessage.success('操作成功'); } diff --git a/src/views/pages/tenant/index.vue b/src/views/pages/tenant/index.vue index f003467..47b4ff8 100644 --- a/src/views/pages/tenant/index.vue +++ b/src/views/pages/tenant/index.vue @@ -70,6 +70,11 @@ 编辑 启用 禁用 + + + @@ -85,7 +90,7 @@ import tableComponents from '/@/components/tableComponents/index.vue'; import { ElMessage, ElMessageBox } from 'element-plus'; import addDialog from './add.vue'; import { Plus } from '@element-plus/icons-vue'; -import { disableTenant, enableTenant, getTenantList, exportTenant } from '/@/api/tenant'; +import { disableTenant, enableTenant, getTenantList, exportTenant, deleteTenant } from '/@/api/tenant'; import { COMPANYTYPE_CONST, ACCOUNTTYPE_CONST, STATUS_CONST } from './constant'; type FormData = { @@ -159,6 +164,16 @@ async function doUpdateStatus(row: IData) { } }); } +// 删除 +async function doDeleteTenant(row: IData) { + let { code, data } = await deleteTenant({ + id: row.id, + }); + if (code == 200) { + ElMessage.success('操作成功'); + getData(); + } +} const addDialogRef = ref(); // 新增弹窗打开 diff --git a/src/views/pages/tenantUser/import.vue b/src/views/pages/tenantUser/import.vue index c2671e3..fc80147 100644 --- a/src/views/pages/tenantUser/import.vue +++ b/src/views/pages/tenantUser/import.vue @@ -87,7 +87,7 @@ function submit() { } function downloadTemplate() { - window.open('https://cankao.obs.cn-east-3.myhuaweicloud.com/%E6%89%B9%E9%87%8F%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xlsx'); + window.open('https://cankao.obs.cn-east-3.myhuaweicloud.com/%E5%AD%90%E8%B4%A6%E5%8F%B7%E6%89%B9%E9%87%8F%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xlsx'); } const errorMsg = ref(''); diff --git a/src/views/pages/tenantUser/index.vue b/src/views/pages/tenantUser/index.vue index 320389f..fcca97f 100644 --- a/src/views/pages/tenantUser/index.vue +++ b/src/views/pages/tenantUser/index.vue @@ -64,6 +64,11 @@ 编辑 启用 禁用 + + + @@ -81,7 +86,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'; import addDialog from './add.vue'; import importDialog from './import.vue'; import { Plus } from '@element-plus/icons-vue'; -import { disableTenantUser, enableTenantUser, exportTenantUser, getTenantUserList } from '/@/api/tenant'; +import { deleteTenantUser, disableTenantUser, enableTenantUser, exportTenantUser, getTenantUserList } from '/@/api/tenant'; import { ACCOUNTTYPE_CONST, STATUS_CONST } from '/@/views/pages/tenant/constant'; type FormData = { @@ -149,9 +154,23 @@ async function doUpdateStatus(row: IData) { if (code == 200) { ElMessage.success('操作成功'); getData(); + } else { + if(row.status === 1) { + ElMessage.error('启用失败,当前可管理子账号已达上限,请先删除无用子账号再启用'); + } } }); } +// 删除 +async function doDeleteTenantUser(row: IData) { + let { code, data } = await deleteTenantUser({ + id: row.id, + }); + if (code == 200) { + ElMessage.success('操作成功'); + getData(); + } +} const addDialogRef = ref(); // 新增弹窗打开