From c0c8990f00a5743e30e70e113821e8cfa2185c2c Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 06 三月 2026 16:23:28 +0800
Subject: [PATCH] #站点区域
---
rsf-admin/src/page/orders/config/orderItemColumns.jsx | 93 +++++++++++++++++++++++++++++++++-------------
1 files changed, 66 insertions(+), 27 deletions(-)
diff --git a/rsf-admin/src/page/orders/config/orderItemColumns.jsx b/rsf-admin/src/page/orders/config/orderItemColumns.jsx
index 6448da6..6b375d1 100644
--- a/rsf-admin/src/page/orders/config/orderItemColumns.jsx
+++ b/rsf-admin/src/page/orders/config/orderItemColumns.jsx
@@ -30,35 +30,12 @@
export const getInOrderItemFullBaseColumns = () => [
<TextField source="poCode" label="table.field.asnOrder.poCode" key="poCode" />,
<TextField source="wkType$" label="table.field.asnOrder.wkType" key="wkType$" />,
-
<TextField source="purchaseOrgName" label="table.field.asnOrder.purchaseOrgName" key="purchaseOrgName" />,
<TextField source="purchaseUserName" label="table.field.asnOrder.purchaseUserName" key="purchaseUserName" />,
<DateField source="businessTime" label="table.field.asnOrder.businessTime" key="businessTime" />,
<TextField source="supplierId" label="table.field.asnOrder.supplierId" key="supplierId" />,
<TextField source="supplierName" label="table.field.asnOrder.supplierName" key="supplierName" />,
-
// <TextField source="batch" label="table.field.asnOrder.batch" key="batch" />
-];
-
-/**
- * 鑾峰彇鍑哄簱璁㈠崟鏄庣粏鐨勫熀纭�鍒楅厤缃�
- * @returns {Array} 鍩虹鍒楁暟缁�
- */
-export const getOutOrderItemBaseColumns = () => [
- <NumberField source="id" key="id" />, // id
- <TextField source="orderCode" label="table.field.outStockItem.orderCode" key="orderCode" />, // 璁㈠崟鍙�
- <TextField source="platWorkCode" label="table.field.outStockItem.platWorkCode" key="platWorkCode" />, //璁″垝璺熻釜鍙�
- <TextField source="splrCode" label="table.field.outStockItem.splrCode" key="splrCode" />, //渚涘簲鍟嗙紪鐮�
- <TextField source="splrName" label="table.field.outStockItem.splrName" key="splrName" />, //渚涘簲鍟嗗悕绉�
- <TextField source="platItemId" label="table.field.outStockItem.platItemId" key="platItemId" />, //琛屽彿
- <TextField source="matnrCode" label="table.field.outStockItem.matnrCode" key="matnrCode" />, //鐗╂枡缂栫爜
- <TruncatedTextField source="maktx" label="table.field.outStockItem.maktx" key="maktx" maxLength={20} />, //鐗╂枡鍚嶇О
- <TextField source="splrBatch" label="table.field.outStockItem.splrBatch" key="splrBatch" />, //鎵规
- <TextField source="spec" label="table.field.outStockItem.spec" key="spec" />, //瑙勬牸
- <TextField source="purUnit" label="table.field.outStockItem.purUnit" key="purUnit" />, //鍗曚綅
- <NumberField source="anfme" label="table.field.outStockItem.anfme" key="anfme" />, //搴旀敹鏁伴噺
- <NumberField source="qty" label="table.field.outStockItem.qty" key="qty" />, //瀹炴敹鏁伴噺
- <TextField source="sourceWarehouseId" label="table.field.outStockItem.sourceWarehouseId" key="sourceWarehouseId" />, //璋冨嚭浠�
];
/**
@@ -67,20 +44,54 @@
*/
export const getInOrderItemBaseColumns = () => [
<NumberField source="id" key="id" />, // id
- <TextField source="orderCode" label="table.field.asnOrderItem.orderCode" key="orderCode" />, // 璁㈠崟鍙�
+ // <TextField source="orderCode" label="table.field.asnOrderItem.orderCode" key="orderCode" />, // 璁㈠崟鍙�
<TextField source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" key="platWorkCode" />, //璁″垝璺熻釜鍙�
- <TextField source="splrCode" label="table.field.asnOrderItem.splrCode" key="splrCode" />, //渚涘簲鍟嗙紪鐮�
- <TextField source="splrName" label="table.field.asnOrderItem.splrName" key="splrName" />, //渚涘簲鍟嗗悕绉�
+ // <TextField source="splrCode" label="table.field.asnOrderItem.splrCode" key="splrCode" />, //渚涘簲鍟嗙紪鐮�
+ // <TextField source="splrName" label="table.field.asnOrderItem.splrName" key="splrName" />, //渚涘簲鍟嗗悕绉�
<TextField source="platItemId" label="table.field.asnOrderItem.platItemId" key="platItemId" />, //琛屽彿
<TextField source="matnrCode" label="table.field.asnOrderItem.matnrCode" key="matnrCode" />, //鐗╂枡缂栫爜
<TruncatedTextField source="maktx" label="table.field.asnOrderItem.maktx" key="maktx" maxLength={20} />, //鐗╂枡鍚嶇О
<TextField source="batch" label="table.field.asnOrderItem.splrBatch" key="batch" />, //鎵规
<TextField source="spec" label="table.field.asnOrderItem.spec" key="spec" />, //瑙勬牸
- <TextField source="stockUnit" label="table.field.asnOrderItem.unit" key="stockUnit" />, //鍗曚綅
<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.unit" key="stockUnit" />, //鍗曚綅
<TextField source="targetWarehouseId" label="table.field.asnOrderItem.targetWarehouseId" key="targetWarehouseId" />, //寤鸿鐩爣浠�
];
+
+export const getOutOrderItemFullBaseColumns = () => [
+ <TextField source="poCode" label="table.field.asnOrder.poCode" key="poCode" />,
+ <TextField source="wkType$" label="table.field.asnOrder.wkType" key="wkType$" />,
+ <TextField source="saleOrgName" label="閿�鍞粍缁�" key="saleOrgName" />,
+ <TextField source="saleUserName" label="閿�鍞憳" key="saleUserName" />,
+ <DateField source="businessTime" label="鍑哄簱鏃ユ湡" key="businessTime" />,
+ <TextField source="customerId" label="瀹㈡埛缂栫爜" key="customerId" />,
+ <TextField source="customerName" label="瀹㈡埛" key="customerName" />,
+ // <TextField source="stockOrgName" label="table.field.outStock.stockOrgName" key="saleOrgName" />,
+];
+
+/**
+ * 鑾峰彇鍑哄簱璁㈠崟鏄庣粏鐨勫熀纭�鍒楅厤缃�
+ * @returns {Array} 鍩虹鍒楁暟缁�
+ */
+export const getOutOrderItemBaseColumns = () => [
+ <NumberField source="id" key="id" />, // id
+ // <TextField source="orderCode" label="table.field.outStockItem.orderCode" key="orderCode" />, // 璁㈠崟鍙�
+ <TextField source="platWorkCode" label="table.field.outStockItem.platWorkCode" key="platWorkCode" />, //璁″垝璺熻釜鍙�
+ // <TextField source="splrCode" label="table.field.outStockItem.splrCode" key="splrCode" />, //渚涘簲鍟嗙紪鐮�
+ // <TextField source="splrName" label="table.field.outStockItem.splrName" key="splrName" />, //渚涘簲鍟嗗悕绉�
+ <TextField source="platItemId" label="table.field.outStockItem.platItemId" key="platItemId" />, //琛屽彿
+ <TextField source="matnrCode" label="table.field.outStockItem.matnrCode" key="matnrCode" />, //鐗╂枡缂栫爜
+ <TruncatedTextField source="maktx" label="table.field.outStockItem.maktx" key="maktx" maxLength={20} />, //鐗╂枡鍚嶇О
+ <TextField source="batch" label="table.field.outStockItem.splrBatch" key="batch" />, //鎵规
+ <TextField source="spec" label="table.field.outStockItem.spec" key="spec" />, //瑙勬牸
+ <TextField source="purUnit" label="table.field.outStockItem.purUnit" key="purUnit" />, //鍗曚綅
+ <NumberField source="anfme" label="table.field.outStockItem.anfme" key="anfme" />, //搴旀敹鏁伴噺
+ <NumberField source="qty" label="table.field.outStockItem.qty" key="qty" />, //瀹炴敹鏁伴噺
+ <TextField source="sourceWarehouseId" label="table.field.outStockItem.sourceWarehouseId" key="sourceWarehouseId" />, //璋冨嚭浠�
+];
+
+
@@ -89,6 +100,18 @@
* @returns {Array} 灏鹃儴鍒楁暟缁�
*/
export const getLastColumns = () => [
+ <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>,
+ <DateField source="createTime" label="common.field.createTime" showTime key="createTime" />,
+];
+
+export const getOutOrderItemLastColumns = () => [
+ <TextField source="stockOrgName" label="table.field.outStockItem.stockOrgName" key="stockOrgName" />, //鍙戣揣缁勭粐
<ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false} key="updateBy">
<TextField source="nickname" />
</ReferenceField>,
@@ -129,6 +152,14 @@
];
};
+export const buildOutOrderItemFullColumns = () => {
+ return [
+ ...getOutOrderItemFullBaseColumns(),
+ ...getOutOrderItemBaseColumns(),
+ ...getOutOrderItemLastColumns()
+ ];
+};
+
/**
* 鑾峰彇鍔ㄦ�佸瓧娈靛苟鏋勫缓瀹屾暣鍒楅厤缃�
* @returns {Promise<{success: boolean, columns?: Array, msg?: string}>}
@@ -160,3 +191,11 @@
return { success: false, msg: error.message };
}
};
+
+export const fetchOutOrderItemFullColumns = async () => {
+ try {
+ return { success: true, columns: buildOutOrderItemFullColumns() };
+ } catch (error) {
+ return { success: false, msg: error.message };
+ }
+};
--
Gitblit v1.9.1