From e81a3446617207688cd60fe5b1717a18c5cb9e32 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 26 五月 2025 18:14:36 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx b/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx
index 706513c..7fa227c 100644
--- a/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx
+++ b/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx
@@ -136,8 +136,7 @@
actions={(
<TopToolbar>
<FilterButton />
- <InitButton />
- <MyCreateButton onClick={() => { setCreateDialog(true) }} />
+ <InitButton />
<SelectColumnsButton preferenceKey='deviceSite' />
<MyExportButton />
</TopToolbar>
@@ -157,7 +156,7 @@
<TextField source="target" label="table.field.deviceSite.target" />
<TextField source="label" label="table.field.deviceSite.label" />
<TextField source="device$" label="table.field.deviceSite.device" />
- <TextField source="deviceCode" label="table.field.deviceSite.deviceCode" />
+ <TextField source="channel" label="table.field.deviceSite.channel" />
<TextField source="deviceSite" label="table.field.deviceSite.deviceSite" />
<ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
<TextField source="nickname" />
--
Gitblit v1.9.1