From f9ae4dd16bc60281d7c2f7489e45d4f17896b659 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期一, 26 一月 2026 13:14:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-admin/src/page/orders/config/orderItemColumns.jsx | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/rsf-admin/src/page/orders/config/orderItemColumns.jsx b/rsf-admin/src/page/orders/config/orderItemColumns.jsx
index 3c1578f..10d4b3f 100644
--- a/rsf-admin/src/page/orders/config/orderItemColumns.jsx
+++ b/rsf-admin/src/page/orders/config/orderItemColumns.jsx
@@ -22,9 +22,10 @@
<TextField source="maktx" label="table.field.asnOrderItem.maktx" key="maktx" />, //鐗╂枡鍚嶇О
<TextField source="splrBatch" label="table.field.asnOrderItem.splrBatch" key="splrBatch" />, //鎵规
<TextField source="spec" label="table.field.asnOrderItem.spec" key="spec" />, //瑙勬牸
+ <TextField source="unit" label="table.field.asnOrderItem.unit" key="unit" />, //鍗曚綅
<NumberField source="anfme" label="table.field.asnOrderItem.anfme" key="anfme" />, //搴旀敹鏁伴噺
<NumberField source="qty" label="table.field.asnOrderItem.qty" key="qty" />, //瀹炴敹鏁伴噺
- <TextField source="stockUnit" label="table.field.asnOrderItem.stockUnit" key="stockUnit" />, //鍗曚綅
+ <TextField source="sourceWareHouseId" label="table.field.asnOrderItem.sourceWareHouseId" key="sourceWareHouseId" />, //璋冨嚭浠�
];
/**
@@ -42,9 +43,10 @@
<TextField source="maktx" label="table.field.asnOrderItem.maktx" key="maktx" />, //鐗╂枡鍚嶇О
<TextField source="splrBatch" label="table.field.asnOrderItem.splrBatch" key="splrBatch" />, //鎵规
<TextField source="spec" label="table.field.asnOrderItem.spec" key="spec" />, //瑙勬牸
+ <TextField source="unit" label="table.field.asnOrderItem.unit" key="unit" />, //鍗曚綅
<NumberField source="anfme" label="table.field.asnOrderItem.anfme" key="anfme" />, //搴旀敹鏁伴噺
- <NumberField source="qty" label="table.field.asnOrderItem.qty" key="qty" />, //瀹炴敹鏁伴噺
- <TextField source="stockUnit" label="table.field.asnOrderItem.stockUnit" key="stockUnit" />, //鍗曚綅
+ <NumberField source="qty" label="table.field.asnOrderItem.qty" key="qty" />, //瀹炴敹鏁伴噺
+ <TextField source="targetWarehouseId" label="table.field.asnOrderItem.targetWarehouseId" key="targetWarehouseId" />, //寤鸿鐩爣浠�
];
/**
@@ -68,10 +70,10 @@
* @returns {Array} 灏鹃儴鍒楁暟缁�
*/
export const getLastColumns = () => [
- <DateField source="updateTime" label="common.field.updateTime" showTime key="updateTime" />,
- <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false} key="updateBy">
+ <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false} key="updateBy">
<TextField source="nickname" />
</ReferenceField>,
+ <DateField source="updateTime" label="common.field.updateTime" showTime key="updateTime" />,
<ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false} key="createBy">
<TextField source="nickname" />
</ReferenceField>,
--
Gitblit v1.9.1