From 1e1cedc70758a7c17ccf63ea11d1db70c409aa66 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期五, 05 九月 2025 09:45:15 +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 | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/companys/CompanysList.jsx b/rsf-admin/src/page/basicInfo/companys/CompanysList.jsx
index f752537..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 = [
@@ -74,7 +80,7 @@
{ id: 'customer', name: 'common.field.customer' },
{ id: 'supplier', name: 'common.field.supplier' },
{ id: 'partners', name: 'common.field.partners' }
- ]} />,
+ ]} alwaysOn />,
<TextInput source="contact" label="table.field.companys.contact" />,
<TextInput source="tel" label="table.field.companys.tel" />,
<TextInput source="email" label="table.field.companys.email" />,
@@ -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