From b2f4b42ded1620212d2c92c8dbfc7c0832986601 Mon Sep 17 00:00:00 2001 From: shunli Date: Sat, 26 Sep 2026 08:00:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B8=85=E7=90=86=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=97=B6=E6=AE=8B=E7=95=99=E7=9A=844?= =?UTF-8?q?=E6=9D=A1=E9=87=8D=E5=A4=8D=E9=94=99=E8=AF=AF=E7=A0=81=20[09-05?= =?UTF-8?q?-error-explainability-payment-readiness]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 合并时 errorReasons.js/errorReasons.ts 未被判定为冲突，git 自动把 主线首批4个条目和候选分支的完整版本拼在了一起，导致同一语义有两套 命名（如 ap_operations.feature_disabled 与 ap_operations.disabled 并存）。删除主线这4条已被取代的旧条目，保留候选分支的完整版本。 check-error-reason-contract.mjs 主检查+self-test 均恢复 PASS。 Co-Authored-By: Claude Sonnet 5 --- client/src/api/errorReasons.ts | 4 ---- server/src/constants/errorReasons.js | 4 ---- 2 files changed, 8 deletions(-) diff --git a/client/src/api/errorReasons.ts b/client/src/api/errorReasons.ts index 171caca7..5176e798 100644 --- a/client/src/api/errorReasons.ts +++ b/client/src/api/errorReasons.ts @@ -850,10 +850,6 @@ export const ERROR_REASON_MESSAGES: Record = { "payment_batch.payment_account_unavailable": "公司付款账户暂不可用，请联系管理员检查账户配置后重试。", "payment_batch.active_batch_exists": "所选单据已进入其他付款安排，请刷新列表并查看已有批次。", "payment_batch.reviewer_required": "当前没有可复核的经理或负责人，制单人不能复核自己的批次，请联系管理员安排独立复核人。", - "ap_operations.feature_disabled": "应付账款暂未开放，请联系管理员确认处理方式。", - "ap_operations.query_invalid": "查询条件不符合要求，请检查筛选条件后重试。", - "todo.feature_disabled": "待办功能暂未开放，请联系管理员确认处理方式。", - "portal.feature_disabled": "工作台暂未开放，请联系管理员确认处理方式。", }; export const UNKNOWN_VALIDATION_MESSAGE = "操作未完成，请核对页面提示；如仍无法继续，请联系管理员协助处理。"; diff --git a/server/src/constants/errorReasons.js b/server/src/constants/errorReasons.js index 96c8a283..8840aa9f 100644 --- a/server/src/constants/errorReasons.js +++ b/server/src/constants/errorReasons.js @@ -850,10 +850,6 @@ const ERROR_REASONS = [ { code: "payment_batch.payment_account_unavailable", domain: "payment_batch", audience: "user", defaultMessage: "公司付款账户暂不可用，请联系管理员检查账户配置后重试。", recovery: "contact_admin" }, { code: "payment_batch.active_batch_exists", domain: "payment_batch", audience: "user", defaultMessage: "所选单据已进入其他付款安排，请刷新列表并查看已有批次。", recovery: "refresh" }, { code: "payment_batch.reviewer_required", domain: "payment_batch", audience: "user", defaultMessage: "当前没有可复核的经理或负责人，制单人不能复核自己的批次，请联系管理员安排独立复核人。", recovery: "contact_admin" }, - { code: "ap_operations.feature_disabled", domain: "ap_operations", audience: "user", defaultMessage: "应付账款暂未开放，请联系管理员确认处理方式。", recovery: "contact_admin" }, - { code: "ap_operations.query_invalid", domain: "ap_operations", audience: "user", defaultMessage: "查询条件不符合要求，请检查筛选条件后重试。", recovery: "follow_guidance" }, - { code: "todo.feature_disabled", domain: "todo", audience: "user", defaultMessage: "待办功能暂未开放，请联系管理员确认处理方式。", recovery: "contact_admin" }, - { code: "portal.feature_disabled", domain: "portal", audience: "user", defaultMessage: "工作台暂未开放，请联系管理员确认处理方式。", recovery: "contact_admin" }, ]; const reasonsByCode = new Map(ERROR_REASONS.map((reason) => [reason.code, Object.freeze(reason)]));