From 10958d1143d59916185e73da79669c5f66a8e849 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期三, 04 二月 2026 15:49:24 +0800
Subject: [PATCH] #入库订单明细
---
rsf-admin/src/page/orders/config/orderItemColumns.jsx | 85 +++++++++++++++++++-----------------------
1 files changed, 39 insertions(+), 46 deletions(-)
diff --git a/rsf-admin/src/page/orders/config/orderItemColumns.jsx b/rsf-admin/src/page/orders/config/orderItemColumns.jsx
index 4b399d7..2e8e564 100644
--- a/rsf-admin/src/page/orders/config/orderItemColumns.jsx
+++ b/rsf-admin/src/page/orders/config/orderItemColumns.jsx
@@ -27,25 +27,30 @@
);
};
+export const getInOrderItemFullBaseColumns = () => [
+ <TextField source="poCode" label="table.field.asnOrder.poCode" key="poCode" />,
+ <TextField source="wkType$" label="table.field.asnOrder.wkType" key="wkType$" />
+];
+
/**
* 鑾峰彇鍑哄簱璁㈠崟鏄庣粏鐨勫熀纭�鍒楅厤缃�
* @returns {Array} 鍩虹鍒楁暟缁�
*/
export const getOutOrderItemBaseColumns = () => [
<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="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="sourceWareHouseId" label="table.field.asnOrderItem.sourceWareHouseId" key="sourceWareHouseId" />, //璋冨嚭浠�
+ <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" />, //璋冨嚭浠�
];
/**
@@ -69,21 +74,7 @@
<TextField source="targetWarehouseId" label="table.field.asnOrderItem.targetWarehouseId" key="targetWarehouseId" />, //寤鸿鐩爣浠�
];
-/**
- * 鑾峰彇鍔ㄦ�佹墿灞曞瓧娈靛垪
- * @param {Array} fieldsData - 鍔ㄦ�佸瓧娈垫暟鎹�
- * @returns {Array} 鍔ㄦ�佸瓧娈靛垪鏁扮粍
- */
-export const getExtendFieldColumns = (fieldsData) => {
- return fieldsData.map(el => (
- <TextField
- key={el.fields}
- source={`extendFields.[${el.fields}]`}
- label={el.fieldsAlise}
- sortable={false}
- />
- ));
-};
+
/**
* 鑾峰彇璁㈠崟鏄庣粏鐨勫熬閮ㄥ垪閰嶇疆锛堟椂闂村拰鎿嶄綔浜轰俊鎭級
@@ -102,26 +93,30 @@
/**
* 缁勫悎鍏ュ簱璁㈠崟鏄庣粏鎵�鏈夊垪閰嶇疆
- * @param {Array} extendFieldsData - 鍔ㄦ�佹墿灞曞瓧娈垫暟鎹�
* @returns {Array} 瀹屾暣鐨勫垪閰嶇疆鏁扮粍
*/
-export const buildInOrderItemColumns = (extendFieldsData = []) => {
+export const buildInOrderItemColumns = () => {
return [
...getInOrderItemBaseColumns(),
- ...getExtendFieldColumns(extendFieldsData),
+ ...getLastColumns()
+ ];
+};
+
+export const buildInOrderItemFullColumns = () => {
+ return [
+ ...getInOrderItemFullBaseColumns(),
+ ...getInOrderItemBaseColumns(),
...getLastColumns()
];
};
/**
* 缁勫悎鍑哄簱璁㈠崟鏄庣粏鎵�鏈夊垪閰嶇疆
- * @param {Array} extendFieldsData - 鍔ㄦ�佹墿灞曞瓧娈垫暟鎹�
* @returns {Array} 瀹屾暣鐨勫垪閰嶇疆鏁扮粍
*/
-export const buildOutOrderItemColumns = (extendFieldsData = []) => {
+export const buildOutOrderItemColumns = () => {
return [
...getOutOrderItemBaseColumns(),
- ...getExtendFieldColumns(extendFieldsData),
...getLastColumns()
];
};
@@ -132,12 +127,7 @@
*/
export const fetchInOrderItemColumns = async () => {
try {
- const { data: { code, data, msg } } = await request.get("/fields/enable/list");
- if (code == 200) {
- return { success: true, columns: buildInOrderItemColumns(data) };
- } else {
- return { success: false, msg };
- }
+ return { success: true, columns: buildInOrderItemColumns() };
} catch (error) {
return { success: false, msg: error.message };
}
@@ -149,12 +139,15 @@
*/
export const fetchOutOrderItemColumns = async () => {
try {
- const { data: { code, data, msg } } = await request.get("/fields/enable/list");
- if (code == 200) {
- return { success: true, columns: buildOutOrderItemColumns(data) };
- } else {
- return { success: false, msg };
- }
+ return { success: true, columns: buildOutOrderItemColumns() };
+ } catch (error) {
+ return { success: false, msg: error.message };
+ }
+};
+
+export const fetchInOrderItemFullColumns = async () => {
+ try {
+ return { success: true, columns: buildInOrderItemFullColumns() };
} catch (error) {
return { success: false, msg: error.message };
}
--
Gitblit v1.9.1