From 4d0c90054372b6fa64e99ad4bbc5f302d2b9f725 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 27 三月 2025 17:09:44 +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 | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx b/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx
index 6658540..21321b5 100644
--- a/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx
+++ b/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx
@@ -45,6 +45,7 @@
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
import InitModal from "./InitModal";
+import CabinIcon from '@mui/icons-material/Cabin';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -135,6 +136,7 @@
actions={(
<TopToolbar>
<FilterButton />
+ <InitButton />
<MyCreateButton onClick={() => { setCreateDialog(true) }} />
<SelectColumnsButton preferenceKey='deviceSite' />
<MyExportButton />
@@ -146,17 +148,15 @@
preferenceKey='deviceSite'
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
rowClick={(id, resource, record) => false}
- expand={() => <DeviceSitePanel />}
- expandSingle={true}
omit={['id', 'createTime', 'createBy', 'memo']}
>
<NumberField source="id" />
<TextField source="name" label="table.field.deviceSite.name" />
- <NumberField source="type" label="table.field.deviceSite.type" />
+ <NumberField source="type$" label="table.field.deviceSite.type" />
<TextField source="site" label="table.field.deviceSite.site" />
<TextField source="wcsCode" label="table.field.deviceSite.wcsCode" />
<TextField source="label" label="table.field.deviceSite.label" />
- <TextField source="device" label="table.field.deviceSite.device" />
+ <TextField source="device$" label="table.field.deviceSite.device" />
<TextField source="deviceCode" label="table.field.deviceSite.deviceCode" />
<TextField source="deviceSite" label="table.field.deviceSite.deviceSite" />
@@ -196,3 +196,23 @@
}
export default DeviceSiteList;
+
+const InitButton = () => {
+ const record = useRecordContext();
+ const notify = useNotify();
+
+ const [createDialog, setCreateDialog] = useState(false);
+
+ return (
+ <>
+ <Button onClick={() => setCreateDialog(true)} label={"toolbar.siteInit"}>
+ <CabinIcon />
+ </Button>
+ <InitModal
+ open={createDialog}
+ setOpen={setCreateDialog}
+ />
+ </>
+
+ )
+}
--
Gitblit v1.9.1