From f7328d670d21ff6c496b9a6a111fc1b620af0580 Mon Sep 17 00:00:00 2001 From: wangziqi Date: Fri, 17 Jul 2026 14:13:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BD=92=E6=A1=A3=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E8=BD=AF=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StudentProfileContent/index.tsx | 12 +- apps/admin/src/pages/AiConfig/index.tsx | 3 +- apps/admin/src/pages/AttendanceDevices.tsx | 8 +- apps/admin/src/pages/Bills/index.tsx | 28 ++-- .../src/pages/ClassroomRentals/index.tsx | 18 +-- apps/admin/src/pages/Deposits/index.tsx | 20 +-- apps/admin/src/pages/Expenses/index.tsx | 42 +++--- .../src/pages/IntegrationConfig/index.tsx | 20 +-- apps/admin/src/pages/Occupancies/index.tsx | 26 ++-- apps/admin/src/pages/Roles/index.tsx | 14 +- apps/admin/src/pages/Rooms/index.tsx | 19 ++- apps/admin/src/pages/Schedules/index.tsx | 58 ++++---- apps/admin/src/pages/Students/index.tsx | 3 +- apps/server/src/archive/archive.controller.ts | 8 +- apps/server/src/archive/archive.service.ts | 34 ++--- .../attendance-devices.controller.ts | 2 +- .../attendance-devices.service.ts | 7 +- .../src/attendance/attendance.controller.ts | 4 +- .../server/src/bills/bills.boundaries.spec.ts | 20 ++- apps/server/src/bills/bills.controller.ts | 4 +- apps/server/src/bills/bills.service.ts | 45 ++++-- apps/server/src/classes/classes.controller.ts | 2 +- apps/server/src/classes/classes.service.ts | 18 +-- .../classroom-rentals.controller.ts | 4 +- .../classroom-rentals.service.ts | 28 +--- .../src/deposits/deposits.controller.ts | 6 +- apps/server/src/deposits/deposits.service.ts | 18 ++- .../src/entities/archive-attachment.entity.ts | 3 + apps/server/src/entities/exam-score.entity.ts | 3 + .../src/entities/learning-record.entity.ts | 3 + apps/server/src/entities/occupancy.entity.ts | 3 + .../src/entities/personal-expense.entity.ts | 3 + .../src/entities/room-expense.entity.ts | 3 + .../expense-types/expense-types.controller.ts | 4 +- .../expense-types/expense-types.service.ts | 3 +- .../src/expenses/expenses.controller.ts | 8 +- apps/server/src/expenses/expenses.service.ts | 29 ++-- .../src/occupancies/occupancies.controller.ts | 4 +- .../src/occupancies/occupancies.service.ts | 23 +-- apps/server/src/rbac/rbac.controller.ts | 2 +- apps/server/src/rbac/rbac.service.ts | 30 ++-- apps/server/src/rooms/rooms.service.ts | 18 ++- .../src/schedules/dto/schedule.dto.spec.ts | 10 ++ apps/server/src/schedules/dto/schedule.dto.ts | 6 + .../src/schedules/schedules.controller.ts | 2 +- .../src/schedules/schedules.service.spec.ts | 137 +++++++++++++++--- .../server/src/schedules/schedules.service.ts | 69 +++++---- .../src/students/students.controller.ts | 4 +- docker/mysql/init.sql | 36 ++--- 49 files changed, 520 insertions(+), 354 deletions(-) diff --git a/apps/admin/src/components/StudentProfileContent/index.tsx b/apps/admin/src/components/StudentProfileContent/index.tsx index b360fbe..3203a81 100644 --- a/apps/admin/src/components/StudentProfileContent/index.tsx +++ b/apps/admin/src/components/StudentProfileContent/index.tsx @@ -25,7 +25,7 @@ import type { ColumnsType } from 'antd/es/table'; import { PlusOutlined, UploadOutlined, - DeleteOutlined, + InboxOutlined, EyeOutlined, CloseOutlined, FileTextOutlined, @@ -747,11 +747,11 @@ const AttachmentsTab: React.FC = ({ dat const handleDelete = async (attachmentId: number) => { try { await api.delete(`/archive/attachments/${attachmentId}`); - message.success('已删除'); + message.success('已归档'); onRefresh(); } catch (e: unknown) { const err = e as { message?: string }; - message.error(err?.message || '删除失败'); + message.error(err?.message || '归档失败'); } }; @@ -786,9 +786,9 @@ const AttachmentsTab: React.FC = ({ dat > 查看 - handleDelete(record.id)}> - diff --git a/apps/admin/src/pages/AiConfig/index.tsx b/apps/admin/src/pages/AiConfig/index.tsx index 87b54f9..92b88b6 100644 --- a/apps/admin/src/pages/AiConfig/index.tsx +++ b/apps/admin/src/pages/AiConfig/index.tsx @@ -22,7 +22,6 @@ import { CheckCircleOutlined, CloseCircleOutlined, KeyOutlined, - DeleteOutlined, WarningOutlined, } from '@ant-design/icons'; import api from '../../api'; @@ -418,7 +417,7 @@ const AiConfigPage: React.FC = () => { {config?.hasDatabaseKey && canWrite && (
-
diff --git a/apps/admin/src/pages/AttendanceDevices.tsx b/apps/admin/src/pages/AttendanceDevices.tsx index f6949be..34d726e 100644 --- a/apps/admin/src/pages/AttendanceDevices.tsx +++ b/apps/admin/src/pages/AttendanceDevices.tsx @@ -122,10 +122,10 @@ const AttendanceDevicesPage: React.FC = () => { const handleDelete = async (id: number) => { try { await api.delete(`/attendance-devices/${id}`); - message.success('已删除绑定'); + message.success('已停用绑定'); await loadData(); } catch (error: any) { - message.error(error?.message || '删除失败'); + message.error(error?.message || '停用失败'); } }; @@ -144,9 +144,9 @@ const AttendanceDevicesPage: React.FC = () => { openEdit(record)}> 编辑 - handleDelete(record.id)}> + handleDelete(record.id)}> - 删除 + 停用 diff --git a/apps/admin/src/pages/Bills/index.tsx b/apps/admin/src/pages/Bills/index.tsx index 7eb1a69..a536da4 100644 --- a/apps/admin/src/pages/Bills/index.tsx +++ b/apps/admin/src/pages/Bills/index.tsx @@ -15,7 +15,7 @@ import { } from 'antd'; import { FileTextOutlined, - DeleteOutlined, + InboxOutlined, DownloadOutlined, FilePdfOutlined, } from '@ant-design/icons'; @@ -135,21 +135,21 @@ const BillsPage: React.FC = () => { }); }; - const handleDelete = async (id: number) => { + const handleArchive = async (id: number) => { try { await api.delete(`/bills/${id}`); - message.success('删除成功'); + message.success('账单已归档'); fetchData(); - } catch (error: any) { message.error(error?.message || '删除失败'); } + } catch (error: any) { message.error(error?.message || '归档失败'); } }; - const batchDelete = async () => { + const batchArchive = async () => { if (selectedRows.length === 0) return message.warning('请先选择账单'); if (batchLoading) return; setBatchLoading(true); try { await api.post('/bills/batch/delete', { ids: selectedRows }); - message.success(`已删除 ${selectedRows.length} 条账单`); + message.success(`已归档 ${selectedRows.length} 条账单`); setSelectedRows([]); fetchData(); } catch (e: any) { @@ -260,14 +260,14 @@ const BillsPage: React.FC = () => { )} {Number(record.paidAmount || 0) === 0 && record.status !== 'cancelled' && ( - handleDelete(record.id)} okText="删除" cancelText="取消"> - }>删除 + handleArchive(record.id)} okText="归档" cancelText="取消"> + }>归档 )} ), }, - ], [showDetail, handleDelete, handleCancel, handleExportPdf]); + ], [showDetail, handleArchive, handleCancel, handleExportPdf]); return (
@@ -298,9 +298,9 @@ const BillsPage: React.FC = () => {