diff --git a/client/lib/screens/inventory/inventory_list_screen.dart b/client/lib/screens/inventory/inventory_list_screen.dart index 2c3b5c9..a0af7c5 100644 --- a/client/lib/screens/inventory/inventory_list_screen.dart +++ b/client/lib/screens/inventory/inventory_list_screen.dart @@ -52,18 +52,18 @@ class _InventoryListScreenState extends ConsumerState { static const _screenId = 'inventory_list'; static const _statusOptions = ['全部', '在售', '库存', '已售']; - // 列序照原型 inventory.html COLS:商品/规格/系列/批次/库存/成本价/单价/生产/入库/供应商/状态/操作。 + // 列序照原型 inventory.html COLS:商品/规格/系列/生产/库存/成本价/单价/批次/入库/供应商/状态/操作(批次号↔生产日期 2026-07-14 对调)。 // 成本价=入库进价(unitPrice),总价=库存×成本价(2026-07-03 用户拍板:原「单价/参考售价」列换掉)。 // 仓库/备注原型没有 → 默认隐藏的可选列(列设置可开)。 static const _colDefs = [ ColDef('product', '商品', required: true), ColDef('spec', '规格'), ColDef('series', '系列'), - ColDef('batch', '批次号'), + ColDef('prodDate', '生产日期'), ColDef('qty', '库存'), ColDef('cost', '成本价'), ColDef('price', '总价'), - ColDef('prodDate', '生产日期'), + ColDef('batch', '批次号'), ColDef('inTime', '入库时间'), ColDef('supplier', '供应商'), ColDef('warehouse', '仓库'), diff --git a/client/test/golden/goldens/inventory_list_a.png b/client/test/golden/goldens/inventory_list_a.png index ad413c5..1f2e3a2 100644 Binary files a/client/test/golden/goldens/inventory_list_a.png and b/client/test/golden/goldens/inventory_list_a.png differ diff --git a/client/test/golden/goldens/inventory_list_b.png b/client/test/golden/goldens/inventory_list_b.png index c6fbb63..c0de48f 100644 Binary files a/client/test/golden/goldens/inventory_list_b.png and b/client/test/golden/goldens/inventory_list_b.png differ diff --git a/client/test/golden/goldens/inventory_list_c.png b/client/test/golden/goldens/inventory_list_c.png index e4d342f..509aa5f 100644 Binary files a/client/test/golden/goldens/inventory_list_c.png and b/client/test/golden/goldens/inventory_list_c.png differ diff --git a/design/prototype/screens/inventory.html b/design/prototype/screens/inventory.html index 9765ba4..7688dd0 100644 --- a/design/prototype/screens/inventory.html +++ b/design/prototype/screens/inventory.html @@ -125,7 +125,7 @@ const ITEMS=[ ]; const STATUS=['全部','在售','库存','已售']; // 成本价/总价列 = 成本口径,仅管理员可见(非管理员两列隐藏、列设置菜单不出现,2026-07-06);原型=管理员形态 -const COLS=[{key:'product',label:'商品',fixed:true},{key:'spec',label:'规格'},{key:'series',label:'系列'},{key:'batch',label:'批次号'},{key:'qty',label:'库存',num:true,sort:true},{key:'cost',label:'成本价',num:true,sort:true},{key:'price',label:'总价',num:true,sort:true},{key:'prodDate',label:'生产日期',sort:true},{key:'inDate',label:'入库时间',sort:true},{key:'supplier',label:'供应商'},{key:'status',label:'状态'},{key:'act',label:'操作',fixed:true}]; +const COLS=[{key:'product',label:'商品',fixed:true},{key:'spec',label:'规格'},{key:'series',label:'系列'},{key:'prodDate',label:'生产日期',sort:true},{key:'qty',label:'库存',num:true,sort:true},{key:'cost',label:'成本价',num:true,sort:true},{key:'price',label:'总价',num:true,sort:true},{key:'batch',label:'批次号'},{key:'inDate',label:'入库时间',sort:true},{key:'supplier',label:'供应商'},{key:'status',label:'状态'},{key:'act',label:'操作',fixed:true}]; const state={q:'',code:'',status:'全部',page:1,perPage:10,hidden:new Set(),sortBy:null,sortAsc:true,spec:new Set(),series:new Set(),wh:new Set()}; function setActive(k){ document.querySelectorAll('.nav[data-k]').forEach(e=>e.classList.toggle('active',e.dataset.k===k)); }