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/basicInfo/companys/CompanysList.jsx |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/rsf-admin/src/page/basicInfo/companys/CompanysList.jsx b/rsf-admin/src/page/basicInfo/companys/CompanysList.jsx
index b83a522..069abe4 100644
--- a/rsf-admin/src/page/basicInfo/companys/CompanysList.jsx
+++ b/rsf-admin/src/page/basicInfo/companys/CompanysList.jsx
@@ -57,6 +57,12 @@
     '& .opt': {
         width: 200
     },
+    
+    '& .MuiTableCell-root': {
+        whiteSpace: 'nowrap',
+        overflow: 'visible',
+        textOverflow: 'unset'
+    },
 }));
 
 const filters = [
@@ -128,11 +134,12 @@
                     preferenceKey='companys'
                     bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
                     rowClick={(id, resource, record) => false}
-                    omit={['id', 'createTime', 'createBy', 'memo']}
+                    omit={['id', 'createTime', 'createBy', 'memo','createBy$','updateBy$','statusBool','province','city','address']}
                 >
                     <NumberField source="id" />
-                    <TextField source="name" label="table.field.companys.name" />
                     <TextField source="code" label="table.field.companys.code" />
+                    <TextField source="name" label="table.field.companys.name" />
+                    
                     <TextField source="nameEn" label="table.field.companys.nameEn" />
                     <TextField source="breifCode" label="table.field.companys.breifCode" />
                     <DictField source="type" label="table.field.companys.type" dictTypeCode={'sys_companys_type'} />

--
Gitblit v1.9.1