fix: 归档删除改为软删除

This commit is contained in:
2026-07-17 14:13:17 +08:00
parent 3131d2e141
commit f7328d670d
49 changed files with 520 additions and 354 deletions

View File

@@ -21,7 +21,7 @@ import {
PlusOutlined,
SwapOutlined,
LogoutOutlined,
DeleteOutlined,
InboxOutlined,
UploadOutlined,
DownloadOutlined,
ExportOutlined,
@@ -236,11 +236,11 @@ const OccupanciesPage: React.FC = () => {
setBatchLoading(true);
try {
const res: any = await api.post('/occupancies/batch-delete', { ids: selectedRowKeys });
message.success(res?.message || `删除 ${selectedRowKeys.length}`);
message.success(res?.message || `归档 ${selectedRowKeys.length}`);
setSelectedRowKeys([]);
fetchData();
} catch (e: any) {
message.error(e?.message || '批量删除失败');
message.error(e?.message || '批量归档失败');
} finally {
setBatchLoading(false);
}
@@ -297,19 +297,19 @@ const OccupanciesPage: React.FC = () => {
<Space>
<Tag>退宿</Tag>
<Popconfirm
title="确定删除此记录?"
title="确定归档此记录?"
onConfirm={async () => {
try {
await api.delete(`/occupancies/${record.id}`);
message.success('删除成功');
message.success('归档成功');
fetchData();
} catch (e: any) {
message.error(e?.message || '删除失败');
message.error(e?.message || '归档失败');
}
}}
>
<PermissionButton permission="occupancy:delete" size="small" danger icon={<DeleteOutlined />}>
<PermissionButton permission="occupancy:delete" size="small" danger icon={<InboxOutlined />}>
</PermissionButton>
</Popconfirm>
</Space>
@@ -320,7 +320,7 @@ const OccupanciesPage: React.FC = () => {
const rowSelection = useMemo(() => ({
selectedRowKeys,
onChange: (keys: any[]) => setSelectedRowKeys(keys),
// 「在住记录」Tab禁用已退宿防止误选用于批量退宿「全部记录」Tab均可选用于批量删除
// 「在住记录」Tab禁用已退宿防止误选用于批量退宿「全部记录」Tab均可选用于批量归档
getCheckboxProps: (record: any) => (showActive ? { disabled: !!record.checkOutDate } : {}),
}), [selectedRowKeys, showActive]);
@@ -479,20 +479,20 @@ const OccupanciesPage: React.FC = () => {
</PermissionButton>
) : (
<Popconfirm
title={`确定删除选中的 ${selectedRowKeys.length} 条入住记录?在住记录会自动跳过`}
title={`确定归档选中的 ${selectedRowKeys.length} 条入住记录?在住记录会自动跳过`}
onConfirm={handleBatchDelete}
okText="删除"
okText="归档"
cancelText="取消"
>
<PermissionButton
permission="occupancy:delete"
danger
size="small"
icon={<DeleteOutlined />}
icon={<InboxOutlined />}
style={{ marginLeft: 12 }}
loading={batchLoading}
>
</PermissionButton>
</Popconfirm>
)}