From 4bddbfe24f61902aff1254b011ae4644e5dd4118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=BA=A2=E5=85=B5?= <374362909@qq.com> Date: Wed, 4 Mar 2026 17:10:14 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E8=A7=84=E5=88=99=E9=98=88=E5=80=BC=E8=8E=B7=E5=8F=96=E9=80=BB?= =?UTF-8?q?=E8=BE=91=EF=BC=8C=E6=94=AF=E6=8C=81=20amountMax=20=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DEPT_PURCHASE_THRESHOLD 规则配置的是 amountMax=50000,原代码只检查 amountMin 导致规则存在但报错缺失的问题。 --- src/hooks/usePurchaseRules.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/hooks/usePurchaseRules.ts b/src/hooks/usePurchaseRules.ts index f0daa11..72879dc 100644 --- a/src/hooks/usePurchaseRules.ts +++ b/src/hooks/usePurchaseRules.ts @@ -74,13 +74,22 @@ export function usePurchaseRules() { const getRuleAmount = (code: string, defaultVal?: number) => { const rule = rules.value.find(r => r.ruleCode === code); - if (!rule || rule.amountMin === undefined || rule.amountMin === null) { + if (!rule) { if (defaultVal === undefined) { throw new Error(`采购规则配置缺失: ${code},请在系统配置中维护`); } return defaultVal; } - return Number(rule.amountMin); + if (rule.amountMin !== undefined && rule.amountMin !== null) { + return Number(rule.amountMin); + } + if (rule.amountMax !== undefined && rule.amountMax !== null) { + return Number(rule.amountMax); + } + if (defaultVal === undefined) { + throw new Error(`采购规则配置缺失: ${code},请在系统配置中维护`); + } + return defaultVal; }; thresholds.deptPurchase = getRuleAmount('DEPT_PURCHASE_THRESHOLD');