wangziqi/gongxue-base
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 归档删除改为软删除

Browse Source
This commit is contained in:
wangziqi
2026-07-17 14:13:17 +08:00
parent 3131d2e141
commit f7328d670d
49 changed files with 520 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apps/admin/src/pages/ClassroomRentals/index.tsx
View File

@@ -15,7 +15,7 @@ import {
Tooltip,
Empty,
} from 'antd';
import { PlusOutlined, UploadOutlined, DeleteOutlined, FileTextOutlined, StopOutlined, CheckOutlined } from '@ant-design/icons';
import { PlusOutlined, UploadOutlined, FileTextOutlined, StopOutlined, CheckOutlined } from '@ant-design/icons';
import dayjs, { Dayjs } from 'dayjs';
import api from '../../api';
import { downloadBlob } from '../../utils/download';
@@ -211,10 +211,10 @@ const ClassroomRentalsPage: React.FC = () => {
const handleDelete = async (id: number) => {
try {
await api.delete(`/classroom-rentals/${id}`);
message.success('已删除');
message.success('已归档');
fetchData();
} catch (e: any) {
message.error(e?.message || '删除失败');
message.error(e?.message || '归档失败');
}
};
@@ -239,10 +239,10 @@ const ClassroomRentalsPage: React.FC = () => {
const handleDeleteContract = async (id: number) => {
try {
await api.delete(`/classroom-rentals/${id}/contract`);
message.success('合同已删除');
message.success('合同已移除');
fetchData();
} catch (e: any) {
message.error(e?.message || '删除失败');
message.error(e?.message || '移除失败');
}
};
@@ -350,8 +350,8 @@ const ClassroomRentalsPage: React.FC = () => {
下载
</Button>
</Tooltip>
<Popconfirm title="删除合同文件？" onConfirm={() => handleDeleteContract(r.id)}>
<Button size="small" danger icon={<DeleteOutlined />} aria-label="删除合同文件" />
<Popconfirm title="移除合同文件？" onConfirm={() => handleDeleteContract(r.id)}>
<Button size="small" danger icon={<StopOutlined />} aria-label="移除合同文件" />
</Popconfirm>
</Space>
) : (
@@ -410,8 +410,8 @@ const ClassroomRentalsPage: React.FC = () => {
</>
)}
{record.effectiveStatus !== 'active' && (
<Popconfirm title="确定删除该租赁订单？合同文件将一并删除。" onConfirm={() => handleDelete(record.id)}>
<PermissionButton permission="rental:delete" size="small" danger>删除</PermissionButton>
<Popconfirm title="确定归档该租赁订单？合同文件会保留。" onConfirm={() => handleDelete(record.id)}>
<PermissionButton permission="rental:delete" size="small" danger>归档</PermissionButton>
</Popconfirm>
)}
</Space>