From f83d2ae89575240b4d467ecc43fe131f6bc63708 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 06 三月 2026 16:45:06 +0800
Subject: [PATCH] #站点区域

---
 rsf-admin/src/page/orders/config/orderItemColumns.jsx |  150 +++++++++++++++++++++++++++++++------------------
 1 files changed, 95 insertions(+), 55 deletions(-)

diff --git a/rsf-admin/src/page/orders/config/orderItemColumns.jsx b/rsf-admin/src/page/orders/config/orderItemColumns.jsx
index 4b399d7..6b375d1 100644
--- a/rsf-admin/src/page/orders/config/orderItemColumns.jsx
+++ b/rsf-admin/src/page/orders/config/orderItemColumns.jsx
@@ -27,25 +27,15 @@
     );
 };
 
-/**
- * 鑾峰彇鍑哄簱璁㈠崟鏄庣粏鐨勫熀纭�鍒楅厤缃�
- * @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" />, //璋冨嚭浠�
+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" />
 ];
 
 /**
@@ -54,36 +44,56 @@
  */
 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="splrBatch" label="table.field.asnOrderItem.splrBatch" key="splrBatch" />, //鎵规
+    <TextField source="batch" label="table.field.asnOrderItem.splrBatch" key="batch" />, //鎵规
     <TextField source="spec" label="table.field.asnOrderItem.spec" key="spec" />, //瑙勬牸
-    <TextField source="purUnit" label="table.field.asnOrderItem.unit" key="purUnit" />, //鍗曚綅
     <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" />,
+];
+
 /**
- * 鑾峰彇鍔ㄦ�佹墿灞曞瓧娈靛垪
- * @param {Array} fieldsData - 鍔ㄦ�佸瓧娈垫暟鎹�
- * @returns {Array} 鍔ㄦ�佸瓧娈靛垪鏁扮粍
+ * 鑾峰彇鍑哄簱璁㈠崟鏄庣粏鐨勫熀纭�鍒楅厤缃�
+ * @returns {Array} 鍩虹鍒楁暟缁�
  */
-export const getExtendFieldColumns = (fieldsData) => {
-    return fieldsData.map(el => (
-        <TextField
-            key={el.fields}
-            source={`extendFields.[${el.fields}]`}
-            label={el.fieldsAlise}
-            sortable={false}
-        />
-    ));
-};
+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" />, //璋冨嚭浠�
+];
+
+
+
+
 
 /**
  * 鑾峰彇璁㈠崟鏄庣粏鐨勫熬閮ㄥ垪閰嶇疆锛堟椂闂村拰鎿嶄綔浜轰俊鎭級
@@ -100,29 +110,53 @@
     <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>,
+    <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" />,
+];
+
 /**
  * 缁勫悎鍏ュ簱璁㈠崟鏄庣粏鎵�鏈夊垪閰嶇疆
- * @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()
+    ];
+};
+
+export const buildOutOrderItemFullColumns = () => {
+    return [
+        ...getOutOrderItemFullBaseColumns(),
+        ...getOutOrderItemBaseColumns(),
+        ...getOutOrderItemLastColumns()
     ];
 };
 
@@ -132,12 +166,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 +178,23 @@
  */
 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 };
+    }
+};
+
+export const fetchOutOrderItemFullColumns = async () => {
+    try {
+        return { success: true, columns: buildOutOrderItemFullColumns() };
     } catch (error) {
         return { success: false, msg: error.message };
     }

--
Gitblit v1.9.1