From 6a4497d2fcd015f73856ce0f75e2c2832362c88f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期日, 04 五月 2025 16:54:33 +0800
Subject: [PATCH] 5.4问题修复

---
 rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
index e2ef514..5ac578b 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
@@ -98,6 +98,7 @@
   const [editDialog, setEditDialog] = useState(false);
   const [drawerVal, setDrawerVal] = useState(false);
   const [select, setSelect] = useState({});
+  const result = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_rule_type')) || [];
   const asnId = useGetRecordId();
   const { data: dicts, isPending, error } = useGetOne('asnOrder', { id: asnId });
 
@@ -115,7 +116,7 @@
             marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
           }}
           title={"menu.asnOrderItem"}
-          empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
+          empty={false}
           filter={{ asnId: asnId, deleted: 0 }}
           filters={filters}
           sort={{ field: "create_time", order: "desc" }}
@@ -136,7 +137,7 @@
               setSelect(record)
               setEditDialog(true)
             }}
-             omit={['id', 'createTime', 'createBy', 'memo', 'poDetlId', 'matnrId', 'asnId']}
+            omit={['id', 'createTime', 'purQty', 'purUnit', 'poDetlCode', 'createBy', 'memo','model', 'packName','splrCode', 'qrcode', 'poDetlId', 'matnrId', 'asnId']}
           >
             <NumberField source="id" />
             <NumberField source="asnId" label="table.field.asnOrderItem.asnId" />
@@ -146,21 +147,29 @@
             <TextField source="matnrId" label="table.field.asnOrderItem.matnrId" />
             <TextField source="matnrCode" label="table.field.asnOrderItem.matnrCode" />
             <TextField source="maktx" label="table.field.asnOrderItem.maktx" />
+            <TextField source="splrBatch" label="table.field.asnOrderItem.splrBatch" />
+            <TextField source="spec" label="table.field.asnOrderItem.spec" />
+            <TextField source="model" label="table.field.asnOrderItem.model" />
             <NumberField source="anfme" label="table.field.asnOrderItem.anfme" />
             <TextField source="stockUnit" label="table.field.asnOrderItem.stockUnit" />
             <NumberField source="purQty" label="table.field.asnOrderItem.purQty" />
             <TextField source="purUnit" label="table.field.asnOrderItem.purUnit" />
             <NumberField source="qty" label="table.field.asnOrderItem.qty" />
+            <TextField source="isptResult$" label="table.field.asnOrderItem.isptResult" />
             <TextField source="splrCode" label="table.field.asnOrderItem.splrCode" />
             <TextField source="splrName" label="table.field.asnOrderItem.splrName" />
             <TextField source="qrcode" label="table.field.asnOrderItem.qrcode" />
             <TextField source="trackCode" label="table.field.asnOrderItem.barcode" />
             <TextField source="packName" label="table.field.asnOrderItem.packName" />
-            <TextField source="updateBy$" label="common.field.updateBy" />
             <DateField source="updateTime" label="common.field.updateTime" showTime />
-            <TextField source="createBy$" label="common.field.createBy" />
+            <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
+              <TextField source="nickname" />
+            </ReferenceField>
+            <DateField source="updateTime" label="common.field.updateTime" showTime />
+            <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
+              <TextField source="nickname" />
+            </ReferenceField>
             <DateField source="createTime" label="common.field.createTime" showTime />
-            <BooleanField source="status$" label="common.field.status" sortable={false} />
             <TextField source="memo" label="common.field.memo" sortable={false} />
           </StyledDatagrid>
         </List>

--
Gitblit v1.9.1