diff --git a/apps/web-antd/src/views/wms/inventory/index/data.ts b/apps/web-antd/src/views/wms/inventory/index/data.ts index 90479ca7a..40cfa3acf 100644 --- a/apps/web-antd/src/views/wms/inventory/index/data.ts +++ b/apps/web-antd/src/views/wms/inventory/index/data.ts @@ -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' }, diff --git a/apps/web-antd/src/views/wms/inventory/index/index.vue b/apps/web-antd/src/views/wms/inventory/index/index.vue index 2e227c81a..64d6fcf14 100644 --- a/apps/web-antd/src/views/wms/inventory/index/index.vue +++ b/apps/web-antd/src/views/wms/inventory/index/index.vue @@ -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']; } diff --git a/apps/web-ele/src/views/wms/inventory/index/data.ts b/apps/web-ele/src/views/wms/inventory/index/data.ts index 27c8cc359..124051866 100644 --- a/apps/web-ele/src/views/wms/inventory/index/data.ts +++ b/apps/web-ele/src/views/wms/inventory/index/data.ts @@ -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' }, diff --git a/apps/web-ele/src/views/wms/inventory/index/index.vue b/apps/web-ele/src/views/wms/inventory/index/index.vue index 0613ec284..79d70d975 100644 --- a/apps/web-ele/src/views/wms/inventory/index/index.vue +++ b/apps/web-ele/src/views/wms/inventory/index/index.vue @@ -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']; }