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/asnOrder/AsnOrderItemList.jsx | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
index 94f1c29..9b65ac7 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
@@ -169,17 +169,40 @@
const { isLoading } = useListContext();
const refresh = useRefresh();
useEffect(() => {
- getDynamicFields();
+ getDynamicFields();
}, []);
const getDynamicFields = async () => {
- const result = await fetchInOrderItemColumns();
- if (result.success) {
- setColumns(result.columns);
- } else {
- notify(result.msg);
- }
+ const result = await fetchInOrderItemColumns();
+ if (result.success) {
+ const hiddenSources = [
+ 'splrName',
+ 'businessTime', 'extendFields.[businessTime]',
+ 'wkType', 'extendFields.[wkType]',
+ 'type', 'extendFields.[type]',
+ 'priceUnitId',
+ 'id', 'orderId', 'orderCode', 'poCode', 'poId','wkType',
+ 'type', 'checkType', 'spec', 'model', 'purQty', 'purUnit',
+ 'qrcode', 'trackCode', 'splrCode', 'splrName', 'projectCode',
+ 'supplierId', 'supplierName', 'shipperId',
+ 'updateTime', 'updateBy', 'updateBy$',
+ 'createTime', 'createBy', 'createBy$',
+ ];
+ const columns = result.columns.filter(col => !hiddenSources.includes(col.props.source));
+ setColumns(columns);
+ } else {
+ notify(result.msg);
+ }
}
+
+ // const getDynamicFields = async () => {
+ // const result = await fetchInOrderItemColumns();
+ // if (result.success) {
+ // setColumns(result.columns);
+ // } else {
+ // notify(result.msg);
+ // }
+ // }
return (
<Box sx={{ position: 'relative', minHeight: "60vh", }}>
@@ -199,7 +222,7 @@
preferenceKey='asnOrderItem'
bulkActionButtons={false}
rowClick={(id, resource, record) => false}
- omit={['id', 'orderId', 'orderCode', 'poDetlId', 'matnrId', 'spec', 'model', 'purQty', 'purUnit', 'qrcode', 'trackCode', 'splrCode', 'platWorkCode', 'projectCode']}
+ 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]']}
>
{columns.map((column) => column)}
</StyledDatagrid>}
--
Gitblit v1.9.1