From 1dbfb930e943fede7adfffea8fd9977d894a903b Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期五, 23 一月 2026 08:57:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

---
 rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx b/rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx
index d8719bf..7e9a946 100644
--- a/rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx
@@ -149,7 +149,14 @@
     const getDynamicFields = async () => {
         const result = await fetchInOrderItemColumns();
         if (result.success) {
-            setColumns(result.columns);
+            const hiddenSources = [
+                'splrName',
+                'businessTime', 'extendFields.[businessTime]',
+                'wkType', 'extendFields.[wkType]',
+                'type', 'extendFields.[type]'
+            ];
+            const columns = result.columns.filter(col => !hiddenSources.includes(col.props.source));
+            setColumns(columns);
         } else {
             notify(result.msg);
         }
@@ -173,7 +180,8 @@
                     preferenceKey='asnOrderItem'
                     bulkActionButtons={false}
                     rowClick={(id, resource, record) => false}
-                    omit={['id', 'orderId', 'poDetlId', 'matnrId', 'spec', 'model', 'purQty', 'purUnit', 'qrcode', 'trackCode', 'splrCode', 'platWorkCode', 'projectCode', 'createBy', 'createTime']}
+                    omit={['id', 'orderId', 'orderCode', 'poCode', 'poId', 'wkType', 'type', 'checkType', 'spec', 'model', 'purQty', 'purUnit', 'qrcode', 'trackCode', 'splrCode', 'splrName', 'projectCode', 'supplierId', 'supplierName', 'priceUnitId', 'shipperId', 'businessTime', 'extendFields.[businessTime]', 'extendFields.[wkType]', 'extendFields.[type]']}
+                    // omit={['id', 'orderId', 'poDetlId', 'matnrId', 'spec', 'model', 'purQty', 'purUnit', 'qrcode', 'trackCode', 'splrCode', 'platWorkCode', 'projectCode', 'createBy', 'createTime']}
                 >
                     {columns.map((column) => column)}
                 </StyledDatagrid>}

--
Gitblit v1.9.1