Commit 6849c433a0a95fb028e032066adcf694fe4bc3a2

Authored by fengwotao
1 parent 788b0c8c

feat: 租户配置新增检查后才进行删除操作

@@ -36,6 +36,7 @@ enum Api { @@ -36,6 +36,7 @@ enum Api {
36 setTenantProfile = '/tenantProfile', 36 setTenantProfile = '/tenantProfile',
37 getTenantPageList = '/admin/all/tenants', 37 getTenantPageList = '/admin/all/tenants',
38 getTenantAllPageList = '/admin/', 38 getTenantAllPageList = '/admin/',
  39 + deleteTenantProfileByCheckPass = '/tenant_profiles/allow/',
39 } 40 }
40 41
41 export async function deleteTenantProfileApi(ids: string) { 42 export async function deleteTenantProfileApi(ids: string) {
@@ -169,3 +170,8 @@ export function getTenantAllPageLists(tenantId) { @@ -169,3 +170,8 @@ export function getTenantAllPageLists(tenantId) {
169 url: `${Api.getTenantAllPageList}${tenantId}/all/tenant_admin`, 170 url: `${Api.getTenantAllPageList}${tenantId}/all/tenant_admin`,
170 }); 171 });
171 } 172 }
  173 +export function deleteTenantProfileByCheckPassApi(tenantProfileId) {
  174 + return defHttp.get({
  175 + url: `${Api.deleteTenantProfileByCheckPass}${tenantProfileId}/delete`,
  176 + });
  177 +}
@@ -69,6 +69,7 @@ @@ -69,6 +69,7 @@
69 getTableTenantProfileApi, 69 getTableTenantProfileApi,
70 deleteTenantProfileApi, 70 deleteTenantProfileApi,
71 setTenantProfileIsDefaultApi, 71 setTenantProfileIsDefaultApi,
  72 + deleteTenantProfileByCheckPassApi,
72 } from '/@/api/tenant/tenantApi'; 73 } from '/@/api/tenant/tenantApi';
73 import { Authority } from '/@/components/Authority'; 74 import { Authority } from '/@/components/Authority';
74 import { Popconfirm } from 'ant-design-vue'; 75 import { Popconfirm } from 'ant-design-vue';
@@ -118,10 +119,15 @@ @@ -118,10 +119,15 @@
118 echoEditData = record; 119 echoEditData = record;
119 } 120 }
120 async function handleDelete(record: Recordable) { 121 async function handleDelete(record: Recordable) {
121 - let ids = record.id.id;  
122 - await deleteTenantProfileApi(ids);  
123 - createMessage.success('删除成功');  
124 - reload(); 122 + const { data, message } = await deleteTenantProfileByCheckPassApi(record?.id?.id);
  123 + if (data) {
  124 + let ids = record?.id?.id;
  125 + await deleteTenantProfileApi(ids);
  126 + createMessage.success('删除成功');
  127 + reload();
  128 + } else {
  129 + createMessage.warning(message);
  130 + }
125 } 131 }
126 const useSelectionChange = () => { 132 const useSelectionChange = () => {
127 selectedRowKeys = getSelectRows(); 133 selectedRowKeys = getSelectRows();