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

@@ -17,7 +17,7 @@ import {
} from 'antd';
import {
PlusOutlined,
DeleteOutlined,
InboxOutlined,
EditOutlined,
UploadOutlined,
DownloadOutlined,
@@ -91,11 +91,11 @@ const ExpensesPage: React.FC = () => {
setBatchLoading(true);
try {
const res: any = await api.post('/expenses/room/batch-delete', { ids: selectedRoomKeys });
message.success(res?.message || `删除 ${selectedRoomKeys.length}`);
message.success(res?.message || `归档 ${selectedRoomKeys.length}`);
setSelectedRoomKeys([]);
fetchData();
} catch (e: any) {
message.error(e?.message || '批量删除失败');
message.error(e?.message || '批量归档失败');
} finally {
setBatchLoading(false);
}
@@ -108,11 +108,11 @@ const ExpensesPage: React.FC = () => {
const res: any = await api.post('/expenses/personal/batch-delete', {
ids: selectedPersonalKeys,
});
message.success(res?.message || `删除 ${selectedPersonalKeys.length}`);
message.success(res?.message || `归档 ${selectedPersonalKeys.length}`);
setSelectedPersonalKeys([]);
fetchData();
} catch (e: any) {
message.error(e?.message || '批量删除失败');
message.error(e?.message || '批量归档失败');
} finally {
setBatchLoading(false);
}
@@ -286,10 +286,10 @@ const ExpensesPage: React.FC = () => {
</PermissionButton>
<Popconfirm
title="确定删除"
title="确定归档"
onConfirm={async () => {
await api.delete(`/expenses/room/${record.id}`);
message.success('删除成功');
message.success('归档成功');
fetchData();
}}
>
@@ -297,9 +297,9 @@ const ExpensesPage: React.FC = () => {
permission="expense:delete"
size="small"
danger
icon={<DeleteOutlined />}
icon={<InboxOutlined />}
>
</PermissionButton>
</Popconfirm>
</Space>
@@ -342,10 +342,10 @@ const ExpensesPage: React.FC = () => {
</PermissionButton>
<Popconfirm
title="确定删除"
title="确定归档"
onConfirm={async () => {
await api.delete(`/expenses/personal/${record.id}`);
message.success('删除成功');
message.success('归档成功');
fetchData();
}}
>
@@ -353,9 +353,9 @@ const ExpensesPage: React.FC = () => {
permission="expense:delete"
size="small"
danger
icon={<DeleteOutlined />}
icon={<InboxOutlined />}
>
</PermissionButton>
</Popconfirm>
</Space>
@@ -440,19 +440,19 @@ const ExpensesPage: React.FC = () => {
</Space>
<Space>
<Popconfirm
title={`确定删除选中的 ${selectedRoomKeys.length} 条费用?`}
title={`确定归档选中的 ${selectedRoomKeys.length} 条费用?`}
onConfirm={handleBatchDeleteRoom}
okText="删除"
okText="归档"
cancelText="取消"
disabled={selectedRoomKeys.length === 0}
>
<PermissionButton
permission="expense:delete"
danger
icon={<DeleteOutlined />}
icon={<InboxOutlined />}
disabled={selectedRoomKeys.length === 0}
>
</PermissionButton>
</Popconfirm>
<PermissionButton
@@ -568,19 +568,19 @@ const ExpensesPage: React.FC = () => {
</Space>
<Space>
<Popconfirm
title={`确定删除选中的 ${selectedPersonalKeys.length} 条个人费用?`}
title={`确定归档选中的 ${selectedPersonalKeys.length} 条个人费用?`}
onConfirm={handleBatchDeletePersonal}
okText="删除"
okText="归档"
cancelText="取消"
disabled={selectedPersonalKeys.length === 0}
>
<PermissionButton
permission="expense:delete"
danger
icon={<DeleteOutlined />}
icon={<InboxOutlined />}
disabled={selectedPersonalKeys.length === 0}
>
</PermissionButton>
</Popconfirm>
<PermissionButton