From 210988b56322931b9e0c91194f5c50f84b007688 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 20 三月 2025 14:21:34 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-admin/src/page/basicInfo/companys/CompanysList.jsx | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/companys/CompanysList.jsx b/rsf-admin/src/page/basicInfo/companys/CompanysList.jsx
index e13081a..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';
@@ -121,8 +121,6 @@
preferenceKey='companys'
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
rowClick={(id, resource, record) => false}
- expand={() => <CompanysPanel />}
- expandSingle={true}
omit={['id', 'createTime', 'createBy', 'memo']}
>
<NumberField source="id" />
@@ -130,7 +128,7 @@
<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