From e7dcf3d8570b6a9b2967ba0b90e982322b9cfaf7 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 11 七月 2025 17:10:23 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-admin/src/page/orders/delivery/DeliveryList.jsx |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/rsf-admin/src/page/orders/delivery/DeliveryList.jsx b/rsf-admin/src/page/orders/delivery/DeliveryList.jsx
index 3124c3a..68ab69c 100644
--- a/rsf-admin/src/page/orders/delivery/DeliveryList.jsx
+++ b/rsf-admin/src/page/orders/delivery/DeliveryList.jsx
@@ -58,6 +58,12 @@
     '& .opt': {
         width: 200
     },
+    '& .MuiTableCell-root': {
+        whiteSpace: 'nowrap',
+        overflow: 'visible',
+        textOverflow: 'unset'
+    }
+
 }));
 
 const filters = [
@@ -122,7 +128,7 @@
                     rowClick={(id, resource, record) => false}
                     expand={false}
                     expandSingle={true}
-                    omit={['id', 'createTime', 'createBy', 'platId', 'platCode', 'memo', 'startTime','qty', 'endTime', 'updateBy', 'createTime']}
+                    omit={['id', 'createTime', 'createBy', 'platId', 'platCode', 'memo', 'startTime', 'endTime', 'updateBy', 'createTime','createBy$']}
                 >
                     <NumberField source="id" />
                     <TextField source="code" label="table.field.delivery.code" />
@@ -131,7 +137,7 @@
                     <TextField source="wkType$" label="table.field.delivery.wkType" />
                     <TextField source="source" label="table.field.delivery.source" />
                     <NumberField source="anfme" label="table.field.delivery.anfme" />
-                    <NumberField source="workQty" label="table.field.delivery.qty" />
+                    <NumberField source="workQty" label="table.field.delivery.workQty" />
                     <NumberField source="qty" label="table.field.delivery.qty" />
                     <TextField source="platCode" label="table.field.delivery.platCode" />
                     <DateField source="startTime" label="table.field.delivery.startTime" showTime />

--
Gitblit v1.9.1