From 8ce2fc9e420f68e07512b9addaf514a09effb4a7 Mon Sep 17 00:00:00 2001
From: lbq <1065079612@qq.com>
Date: 星期三, 25 二月 2026 13:45:02 +0800
Subject: [PATCH] 优化出库明细界面
---
rsf-admin/src/page/orders/config/orderItemColumns.jsx | 77 ++++++++++++++++++++++++++------------
1 files changed, 52 insertions(+), 25 deletions(-)
diff --git a/rsf-admin/src/page/orders/config/orderItemColumns.jsx b/rsf-admin/src/page/orders/config/orderItemColumns.jsx
index 6448da6..f301bde 100644
--- a/rsf-admin/src/page/orders/config/orderItemColumns.jsx
+++ b/rsf-admin/src/page/orders/config/orderItemColumns.jsx
@@ -30,14 +30,44 @@
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 getInOrderItemBaseColumns = () => [
+ <NumberField source="id" key="id" />, // id
+ // <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="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="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" />,
];
/**
@@ -46,10 +76,10 @@
*/
export const getOutOrderItemBaseColumns = () => [
<NumberField source="id" key="id" />, // id
- <TextField source="orderCode" label="table.field.outStockItem.orderCode" key="orderCode" />, // 璁㈠崟鍙�
+ // <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="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} />, //鐗╂枡鍚嶇О
@@ -61,26 +91,7 @@
<TextField source="sourceWarehouseId" label="table.field.outStockItem.sourceWarehouseId" key="sourceWarehouseId" />, //璋冨嚭浠�
];
-/**
- * 鑾峰彇鍏ュ簱璁㈠崟鏄庣粏鐨勫熀纭�鍒楅厤缃�
- * @returns {Array} 鍩虹鍒楁暟缁�
- */
-export const getInOrderItemBaseColumns = () => [
- <NumberField source="id" key="id" />, // id
- <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="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="targetWarehouseId" label="table.field.asnOrderItem.targetWarehouseId" key="targetWarehouseId" />, //寤鸿鐩爣浠�
-];
+
@@ -129,6 +140,14 @@
];
};
+export const buildOutOrderItemFullColumns = () => {
+ return [
+ ...getOutOrderItemFullBaseColumns(),
+ ...getOutOrderItemBaseColumns(),
+ ...getLastColumns()
+ ];
+};
+
/**
* 鑾峰彇鍔ㄦ�佸瓧娈靛苟鏋勫缓瀹屾暣鍒楅厤缃�
* @returns {Promise<{success: boolean, columns?: Array, msg?: string}>}
@@ -160,3 +179,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