From 7a33c97d5741a5d8813035ccde1fa801ec30a179 Mon Sep 17 00:00:00 2001 From: verou <857149855@qq.com> Date: 星期二, 25 三月 2025 13:51:43 +0800 Subject: [PATCH] fix:input disabled不能更新bug --- rsf-admin/src/page/basicInfo/loc/LocList.jsx | 107 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 91 insertions(+), 16 deletions(-) diff --git a/rsf-admin/src/page/basicInfo/loc/LocList.jsx b/rsf-admin/src/page/basicInfo/loc/LocList.jsx index 02de0c2..0d2f8e5 100644 --- a/rsf-admin/src/page/basicInfo/loc/LocList.jsx +++ b/rsf-admin/src/page/basicInfo/loc/LocList.jsx @@ -33,18 +33,19 @@ DeleteButton, useRefresh, Button, - useList + useList, } from 'react-admin'; import { Box, Typography, Card, Stack } from '@mui/material'; import { styled } from '@mui/material/styles'; import LocCreate from "./LocCreate"; -import LocPanel from "./LocPanel"; +import BindModal from "./BindModal"; import EmptyData from "../../components/EmptyData"; import DynamicField from "../../components/DynamicField"; import MyCreateButton from "../../components/MyCreateButton"; import MyExportButton from '../../components/MyExportButton'; import InitButton from './InitButton'; import BatchModal from './BatchModal'; +import SubzoneModal from './SubzoneModal'; import PageDrawer from "../../components/PageDrawer"; import MyField from "../../components/MyField"; import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting'; @@ -52,7 +53,8 @@ import DashboardIcon from '@mui/icons-material/Dashboard'; import EditIcon from '@mui/icons-material/Edit'; import request from '@/utils/request'; - +import DiscountIcon from '@mui/icons-material/Discount'; +import LinkIcon from '@mui/icons-material/Link'; const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({ '& .css-1vooibu-MuiSvgIcon-root': { @@ -66,13 +68,41 @@ '& .opt': { width: 200 }, + '& .RaDatagrid-headerCell': { + textAlign: 'left' + }, + '& .RaDatagrid-rowCell': { + textAlign: 'left' + } })); const filters = [ <SearchInput source="condition" alwaysOn />, - <NumberField source="warehouseId$" label="table.field.loc.warehouseId" />, - <NumberField source="areaId$" label="table.field.loc.areaId" />, + <ReferenceInput + source="warehouseId" + label="table.field.loc.warehouseId" + reference="warehouse" + alwaysOn + > + <AutocompleteInput + label="table.field.loc.warehouseId" + optionText="name" + filterToQuery={(val) => ({ name: val })} + /> + </ReferenceInput>, + <ReferenceInput + source="areaId" + label="table.field.loc.areaId" + reference="warehouseAreas" + alwaysOn + > + <AutocompleteInput + label="table.field.loc.areaId" + optionText="name" + filterToQuery={(val) => ({ name: val })} + /> + </ReferenceInput>, <TextInput source="code" label="table.field.loc.code" />, <TextInput source="type" label="table.field.loc.type" />, <TextInput source="name" label="table.field.loc.name" />, @@ -104,14 +134,13 @@ const LocList = () => { const translate = useTranslate(); + const notify = useNotify(); + const refresh = useRefresh(); const [createDialog, setCreateDialog] = useState(false); const [drawerVal, setDrawerVal] = useState(false); - const dynamicFields = [ - { type: 'text', source: 'code', label: '娴嬭瘯1' }, - { type: 'text', source: 'type$', label: '娴嬭瘯2' }, - ]; + return ( <Box display="flex"> <List @@ -140,14 +169,16 @@ > <StyledDatagrid preferenceKey='loc' + align="left" bulkActionButtons={ <> <BatchButton /> + <BindButton /> + <SubzoneButton /> <BulkDeleteButton /> </> } rowClick={() => false} - expand={() => <LocPanel />} omit={['id', 'createTime', 'createBy', 'memo', 'updateTime', 'updateBy']} > <NumberField source="id" /> @@ -175,15 +206,13 @@ <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}> <TextField source="nickname" /> </ReferenceField> - <DateField source="updateTime" label="common.field.updateTime" showTime /> - <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}> + <DateField source="updateTime" label="common.field.updateTime" showTime align="left" /> + <ReferenceField source="createBy" label="common.field.createBy" align="left" reference="user" link={false} sortable={false}> <TextField source="nickname" /> </ReferenceField> - <DateField source="createTime" label="common.field.createTime" showTime /> - <BooleanField source="statusBool" label="common.field.status" sortable={false} /> + <DateField source="createTime" label="common.field.createTime" showTime align="left" /> + <BooleanField source="statusBool" label="common.field.status" sortable={false} align="left" /> <TextField source="memo" label="common.field.memo" sortable={false} /> - - {/* <DynamicField fields={dynamicFields} /> */} <WrapperField cellClassName="opt" label="common.field.opt"> <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} /> @@ -256,4 +285,50 @@ </> ) +} + +const SubzoneButton = () => { + const record = useRecordContext(); + const notify = useNotify(); + const refresh = useRefresh(); + + + const [createDialog, setCreateDialog] = useState(false); + + return ( + <> + <Button onClick={() => setCreateDialog(true)} label={"toolbar.subzone"}> + <DiscountIcon /> + </Button> + + <SubzoneModal + open={createDialog} + setOpen={setCreateDialog} + /> + </> + + ) +} + +const BindButton = () => { + const record = useRecordContext(); + const notify = useNotify(); + const refresh = useRefresh(); + + + const [createDialog, setCreateDialog] = useState(false); + + return ( + <> + <Button onClick={() => setCreateDialog(true)} label={"toolbar.bindmatnr"}> + <LinkIcon /> + </Button> + + <BindModal + open={createDialog} + setOpen={setCreateDialog} + /> + </> + + ) } \ No newline at end of file -- Gitblit v1.9.1