From aadf693b2fd4333ea0ba95745d68ee66c60e22f5 Mon Sep 17 00:00:00 2001 From: Codex Yueyang Date: Wed, 30 Sep 2026 10:28:23 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=91=E7=9B=AE=E6=98=A0=E5=B0=84=E8=A1=A8?= =?UTF-8?q?=EF=BC=9A=E5=A4=A7=E7=B1=BB=E7=AD=9B=E9=80=89=E5=8F=AA=E5=88=97?= =?UTF-8?q?=E5=87=BA=E8=A1=A8=E9=87=8C=E7=9C=9F=E7=9A=84=E7=94=A8=E5=88=B0?= =?UTF-8?q?=E7=9A=84=E5=A4=A7=E7=B1=BB=EF=BC=8C=E5=8E=BB=E6=8E=89=E7=A9=BA?= =?UTF-8?q?=E7=9A=84=E5=92=8C=E5=B7=B2=E6=B8=85=E7=A9=BA=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../financial-rules/account-mapping.blade.php | 27 ++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/resources/views/business/pages/financial-rules/account-mapping.blade.php b/resources/views/business/pages/financial-rules/account-mapping.blade.php index 237488b4..20301f13 100644 --- a/resources/views/business/pages/financial-rules/account-mapping.blade.php +++ b/resources/views/business/pages/financial-rules/account-mapping.blade.php @@ -998,13 +998,34 @@ function rebuildFilterOptions() { msPlatform.refresh(OPTIONS.platforms || []); - var cats = (OPTIONS.categories || []).slice(); - msCategory.values().forEach(function (v) { if (cats.indexOf(v) < 0) { cats.push(v); } }); - msCategory.refresh(cats); + msCategory.refresh(categoryOptions()); msBasis.refresh(['支出基准', '收入基准']); rebuildItemOptions(); } + // 大类筛选只列「表里真的用到」的大类:清空后剩下 0 条的(例如原来的售后费用/平台佣金/平台服务费) + // 就不再占位;留空的不显示。已选中的值保留,否则选了以后没法取消。 + // 编辑行里的下拉仍然用完整清单 OPTIONS.categories,想改用别的大类随时能选。 + function categoryOptions() { + var seen = {}; + var used = []; + ROWS.forEach(function (r) { + var v = String(r.category || '').trim(); + if (v && !seen[v]) { seen[v] = true; used.push(v); } + }); + var order = OPTIONS.categories || []; + used.sort(function (a, b) { + var ia = order.indexOf(a); + var ib = order.indexOf(b); + if (ia < 0) { ia = order.length; } + if (ib < 0) { ib = order.length; } + if (ia !== ib) { return ia - ib; } + return a < b ? -1 : (a > b ? 1 : 0); + }); + msCategory.values().forEach(function (v) { if (used.indexOf(v) < 0) { used.push(v); } }); + return used; + } + // 账单项目的候选:按当前选中的平台收窄,列表里再按关键字过滤 function itemCandidates() { var platforms = msPlatform.values();