Compare commits

..
Author SHA1 Message Date
wuzilongandCursor 4f24fd9658 fix(pl): 再安排时排除本单一次有效占用并归还预占余量。
避免已安排计划再次保存时,把本单预占的一次有效购买证误判为已使用。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-17 12:39:50 +08:00
wuzilongandCursor 2045e7de89 fix(pl): 内部站点清空合同,并隐藏已释放关联证件。
避免山峡/云栋装送段残留外部合同选证,以及 released 用量行仍出现在计划详情关联证件中。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-17 12:09:06 +08:00
wuzilongandCursor eab882f92c fix(deploy): nginx 隐藏 MinIO 上游 CORS 头避免双 Origin。
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-16 15:42:03 +08:00
wuzilongandCursor 04450fff88 fix(web-admin): 运输归档合计行与可见表头列对齐。
planNo 可隐藏后不再硬编码插入,避免统计行按索引错位。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-16 15:42:03 +08:00
wuzilongandCursor 82c21262ed fix(web-admin): 顶栏菜单折叠按钮改为内联 SVG 并始终可见。
避免 Iconify/el-icon 在部分浏览器不绘制,并去掉可关闭开关以免按钮被关掉。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-16 15:42:03 +08:00
20 changed files with 504 additions and 63 deletions

No files matched your search

@@ -831,6 +831,15 @@ def assert_stop_contract_required(
raise HTTPException(status_code=422, detail=f"请为{side_label}选择合同")
def _clear_internal_stop_product_contracts(stop) -> None:
"""山峡/云栋段不占用外部合同;客户端若仍回传产品行合同字段,保存前强制清空。"""
if stop is None or not is_internal_customer_name(getattr(stop, 'customer_name', None)):
return
for prod in getattr(stop, 'products', None) or []:
prod.contract_id = None
prod.contract_product_id = None
def _resolve_stop_contracts(
db: Session,
tenant_no: str,
@@ -975,6 +984,7 @@ def validate_plan_stops_write(
"装货合同",
expected_supplier_name=entity_name,
)
_clear_internal_stop_product_contracts(load)
resolved_deliveries: list[PlanDeliveryBody] = []
for idx, delivery in enumerate(deliveries, start=1):
@@ -990,6 +1000,7 @@ def validate_plan_stops_write(
f"送货段#{idx}合同",
expected_supplier_name=entity_name,
)
_clear_internal_stop_product_contracts(delivery)
resolved_deliveries.append(delivery)
enrich_stop_addresses_from_library(db, tenant_no, load, resolved_deliveries)
@@ -1443,6 +1454,7 @@ def replace_plan_stops(
stop.customer_name, kind, body.generate_dibang, body.dibang_direction)
stop.same_city = 1 if int(getattr(body, "same_city", 0) or 0) == 1 else 0
stop.del_flag, stop.update_by, stop.update_time = 0, user_id, now
internal_stop = is_internal_customer_name(body.customer_name)
model = PlPlanLoadProduct if kind == 'load' else PlPlanDeliveryProduct
for idx, (row, product, linked) in enumerate(product_jobs or []):
if row is None:
@@ -1453,6 +1465,10 @@ def replace_plan_stops(
for field in product_fields:
if field in product.model_fields_set or row.id is None:
setattr(row, field, getattr(product, field))
if internal_stop:
# 内部客户段即使客户端漏清/省略合同字段,落库也不得保留外部合同绑定。
row.contract_id = None
row.contract_product_id = None
row.plan_product_id = linked
row.order_num, row.update_by, row.update_time = idx, user_id, now
for row in removed:
@@ -9,6 +9,7 @@ from app.models.pl_quota_models import (
PlTransportCert,
PlTransportCertPurchaseRef,
PlCertQtyLog,
PlPlanCertUsage,
)
from app.schemas.pl.quota_planning import ManualQuantity
from app.services.pl_cert_category_service import category_ids_for_product
@@ -16,8 +17,29 @@ from app.services.pl_quota_cert_service import is_single_use_consumed
from app.services.pl_quota_units import same_quantity_unit, standard_conversion_ratio
def _available(cert):
return Decimal(cert.total_qty) - Decimal(cert.used_qty) - Decimal(cert.reserved_qty)
def _plan_own_reserved(db, user, plan_id, cert_type, cert_id) -> Decimal:
"""本计划对该证的预占量;再安排时加回余量,避免把本单占用当成他人占用。"""
if not plan_id:
return Decimal('0')
row = (
db.query(PlPlanCertUsage)
.filter_by(
tenant_no=user.tenant_no,
plan_id=plan_id,
cert_type=cert_type,
cert_id=cert_id,
del_flag=0,
)
.first()
)
if row is None:
return Decimal('0')
return Decimal(row.reserved_qty or 0)
def _available(cert, *, own_reserved=None):
own = Decimal(own_reserved if own_reserved is not None else 0)
return Decimal(cert.total_qty) - Decimal(cert.used_qty) - Decimal(cert.reserved_qty) + own
def _in_force(cert, on_date: date) -> bool:
@@ -226,6 +248,7 @@ def _linked_transports(db, user, customer_id, purchase_id):
def _diagnose_select_failure(
db, user, source, *, vehicle_no: str, on_date: date, candidates, manual_allocations=(),
plan_id=None,
):
"""选证失败时按证据优先给出单一可执行原因,避免笼统兜底句。"""
place = '同市' if not source.requires_transport else '异地'
@@ -269,7 +292,7 @@ def _diagnose_select_failure(
if not _in_force(purchase, on_date):
expired_buy.append(purchase)
continue
if is_single_use_consumed(db, user, 'purchase', purchase):
if is_single_use_consumed(db, user, 'purchase', purchase, exclude_plan_id=plan_id):
consumed_buy.append(purchase)
continue
try:
@@ -280,7 +303,8 @@ def _diagnose_select_failure(
except HTTPException:
unit_buy.append(purchase)
continue
if _available(purchase) < need:
buy_own = _plan_own_reserved(db, user, plan_id, 'purchase', purchase.id)
if _available(purchase, own_reserved=buy_own) < need:
short_buy.append((purchase, need))
continue
@@ -305,7 +329,7 @@ def _diagnose_select_failure(
if not _in_force(transport, on_date):
expired_move.append(transport)
continue
if is_single_use_consumed(db, user, 'transport', transport):
if is_single_use_consumed(db, user, 'transport', transport, exclude_plan_id=plan_id):
consumed_move.append(transport)
continue
if not _vehicle_ok(transport, vehicle_no):
@@ -319,7 +343,8 @@ def _diagnose_select_failure(
except HTTPException:
unit_move.append(transport)
continue
if _available(transport) < t_need:
move_own = _plan_own_reserved(db, user, plan_id, 'transport', transport.id)
if _available(transport, own_reserved=move_own) < t_need:
short_move.append((transport, t_need))
continue
purchase_had_ready_transport = True
@@ -428,11 +453,13 @@ def _diagnose_select_failure(
def select_whole_cover_certs(
db, user, sources, *, vehicle_no: str, on_date: date, manual_allocations=(),
plan_id=None,
):
"""返回 purchase_cert_ids, transport_cert_ids, manual_allocations。
每个来源必须由一张购买证整笔覆盖;异地再配一张关联且车号/余量够的运输证。
单位无法自动换算时,使用计划段次用证已保存的人工换算量。
plan_id:再安排时排除本计划已占用的一次有效证,并把本单预占加回可选余量。
"""
if not sources:
return [], [], []
@@ -467,7 +494,7 @@ def select_whole_cover_certs(
continue
if not _in_force(purchase, on_date):
continue
if is_single_use_consumed(db, user, 'purchase', purchase):
if is_single_use_consumed(db, user, 'purchase', purchase, exclude_plan_id=plan_id):
continue
try:
need = _need_permit_qty(
@@ -476,7 +503,8 @@ def select_whole_cover_certs(
)
except HTTPException:
continue
if _available(purchase) < need:
buy_own = _plan_own_reserved(db, user, plan_id, 'purchase', purchase.id)
if _available(purchase, own_reserved=buy_own) < need:
continue
if not source.requires_transport:
@@ -495,7 +523,7 @@ def select_whole_cover_certs(
continue
if not _in_force(transport, on_date):
continue
if is_single_use_consumed(db, user, 'transport', transport):
if is_single_use_consumed(db, user, 'transport', transport, exclude_plan_id=plan_id):
continue
if not _vehicle_ok(transport, vehicle_no):
continue
@@ -506,7 +534,8 @@ def select_whole_cover_certs(
)
except HTTPException:
continue
if _available(transport) < t_need:
move_own = _plan_own_reserved(db, user, plan_id, 'transport', transport.id)
if _available(transport, own_reserved=move_own) < t_need:
continue
chosen_purchase = purchase
chosen_transport = transport
@@ -522,6 +551,7 @@ def select_whole_cover_certs(
_diagnose_select_failure(
db, user, source, vehicle_no=vehicle_no, on_date=on_date,
candidates=candidates, manual_allocations=saved_manuals,
plan_id=plan_id,
),
)
+13 -1
View File
@@ -144,6 +144,7 @@ def build_usage_request(db, user, plan_id, operation, action, *, lock=False, che
purchase_ids, transport_ids, manuals = select_whole_cover_certs(
db, user, sources, vehicle_no=vehicle, on_date=on_date,
manual_allocations=config.manual_allocations,
plan_id=plan.id,
)
config = config.model_copy(update={
'purchase_cert_ids': purchase_ids,
@@ -336,7 +337,18 @@ def get_plan_quota(db, user, plan_id):
if row.contract_product_id in cert['productIds']]})
if product.is_toxic == 1:
options.append(item)
usages = db.query(PlPlanCertUsage).filter_by(tenant_no=user.tenant_no, plan_id=plan_id, del_flag=0).order_by(PlPlanCertUsage.create_time.desc()).all()
# 关联证件展示只含仍占用/结转中的用量;released 已从配置摘除,不再算作当前关联。
usages = (
db.query(PlPlanCertUsage)
.filter(
PlPlanCertUsage.tenant_no == user.tenant_no,
PlPlanCertUsage.plan_id == plan_id,
PlPlanCertUsage.del_flag == 0,
PlPlanCertUsage.usage_status != 'released',
)
.order_by(PlPlanCertUsage.create_time.desc())
.all()
)
version = resolve_measurement_version(db, user, plan)
from app.services.pl_cert_quota_rule_config_service import (
VERSION_LEGACY,
@@ -185,9 +185,9 @@ def _execute(db,user,r,digest,plan):
raise ValueError('已执行用证不得释放预占,请先结转实际量')
for k,u in usages.items():
certs[k].reserved_qty-=u.reserved_qty; u.reserved_qty=ZERO
u.usage_status='released'
u.usage_status='released'; u.del_flag=1
for item in items[k]:
item.reserved_qty=ZERO; item.item_status='released'
item.reserved_qty=ZERO; item.item_status='released'; item.del_flag=1
else:
supplement=_settle(db,user,r,certs,usages,items,plan)
for k,u in usages.items():
@@ -343,7 +343,12 @@ def _reserve(db,user,r,plan,certs,usages,items,selected,preview=False,lock_previ
if item.actual_cert_qty is not None or item.item_status in ('in_transit','settled'): raise ValueError('已执行明细不能移除')
item.del_flag=1; item.reserved_qty=ZERO; item.item_status='released'
new_qty=sum((a.permit_quantity for a in allocations),ZERO)
c.reserved_qty+=new_qty-u.reserved_qty; u.reserved_qty=new_qty; u.usage_status='reserved' if allocations else 'released'
c.reserved_qty+=new_qty-u.reserved_qty; u.reserved_qty=new_qty
# 无分配时标记释放并软删,详情「关联证件」不再展示;再预占同证时复用本行并恢复 del_flag。
if allocations:
u.usage_status='reserved'; u.del_flag=0
else:
u.usage_status='released'; u.del_flag=1
u.cert_revision=c.revision; u.confirmed_by=user.id; u.confirmed_time=datetime.now()
u.confirmation_snapshot={'executed':False,'vehicleNo':r.vehicle_no,
'measurementVersion': next((s.snapshot.get('measurementVersion', 'legacy_single_side') for s in r.sources), 'legacy_single_side')}
+104 -1
View File
@@ -741,6 +741,107 @@ def test_whole_cover_skips_once_used_purchase_with_remaining(monkeypatch):
assert manuals[0].permit_id == 'buy-fresh'
def test_whole_cover_rearrange_reuses_once_cert_reserved_by_same_plan(monkeypatch):
"""已安排计划再次选证:本单已预占的一次有效证不得误判为已使用,并归还本单预占余量。"""
from app.services import pl_quota_customer_select as sel
from app.schemas.pl.quota_usage import UsageSource
from app.models.pl_quota_models import PlPurchaseCert, PlCertQtyLog, PlPlanCertUsage
source = UsageSource(
source_stop_type='delivery',
source_stop_id='s1',
source_stop_product_id='sp1',
plan_product_id='pp1',
contract_id='c1',
contract_product_id='cp1',
product_id='prod1',
quantity=Decimal('5'),
unit='吨',
fingerprint='y' * 64,
snapshot={'customerId': 'cust1'},
requires_transport=False,
)
# 与 PO20261116021 现场一致:证面一次有效、本单已预占满额
own_cert = SimpleNamespace(
id='buy-own', cert_no='G-OWN', customer_id='cust1', category_id='cat1', status='active',
verified_by='u', verified_time=datetime.now(), valid_from=None, valid_to=date(2026, 12, 31),
total_qty=Decimal('5'), used_qty=Decimal('0'), reserved_qty=Decimal('5'),
quantity_unit='吨', opening_single_use_consumed=0, valid_use_text='一次有效',
)
own_usage = SimpleNamespace(
plan_id='plan-self', cert_id='buy-own', usage_status='reserved',
reserved_qty=Decimal('5'), confirmation_snapshot=None, del_flag=0,
)
class PurchaseQuery:
def filter(self, *a, **k):
return self
def order_by(self, *a, **k):
return self
def all(self):
return [own_cert]
class LogQuery:
def filter_by(self, **k):
return self
def first(self):
return SimpleNamespace(id='opening')
class UsageQuery:
def __init__(self):
self._filters = {}
def filter_by(self, **k):
self._filters.update(k)
return self
def all(self):
# is_single_use_consumed 查全部用量
return [own_usage]
def first(self):
# _plan_own_reserved 按 plan+cert 查本单预占
if self._filters.get('plan_id') == 'plan-self' and self._filters.get('cert_id') == 'buy-own':
return own_usage
return None
db = MagicMock()
def q_side(model):
if model is PlPurchaseCert:
return PurchaseQuery()
if model is PlCertQtyLog:
return LogQuery()
if model is PlPlanCertUsage:
return UsageQuery()
return MagicMock()
db.query.side_effect = q_side
user = SimpleNamespace(tenant_no='t')
monkeypatch.setattr(sel, 'category_ids_for_product', lambda db, tenant, pid: {'cat1'})
# 使用真实占用判定,验证必须传 exclude_plan_id
monkeypatch.setattr(sel, 'is_single_use_consumed', __import__(
'app.services.pl_quota_cert_service', fromlist=['is_single_use_consumed']
).is_single_use_consumed)
with pytest.raises(HTTPException) as blocked:
sel.select_whole_cover_certs(
db, user, [source], vehicle_no='皖A12345', on_date=date(2026, 11, 17),
)
assert '一次有效且已使用' in str(blocked.value.detail)
purchase_ids, transport_ids, manuals = sel.select_whole_cover_certs(
db, user, [source], vehicle_no='皖A12345', on_date=date(2026, 11, 17),
plan_id='plan-self',
)
assert purchase_ids == ['buy-own']
assert transport_ids == []
assert manuals[0].permit_quantity == Decimal('5')
def test_list_customers_requires_customer_cert_counts(monkeypatch):
from app.services import pl_quota_statistics as stats
@@ -1343,8 +1444,9 @@ def test_build_usage_request_passes_saved_manuals_to_customer_select(monkeypatch
)
captured = {}
def fake_select(db, user, sources, *, vehicle_no, on_date, manual_allocations=()):
def fake_select(db, user, sources, *, vehicle_no, on_date, manual_allocations=(), plan_id=None):
captured['manual_allocations'] = list(manual_allocations)
captured['plan_id'] = plan_id
return ['buy1'], [], list(manual_allocations)
monkeypatch.setattr(planning, '_plan', lambda *a, **k: plan)
@@ -1371,6 +1473,7 @@ def test_build_usage_request_passes_saved_manuals_to_customer_select(monkeypatch
)
assert captured['manual_allocations']
assert captured['manual_allocations'][0].permit_id == 'buy1'
assert captured['plan_id'] == 'p1'
assert config.purchase_cert_ids == ['buy1']
assert request.manual_allocations[0].permit_quantity == Decimal('2.5')
@@ -42,6 +42,28 @@ def test_internal_stop_skips_belongs_company_contract_check():
assert links == []
def test_internal_stop_clears_product_contract_fields():
from types import SimpleNamespace
from app.services.pl_plan_stop_service import _clear_internal_stop_product_contracts
stop = SimpleNamespace(
customer_name="安庆市山峡化工有限公司",
products=[
SimpleNamespace(contract_id="c-dongheng", contract_product_id="line-1"),
SimpleNamespace(contract_id="c-2", contract_product_id="line-2"),
],
)
_clear_internal_stop_product_contracts(stop)
assert all(p.contract_id is None and p.contract_product_id is None for p in stop.products)
external = SimpleNamespace(
customer_name="安庆市鑫富化工有限责任公司",
products=[SimpleNamespace(contract_id="keep", contract_product_id="line")],
)
_clear_internal_stop_product_contracts(external)
assert external.products[0].contract_id == "keep"
def test_belongs_company_contract_error_is_not_swallowed():
mismatch = HTTPException(status_code=422, detail="装货合同的交易主体与归属公司不一致")
empty = HTTPException(status_code=422, detail="请先选择归属公司")
+46
View File
@@ -353,3 +353,49 @@ def test_plan_quota_usages_include_cert_attachment_urls(case):
assert usages['p1']['attachmentUrls'] == 'https://example.com/buy.jpg'
assert usages['p1']['certNo'] == 'G-BUY'
assert usages['t1']['attachmentUrls'] in ('', None)
def test_plan_quota_usages_hide_released_rows(case, monkeypatch):
"""详情关联证件不展示已释放用量,避免改客户后仍显示旧购买证。"""
from app.models.crm_models import CrmContract
from app.models.pl_quota_models import (
PlCertQuotaRuleConfig, PlPlanCertUsage, PlPlanCertUsageItem, PlPurchaseCert,
)
from app.services.pl_quota_planning import get_plan_quota
c = case
for model in (CrmContract, PlCertQuotaRuleConfig, PlPlanCertUsage, PlPlanCertUsageItem, PlPurchaseCert):
model.__table__.create(c.db.bind, checkfirst=True)
monkeypatch.setattr(
'app.services.pl_cert_quota_rule_config_service.plan_applies_customer_category_rule',
lambda *a, **k: False,
)
monkeypatch.setattr(
'app.services.pl_cert_quota_rule_config_service.resolve_rule_version_for_arrange',
lambda *a, **k: 'legacy',
)
# 本用例只断言 usages 过滤;清空站点合同避免 get_plan_quota 拉合同表
c.db.get(c.m.PlPlanLoadProduct, 'lp').contract_id = None
c.db.get(c.m.PlPlanDeliveryProduct, 'dp').contract_id = None
c.db.add(PlPurchaseCert(
id='p-keep', cert_no='G-KEEP', product_name_on_cert='硫酸', valid_use_text='多次有效',
buyer_name='买方', seller_name='卖方', total_qty=33, quantity_unit='吨',
tenant_no='t', status='active',
))
c.db.add(PlPurchaseCert(
id='p-old', cert_no='G-OLD', product_name_on_cert='硫酸', valid_use_text='多次有效',
buyer_name='买方', seller_name='卖方', total_qty=33, quantity_unit='吨',
tenant_no='t', status='active',
))
c.db.add(PlPlanCertUsage(
id='u-keep', tenant_no='t', plan_id='plan', plan_no_snapshot='PLAN',
cert_type='purchase', cert_id='p-keep', cert_no_snapshot='G-KEEP', cert_revision=1,
quantity_unit='吨', reserved_qty=5, used_qty=0, usage_status='reserved', del_flag=0,
))
c.db.add(PlPlanCertUsage(
id='u-released', tenant_no='t', plan_id='plan', plan_no_snapshot='PLAN',
cert_type='purchase', cert_id='p-old', cert_no_snapshot='G-OLD', cert_revision=1,
quantity_unit='吨', reserved_qty=0, used_qty=0, usage_status='released', del_flag=0,
))
c.db.flush()
cert_nos = [u['certNo'] for u in get_plan_quota(c.db, c.user, 'plan')['usages']]
assert cert_nos == ['G-KEEP']
+5
View File
@@ -330,11 +330,16 @@ def test_no_cert_operation_is_still_idempotent(case):
def test_removal_and_restore_preserve_item_id(case):
c=case; run(c)
ids={i.id for i in c.db.query(c.m.PlPlanCertUsageItem).all()}
usage_ids={u.id for u in c.db.query(c.m.PlPlanCertUsage).all()}
run(c,action='resize',operation_id='clear',sources=[],purchase_cert_ids=[],transport_cert_ids=[])
assert all(i.del_flag==1 for i in c.db.query(c.m.PlPlanCertUsageItem).all())
# 清空分配后用量行标记 released 并软删,详情关联证件不再展示
assert all(u.usage_status=='released' and u.del_flag==1 for u in c.db.query(c.m.PlPlanCertUsage).all())
run(c,action='resize',operation_id='restore')
assert {i.id for i in c.db.query(c.m.PlPlanCertUsageItem).all()}==ids
assert {u.id for u in c.db.query(c.m.PlPlanCertUsage).all()}==usage_ids
assert all(i.del_flag==0 for i in c.db.query(c.m.PlPlanCertUsageItem).all())
assert all(u.usage_status=='reserved' and u.del_flag==0 for u in c.db.query(c.m.PlPlanCertUsage).all())
def _second_pair(c, cross=False):
for kind,model,old_id,new_id,total in [('purchase',c.m.PlPurchaseCert,'p','p2',100),('transport',c.m.PlTransportCert,'t','t2',100)]:
@@ -0,0 +1,46 @@
/**
* 顶栏侧栏收起按钮必须始终可见:
* - persist afterRestore 强制 ensureMenuButtonVisible(禁止 toggle)
* - AppLayout 挂载时再次兜底
* - 设置面板不再提供可关闭开关
*/
import test from 'node:test'
import assert from 'node:assert/strict'
import { readFileSync } from 'node:fs'
import { dirname, join } from 'node:path'
import { fileURLToPath } from 'node:url'
const root = join(dirname(fileURLToPath(import.meta.url)), '..')
test('setting store forces menu button visible on restore', () => {
const src = readFileSync(join(root, 'src/store/modules/setting.ts'), 'utf8')
assert.match(src, /ensureMenuButtonVisible\s*=\s*\(\)\s*=>\s*\{[\s\S]*?showMenuButton\.value\s*=\s*true/)
assert.match(src, /afterRestore:\s*\(ctx\)\s*=>\s*\{[\s\S]*?ensureMenuButtonVisible\(\)/)
assert.doesNotMatch(
src,
/afterRestore:[\s\S]*?if\s*\(\s*!ctx\.store\.showMenuButton\s*\)[\s\S]*?setButton\(\)/,
'afterRestore must not rely on setButton toggle'
)
assert.match(
src,
/const setButton = \(\) => \{\s*showMenuButton\.value = true/,
'setButton must assign true, not toggle'
)
})
test('AppLayout mount ensures menu button visible', () => {
const src = readFileSync(join(root, 'src/views/index/index.vue'), 'utf8')
assert.match(src, /ensureMenuButtonVisible\(\)/)
})
test('settings panel does not expose showMenuButton switch', () => {
const src = readFileSync(
join(root, 'src/components/core/layouts/art-settings-panel/composables/useSettingsConfig.ts'),
'utf8'
)
assert.doesNotMatch(
src,
/key:\s*'showMenuButton'/,
'settings UI must not allow turning off the fold control'
)
})
@@ -12,18 +12,36 @@ import { parse } from '@vue/compiler-sfc'
const root = join(dirname(fileURLToPath(import.meta.url)), '..')
test('ArtSvgIcon: el-icon branch must not use Tailwind inline class', () => {
test('ArtSvgIcon: icon roots must not use Tailwind inline class', () => {
const src = readFileSync(join(root, 'src/components/core/base/art-svg-icon/index.vue'), 'utf8')
const { descriptor } = parse(src)
const template = descriptor.template?.content || ''
assert.match(template, /<el-icon\b[^>]*class="[^"]*art-svg-icon/)
assert.doesNotMatch(
template,
/<el-icon\b[^>]*class="[^"]*\binline\b/,
'el-icon must not include Tailwind inline (breaks display:inline-flex in prod CSS order)'
/<(?:el-icon|Icon)\b[^>]*class="[^"]*\binline\b/,
'icon roots must not include Tailwind inline (breaks display in prod CSS order)'
)
})
test('header fold button uses inline SVG button (Chrome-safe)', () => {
const src = readFileSync(
join(root, 'src/components/core/layouts/art-header-bar/index.vue'),
'utf8'
)
const { descriptor } = parse(src)
const template = descriptor.template?.content || ''
assert.match(template, /class="menu-fold-btn/)
assert.match(template, /menu-fold-btn__icon/)
assert.match(template, /<svg[\s\S]*viewBox="0 0 24 24"/)
assert.doesNotMatch(
template,
/<ArtIconButton[\s\S]*menu-fold/,
'fold control must not rely on ArtIconButton/iconify in Chrome'
)
assert.match(template, /<button[\s\S]*class="menu-fold-btn/)
})
test('plan-archive: planNo is in column defs and table visibility gate', () => {
const src = readFileSync(join(root, 'src/views/pl/plan-archive/index.vue'), 'utf8')
assert.match(src, /prop:\s*'planNo',\s*label:\s*'计划编号'/)
@@ -0,0 +1,66 @@
/**
* #41 回归:运输归档绿色合计行须与表头列一一对应。
* planNo 可隐藏后,不得再无条件硬编码插入 planNo,否则按索引错位。
*/
import test from 'node:test'
import assert from 'node:assert/strict'
import { readFileSync } from 'node:fs'
import { dirname, join } from 'node:path'
import { fileURLToPath } from 'node:url'
import { buildStatsRowColumns } from '../src/utils/list-column-stats.ts'
const root = join(dirname(fileURLToPath(import.meta.url)), '..')
const ARCHIVE_DEFS = [
{ prop: 'planNo' },
{ prop: 'planDate' },
{ prop: 'planQty' },
{ prop: 'actualQty' },
{ prop: 'amount' }
]
test('buildStatsRowColumns: hidden planNo must not leave a phantom stats cell', () => {
const visible = new Set(['planDate', 'planQty', 'actualQty', 'amount'])
const cols = buildStatsRowColumns({
leadingSpacers: 2,
optionalDefs: ARCHIVE_DEFS,
isColumnVisible: (prop) => visible.has(prop),
moneyProps: ['amount']
})
const props = cols.map((c) => c.prop || c.key)
assert.deepEqual(props, [
'__spacer_0',
'__spacer_1',
'planDate',
'planQty',
'actualQty',
'amount'
])
assert.equal(cols.filter((c) => c.prop === 'planNo').length, 0)
})
test('buildStatsRowColumns: visible planNo appears once after spacers', () => {
const visible = new Set(['planNo', 'planDate', 'planQty'])
const cols = buildStatsRowColumns({
leadingSpacers: 2,
optionalDefs: ARCHIVE_DEFS,
isColumnVisible: (prop) => visible.has(prop)
})
const props = cols.map((c) => c.prop || c.key)
assert.deepEqual(props, ['__spacer_0', '__spacer_1', 'planNo', 'planDate', 'planQty'])
assert.equal(cols.filter((c) => c.prop === 'planNo').length, 1)
})
test('plan-archive: stats row builds from visible columns without always-on planNo', () => {
const src = readFileSync(join(root, 'src/views/pl/plan-archive/index.vue'), 'utf8')
assert.match(
src,
/archiveStatsRowColumns[\s\S]*?buildStatsRowColumns\s*\(/,
'archive stats columns should use buildStatsRowColumns so visibility stays in sync'
)
assert.doesNotMatch(
src,
/archiveStatsRowColumns[\s\S]*?key:\s*'__index'[\s\S]*?key:\s*'planNo'[\s\S]*?for\s*\(\s*const\s+def\s+of\s+listColumnDefs/,
'must not hardcode planNo before looping listColumnDefs (causes off-by-one when hidden)'
)
})
@@ -1,11 +1,11 @@
<!-- 图标组件:支持 Element Plus 图标(无 : 前缀)与 Iconify 图标(含 : 前缀) -->
<template>
<!-- el-icon 勿加 Tailwind `inline`:生产 CSS 中 `.inline{display:inline}` 会覆盖
`.el-icon{display:inline-flex}`,导致 Fold 等图标在打包后不可见 -->
<!-- 勿给图标根节点加 Tailwind `inline`:生产 CSS 中 `.inline{display:inline}`
会覆盖 flex/尺寸,部分 Chrome 下 Fold 等图标不可见 -->
<el-icon v-if="epIcon" v-bind="iconAttrs" class="art-svg-icon">
<component :is="epIcon" />
</el-icon>
<Icon v-else-if="icon" :icon="icon" v-bind="iconAttrs" class="art-svg-icon inline" />
<Icon v-else-if="icon" :icon="icon" v-bind="iconAttrs" class="art-svg-icon" />
</template>
<script setup lang="ts">
@@ -21,17 +21,31 @@
@click="toHome"
/>
<!-- 菜单按钮 -->
<ArtIconButton
<!-- 菜单按钮:内联 SVG,避开 Chrome 下 el-icon / Iconify 偶发不绘制 -->
<button
v-if="isLeftMenu && shouldShowMenuButton"
icon="fold"
class="ml-3 max-sm:ml-[7px] menu-fold-btn"
type="button"
class="menu-fold-btn"
:class="{ 'is-menu-collapsed': !menuOpen }"
:title="menuOpen ? '收起菜单' : '展开菜单'"
:aria-label="menuOpen ? '收起菜单' : '展开菜单'"
:aria-expanded="menuOpen"
@click="visibleMenu"
/>
>
<svg
class="menu-fold-btn__icon"
viewBox="0 0 24 24"
width="20"
height="20"
aria-hidden="true"
focusable="false"
>
<path
fill="currentColor"
d="M21 18v2H3v-2zm0-5v2h-9v-2zm0-5v2h-9V8zM3 3.5v10l5-5z"
/>
</svg>
</button>
<!-- 刷新按钮 - 已隐藏 -->
<ArtIconButton
@@ -388,14 +402,49 @@
}
}
.menu-fold-btn :deep(.art-svg-icon) {
transition: transform 0.3s ease;
/* 顶栏折叠按钮:原生 button + 内联 SVG,保证 Chrome/Safari 一致可见 */
.menu-fold-btn {
box-sizing: border-box;
display: inline-flex;
flex-shrink: 0;
align-items: center;
justify-content: center;
width: 34px;
height: 34px;
margin-left: 12px;
padding: 0;
color: #64748b;
cursor: pointer;
background: transparent;
border: 0;
border-radius: 8px;
appearance: none;
}
.menu-fold-btn.is-menu-collapsed :deep(.art-svg-icon) {
@media (max-width: 640px) {
.menu-fold-btn {
margin-left: 7px;
}
}
.menu-fold-btn:hover {
color: #1e293b;
background: var(--mint-row-alt, #f1f5f9);
}
.menu-fold-btn__icon {
display: block;
width: 20px;
height: 20px;
transition: transform 0.3s ease;
/* 展开态默认旋转,与收起态对调 */
transform: rotate(180deg);
}
.menu-fold-btn.is-menu-collapsed .menu-fold-btn__icon {
transform: rotate(0deg);
}
/* Hover animation classes */
.refresh-btn:hover :deep(.art-svg-icon) {
animation: rotate180 0.5s;
@@ -119,13 +119,7 @@ export function useSettingsConfig() {
handler: 'uniqueOpened',
headerBarKey: null // 不依赖headerBar配置
},
{
key: 'showMenuButton',
label: t('setting.basics.list.collapseSidebar'),
type: 'switch' as const,
handler: 'menuButton',
headerBarKey: 'menuButton' as const
},
// showMenuButton 不提供开关:顶栏收起侧栏按钮为产品必显能力
{
key: 'showFastEnter',
label: t('setting.basics.list.fastEnter'),
@@ -67,7 +67,7 @@ export function useSettingsHandlers() {
uniqueOpened: createToggleHandler(() => settingStore.setUniqueOpened()),
// 显示菜单按钮
menuButton: createToggleHandler(() => settingStore.setButton()),
menuButton: createToggleHandler(() => settingStore.ensureMenuButtonVisible()),
// 显示快速入口
fastEnter: createToggleHandler(() => settingStore.setFastEnter()),
@@ -185,9 +185,8 @@
settingStore.setElementTheme(config.systemThemeColor)
// 界面显示(切换类方法)
toggleIfDifferent(settingStore.showMenuButton, config.showMenuButton, () =>
settingStore.setButton()
)
// 顶栏收起按钮为必显,导入配置时也强制打开
settingStore.ensureMenuButtonVisible()
toggleIfDifferent(settingStore.showFastEnter, config.showFastEnter, () =>
settingStore.setFastEnter()
)
+10 -6
View File
@@ -227,10 +227,15 @@ export const useSettingStore = defineStore(
}
/**
* 切换菜单按钮显示
* 切换菜单按钮显示(产品要求顶栏始终可收起侧栏,禁止关闭)
*/
const setButton = () => {
showMenuButton.value = !showMenuButton.value
showMenuButton.value = true
}
/** 强制显示顶栏侧栏收起按钮,修复旧 localStorage 中 false 残留 */
const ensureMenuButtonVisible = () => {
showMenuButton.value = true
}
/**
@@ -423,6 +428,7 @@ export const useSettingStore = defineStore(
setContainerWidth,
setUniqueOpened,
setButton,
ensureMenuButtonVisible,
setFastEnter,
setAutoClose,
setShowRefreshButton,
@@ -458,10 +464,8 @@ export const useSettingStore = defineStore(
} else if (width === 290) {
ctx.store.setMenuOpenWidth(270)
}
// 旧本地配置把收起按钮关掉了;产品需要顶栏始终能收起侧栏
if (!ctx.store.showMenuButton) {
ctx.store.setButton()
}
// 旧本地配置(sys-v*-setting)可能残留 showMenuButton:false;必须赋值 true,禁止用 toggle
ctx.store.ensureMenuButtonVisible()
}
}
}
+2
View File
@@ -75,6 +75,8 @@
if (!settingStore.showCrumbs) {
settingStore.setCrumbs()
}
// 纠正版本化 localStorage 中 showMenuButton:false,保证折叠钮始终可见
settingStore.ensureMenuButtonVisible()
})
</script>
+10 -17
View File
@@ -970,7 +970,7 @@ import {
overflowExportPlaceholder
} from '@/utils/list-toolbar-overflow-items'
import ListColumnStatsRow from '@/components/business/list-column-stats-row/index.vue'
import type { StatsRowColumn } from '@/utils/list-column-stats'
import { buildStatsRowColumns, type StatsRowColumn } from '@/utils/list-column-stats'
import { useContractDetailDialog } from '@/composables/useContractDetailDialog'
import { usePersistedListColumns } from '@/composables/usePersistedListColumns'
import { useListTableViewportHeight } from '@/composables/useListTableViewportHeight'
@@ -1287,22 +1287,15 @@ const {
const archiveStatsRowRef = ref<{ resync?: () => void } | null>(null)
const archiveStatsRowColumns = computed((): StatsRowColumn[] => {
const cols: StatsRowColumn[] = [
{ key: '__selection', interactive: false },
{ key: '__index', interactive: false },
{ key: 'planNo', interactive: true, prop: 'planNo' }
]
for (const def of listColumnDefs.value) {
if (!isArchiveColumnVisible(def.prop)) continue
cols.push({
key: def.prop,
interactive: true,
prop: def.prop
})
}
return cols
})
/** 与表头可见列一一对应:勾选/序号占位 + 可见业务列(含可隐藏的 planNo) */
const archiveStatsRowColumns = computed((): StatsRowColumn[] =>
buildStatsRowColumns({
leadingSpacers: 2,
optionalDefs: listColumnDefs.value,
isColumnVisible: isArchiveColumnVisible,
moneyProps: PRICE_COLUMN_PROPS
})
)
function getArchiveStatCellValue(row: PlPlanListDisplayRow, prop: string): unknown {
const plan = row.plan
+31
View File
@@ -84,6 +84,7 @@ server {
}
# MinIO(bucket=ruoyi);兼容旧链接,推荐逐步切到 res.shanxiachem.com
# 必须 proxy_hide_header 上游 CORS,否则 MinIO 的 Origin 与 nginx 的 * 叠成非法双头
location ^~ /ruoyi/ {
proxy_pass http://127.0.0.1:9000;
@@ -96,8 +97,15 @@ server {
proxy_send_timeout 60s;
proxy_read_timeout 60s;
proxy_hide_header Access-Control-Allow-Origin;
proxy_hide_header Access-Control-Allow-Methods;
proxy_hide_header Access-Control-Allow-Headers;
proxy_hide_header Access-Control-Expose-Headers;
proxy_hide_header Access-Control-Allow-Credentials;
add_header Access-Control-Allow-Origin * always;
add_header Access-Control-Allow-Methods 'GET, HEAD, OPTIONS' always;
add_header Access-Control-Allow-Headers 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization' always;
if ($request_method = 'OPTIONS') {
return 204;
@@ -224,6 +232,7 @@ server {
}
}
# 必须 proxy_hide_header 上游 CORS,否则 MinIO 的 Origin 与 nginx 的 * 叠成非法双头
location ^~ /ruoyi/ {
proxy_pass http://127.0.0.1:9000;
@@ -236,8 +245,15 @@ server {
proxy_send_timeout 60s;
proxy_read_timeout 60s;
proxy_hide_header Access-Control-Allow-Origin;
proxy_hide_header Access-Control-Allow-Methods;
proxy_hide_header Access-Control-Allow-Headers;
proxy_hide_header Access-Control-Expose-Headers;
proxy_hide_header Access-Control-Allow-Credentials;
add_header Access-Control-Allow-Origin * always;
add_header Access-Control-Allow-Methods 'GET, HEAD, OPTIONS' always;
add_header Access-Control-Allow-Headers 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization' always;
if ($request_method = 'OPTIONS') {
return 204;
@@ -364,6 +380,7 @@ server {
}
}
# 必须 proxy_hide_header 上游 CORS,否则 MinIO 的 Origin 与 nginx 的 * 叠成非法双头
location ^~ /ruoyi/ {
proxy_pass http://127.0.0.1:9000;
@@ -376,8 +393,15 @@ server {
proxy_send_timeout 60s;
proxy_read_timeout 60s;
proxy_hide_header Access-Control-Allow-Origin;
proxy_hide_header Access-Control-Allow-Methods;
proxy_hide_header Access-Control-Allow-Headers;
proxy_hide_header Access-Control-Expose-Headers;
proxy_hide_header Access-Control-Allow-Credentials;
add_header Access-Control-Allow-Origin * always;
add_header Access-Control-Allow-Methods 'GET, HEAD, OPTIONS' always;
add_header Access-Control-Allow-Headers 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization' always;
if ($request_method = 'OPTIONS') {
return 204;
@@ -477,6 +501,7 @@ server {
add_header X-Content-Type-Options "nosniff" always;
# 必须 proxy_hide_header 上游 CORS,否则 MinIO 的 Origin 与 nginx 的 * 叠成非法双头
location ^~ /ruoyi/ {
proxy_pass http://127.0.0.1:9000;
@@ -489,6 +514,12 @@ server {
proxy_send_timeout 60s;
proxy_read_timeout 60s;
proxy_hide_header Access-Control-Allow-Origin;
proxy_hide_header Access-Control-Allow-Methods;
proxy_hide_header Access-Control-Allow-Headers;
proxy_hide_header Access-Control-Expose-Headers;
proxy_hide_header Access-Control-Allow-Credentials;
add_header Access-Control-Allow-Origin * always;
add_header Access-Control-Allow-Methods 'GET, HEAD, OPTIONS' always;
add_header Access-Control-Allow-Headers 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization' always;