fix(wms): 修复库存统计商品维度合并字段
- 对齐商品维度列字段为 itemId、skuId、skuWarehouseId - 同步 antd/ele 的 spanMethod 合并字段 - 补充 WMS 迁移验证记录pull/345/head
parent
3d0917f1a9
commit
8da5c12dfc
|
|
@ -140,7 +140,7 @@ const warehouseDimensionColumns: VxeTableGridOptions['columns'] = [
|
|||
|
||||
const itemDimensionColumns: VxeTableGridOptions['columns'] = [
|
||||
{
|
||||
field: 'warehouseItemId',
|
||||
field: 'itemId',
|
||||
title: '商品信息',
|
||||
minWidth: 240,
|
||||
slots: { default: 'itemInfo' },
|
||||
|
|
@ -152,7 +152,7 @@ const itemDimensionColumns: VxeTableGridOptions['columns'] = [
|
|||
slots: { default: 'skuInfo' },
|
||||
},
|
||||
{
|
||||
field: 'warehouseId',
|
||||
field: 'skuWarehouseId',
|
||||
title: '仓库',
|
||||
minWidth: 160,
|
||||
slots: { default: 'warehouseName' },
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ function getRowPropertyValue(row: InventoryRow | undefined, property: string) {
|
|||
/** 根据统计维度返回需要合并单元格的字段 */
|
||||
function getRowSpanProperties() {
|
||||
if (currentDimension.value === INVENTORY_DIMENSION.ITEM) {
|
||||
return ['warehouseItemId', 'skuId', 'skuWarehouseId'];
|
||||
return ['itemId', 'skuId', 'skuWarehouseId'];
|
||||
}
|
||||
return ['warehouseId', 'warehouseItemId'];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@ const warehouseDimensionColumns: VxeTableGridOptions['columns'] = [
|
|||
|
||||
const itemDimensionColumns: VxeTableGridOptions['columns'] = [
|
||||
{
|
||||
field: 'warehouseItemId',
|
||||
field: 'itemId',
|
||||
title: '商品信息',
|
||||
minWidth: 240,
|
||||
slots: { default: 'itemInfo' },
|
||||
|
|
@ -150,7 +150,7 @@ const itemDimensionColumns: VxeTableGridOptions['columns'] = [
|
|||
slots: { default: 'skuInfo' },
|
||||
},
|
||||
{
|
||||
field: 'warehouseId',
|
||||
field: 'skuWarehouseId',
|
||||
title: '仓库',
|
||||
minWidth: 160,
|
||||
slots: { default: 'warehouseName' },
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ function getRowPropertyValue(row: InventoryRow | undefined, property: string) {
|
|||
/** 根据统计维度返回需要合并单元格的字段 */
|
||||
function getRowSpanProperties() {
|
||||
if (currentDimension.value === INVENTORY_DIMENSION.ITEM) {
|
||||
return ['warehouseItemId', 'skuId', 'skuWarehouseId'];
|
||||
return ['itemId', 'skuId', 'skuWarehouseId'];
|
||||
}
|
||||
return ['warehouseId', 'warehouseItemId'];
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue