From 040b3db84c1bb8478a502de2a2859b88612880b3 Mon Sep 17 00:00:00 2001 From: yml2213 Date: Sun, 20 Sep 2026 21:59:29 +0800 Subject: [PATCH] =?UTF-8?q?fix(finance):=20=E7=A7=BB=E9=99=A4=E8=B5=84?= =?UTF-8?q?=E9=87=91=E5=AE=A1=E6=A0=B8=E5=8F=96=E6=B6=88=E6=8C=89=E9=92=AE?= =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=E6=8F=90=E7=8E=B0=E5=86=BB=E7=BB=93?= =?UTF-8?q?=E8=B5=84=E9=87=91=E6=9C=AA=E9=80=80=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Cursor --- .../worker-platform/worker-platform-normalizers.ts | 2 +- apps/frontend/src/pages/admin/panels/FinancePanel.tsx | 11 ++++------- apps/frontend/src/services/admin/worker-platform.ts | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/apps/backend/src/services/worker-platform/worker-platform-normalizers.ts b/apps/backend/src/services/worker-platform/worker-platform-normalizers.ts index 51a16205..26cd754a 100644 --- a/apps/backend/src/services/worker-platform/worker-platform-normalizers.ts +++ b/apps/backend/src/services/worker-platform/worker-platform-normalizers.ts @@ -115,7 +115,7 @@ export function normalizeFinanceRequestStatus(value: unknown) { export function normalizeAdminFinanceReviewStatus(value: unknown) { const status = String(value || '').trim() - if (['approved', 'rejected', 'cancelled'].includes(status)) return status + if (['approved', 'rejected'].includes(status)) return status throw createHttpError('审核状态不正确', { statusCode: 400, errorCode: 'worker_finance_review_status_invalid', diff --git a/apps/frontend/src/pages/admin/panels/FinancePanel.tsx b/apps/frontend/src/pages/admin/panels/FinancePanel.tsx index 21e7148d..b624f12c 100644 --- a/apps/frontend/src/pages/admin/panels/FinancePanel.tsx +++ b/apps/frontend/src/pages/admin/panels/FinancePanel.tsx @@ -61,7 +61,7 @@ type FinanceConfigFormValues = { } } -type FinanceReviewAction = 'approved' | 'rejected' | 'cancelled' +type FinanceReviewAction = 'approved' | 'rejected' type FinanceRequestDateType = 'created' | 'reviewed' export default function FinancePanel() { @@ -320,9 +320,8 @@ export default function FinancePanel() { - - ) : ( @@ -709,9 +708,7 @@ function mapFinanceConfigToFormValues(config?: WorkerFinanceConfig): FinanceConf } function formatFinanceReviewAction(action: FinanceReviewAction) { - if (action === 'approved') return '通过' - if (action === 'rejected') return '拒绝' - return '取消' + return action === 'approved' ? '通过' : '拒绝' } function formatFinanceRequestType(requestType: string) { diff --git a/apps/frontend/src/services/admin/worker-platform.ts b/apps/frontend/src/services/admin/worker-platform.ts index fa4953ed..85678d1a 100644 --- a/apps/frontend/src/services/admin/worker-platform.ts +++ b/apps/frontend/src/services/admin/worker-platform.ts @@ -544,7 +544,7 @@ export function fetchAdminWorkerFinanceRequests(params?: Record export function reviewAdminWorkerFinanceRequest( requestId: number, - payload: { status: 'approved' | 'rejected' | 'cancelled'; reviewedNote?: string; note?: string }, + payload: { status: 'approved' | 'rejected'; reviewedNote?: string; note?: string }, ) { return apiPost<{ request: WorkerFinanceRequest }>( `/api/v1/admin/worker-platform/finance-requests/${requestId}/review`,