From 0a612e1fb67222cfcd9dcfe815ae9789b3d9f48b Mon Sep 17 00:00:00 2001 From: verou <857149855@qq.com> Date: 星期四, 27 三月 2025 16:57:56 +0800 Subject: [PATCH] fix:站点字段修改 --- rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx | 28 ++++++++++++++++++++++++---- rsf-admin/src/page/basicInfo/deviceSite/InitModal.jsx | 5 ++--- rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteEdit.jsx | 1 + rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteCreate.jsx | 1 + rsf-admin/src/i18n/zh.js | 2 +- rsf-admin/src/i18n/en.js | 2 +- 6 files changed, 30 insertions(+), 9 deletions(-) diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js index 3615e90..faf39f7 100644 --- a/rsf-admin/src/i18n/en.js +++ b/rsf-admin/src/i18n/en.js @@ -567,7 +567,7 @@ device: "device", deviceCode: "deviceCode", deviceSite: "deviceSite", - flagInitu: "flagInitu", + flagInit: "flagInit", sites: "sites", }, waitPakin: { diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js index 0f284aa..2562f2e 100644 --- a/rsf-admin/src/i18n/zh.js +++ b/rsf-admin/src/i18n/zh.js @@ -573,7 +573,7 @@ device: "璁惧绫诲瀷", deviceCode: "璁惧缂栧彿", deviceSite: "璁惧绔欑偣", - flagInitu: "鏄惁鍒濆鍖�", + flagInit: "鏄惁鍒濆鍖�", sites: "浣滀笟绔欑偣", }, waitPakin: { diff --git a/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteCreate.jsx b/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteCreate.jsx index f391ae9..d2bf4c0 100644 --- a/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteCreate.jsx +++ b/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteCreate.jsx @@ -91,6 +91,7 @@ name="type" validate={[required()]} dictTypeCode="sys_task_type" + multiple /> </Grid> <Grid item xs={6} display="flex" gap={1}> diff --git a/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteEdit.jsx b/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteEdit.jsx index fb9f923..d87e88a 100644 --- a/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteEdit.jsx +++ b/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteEdit.jsx @@ -70,6 +70,7 @@ name="type" validate={[required()]} dictTypeCode="sys_task_type" + multiple /> </Stack> <Stack direction='row' gap={2}> 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} + /> + </> + + ) +} diff --git a/rsf-admin/src/page/basicInfo/deviceSite/InitModal.jsx b/rsf-admin/src/page/basicInfo/deviceSite/InitModal.jsx index 1cc4b81..fbd1634 100644 --- a/rsf-admin/src/page/basicInfo/deviceSite/InitModal.jsx +++ b/rsf-admin/src/page/basicInfo/deviceSite/InitModal.jsx @@ -117,7 +117,6 @@ label={translate("table.field.deviceSite.device")} name="deviceType" dictTypeCode="sys_device_type" - multiple /> </Grid> @@ -151,8 +150,8 @@ <Grid item xs={4}> <SelectInput - label="table.field.deviceSite.flagInitu" - source="flagInitu" + label="table.field.deviceSite.flagInit" + source="flagInit" choices={[ { id: 0, name: '鍚�' }, { id: 1, name: '鏄�' }, -- Gitblit v1.9.1