From 0d3a5be1512815a38f37ae81e7d9fc0948fd3f16 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期二, 25 三月 2025 13:54:57 +0800
Subject: [PATCH] 1

---
 rsf-admin/src/page/basicInfo/companys/CompanysList.jsx |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/rsf-admin/src/page/basicInfo/companys/CompanysList.jsx b/rsf-admin/src/page/basicInfo/companys/CompanysList.jsx
index dd3561b..92de173 100644
--- a/rsf-admin/src/page/basicInfo/companys/CompanysList.jsx
+++ b/rsf-admin/src/page/basicInfo/companys/CompanysList.jsx
@@ -40,7 +40,7 @@
 import MyCreateButton from "../../components/MyCreateButton";
 import MyExportButton from '../../components/MyExportButton';
 import PageDrawer from "../../components/PageDrawer";
-import MyField from "../../components/MyField";
+import DictField from "../../components/DictField";
 import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
 import * as Common from '@/utils/common';
 
@@ -60,8 +60,6 @@
 
 const filters = [
     <SearchInput source="condition" alwaysOn />,
-    <DateInput label='common.time.after' source="timeStart" alwaysOn />,
-    <DateInput label='common.time.before' source="timeEnd" alwaysOn />,
 
     <TextInput source="code" label="table.field.companys.code" />,
     <TextInput source="name" label="table.field.companys.name" />,
@@ -103,7 +101,7 @@
                         theme.transitions.create(['all'], {
                             duration: theme.transitions.duration.enteringScreen,
                         }),
-                    marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
+                    marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
                 }}
                 title={"menu.companys"}
                 empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
@@ -123,16 +121,14 @@
                     preferenceKey='companys'
                     bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
                     rowClick={(id, resource, record) => false}
-                    expand={() => <CompanysPanel />}
-                    expandSingle={true}
                     omit={['id', 'createTime', 'createBy', 'memo']}
                 >
                     <NumberField source="id" />
-                    <TextField source="code" label="table.field.companys.code" />
+                    {/* <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" />
-                    <TextField source="type" label="table.field.companys.type" />
+                    <DictField source="type" label="table.field.companys.type" dictTypeCode={'sys_companys_type'} />
                     <TextField source="contact" label="table.field.companys.contact" />
                     <TextField source="tel" label="table.field.companys.tel" />
                     <TextField source="email" label="table.field.companys.email" />

--
Gitblit v1.9.1