From 45b08e865615e1a6dcc152758c5c7d197ce6ea5a Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期四, 10 四月 2025 12:34:22 +0800 Subject: [PATCH] 组拖档历史修改 --- /dev/null | 18 ---- rsf-admin/src/page/waitPakinLog/WaitPakinItemLogList.jsx | 32 ++------ rsf-admin/src/page/system/serialRule/SerialRuleItemList.jsx | 7 - rsf-admin/src/page/waitPakinLog/WaitPakinLogEdit.jsx | 125 ++++++++++++++----------------- rsf-admin/src/page/ResourceContent.js | 6 rsf-admin/src/page/waitPakinLog/WaitPakinLogList.jsx | 16 --- 6 files changed, 71 insertions(+), 133 deletions(-) diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js index ed01cd9..0861b45 100644 --- a/rsf-admin/src/page/ResourceContent.js +++ b/rsf-admin/src/page/ResourceContent.js @@ -43,7 +43,7 @@ import waitPakin from './waitPakin'; import waitPakinItem from './waitPakinItem'; import waitPakinLog from './waitPakinLog'; -import waitPakinItemLog from './waitPakinItemLog'; +// import waitPakinItemLog from './waitPakinItemLog'; import asnOrderLog from './asnOrderLog'; // import asnOrderItemLog from './asnOrderItemLog'; import task from './task'; @@ -136,8 +136,8 @@ return waitPakinItem; case 'waitPakinLog': return waitPakinLog; - case 'waitPakinItemLog': - return waitPakinItemLog; + // case 'waitPakinItemLog': + // return waitPakinItemLog; case 'task': return task; // case 'taskItem': diff --git a/rsf-admin/src/page/system/serialRule/SerialRuleItemList.jsx b/rsf-admin/src/page/system/serialRule/SerialRuleItemList.jsx index 724835d..c99a1bc 100644 --- a/rsf-admin/src/page/system/serialRule/SerialRuleItemList.jsx +++ b/rsf-admin/src/page/system/serialRule/SerialRuleItemList.jsx @@ -72,17 +72,12 @@ <SearchInput source="condition" alwaysOn />, <DateInput label="common.time.after" source="timeStart" />, <DateInput label="common.time.before" source="timeEnd" />, - <NumberInput source="ruleId" label="table.field.serialRuleItem.ruleId" />, <TextInput source="wkType" label="table.field.serialRuleItem.wkType" />, - <TextInput - source="feildValue" - label="table.field.serialRuleItem.feildValue" - />, + <TextInput source="feildValue" label="table.field.serialRuleItem.feildValue" />, <NumberInput source="len" label="table.field.serialRuleItem.len" />, <NumberInput source="lenStr" label="table.field.serialRuleItem.lenStr" />, <NumberInput source="sort" label="table.field.serialRuleItem.sort" />, - <TextInput label="common.field.memo" source="memo" />, <SelectInput label="common.field.status" diff --git a/rsf-admin/src/page/waitPakinItemLog/WaitPakinItemLogCreate.jsx b/rsf-admin/src/page/waitPakinItemLog/WaitPakinItemLogCreate.jsx deleted file mode 100644 index 0ee7ce6..0000000 --- a/rsf-admin/src/page/waitPakinItemLog/WaitPakinItemLogCreate.jsx +++ /dev/null @@ -1,220 +0,0 @@ -import React, { useState, useRef, useEffect, useMemo } from "react"; -import { - CreateBase, - useTranslate, - TextInput, - NumberInput, - BooleanInput, - DateInput, - SaveButton, - SelectInput, - ReferenceInput, - ReferenceArrayInput, - AutocompleteInput, - Toolbar, - required, - useDataProvider, - useNotify, - Form, - useCreateController, -} from 'react-admin'; -import { - Dialog, - DialogActions, - DialogContent, - DialogTitle, - Stack, - Grid, - Box, -} from '@mui/material'; -import DialogCloseButton from "../components/DialogCloseButton"; -import StatusSelectInput from "../components/StatusSelectInput"; -import MemoInput from "../components/MemoInput"; - -const WaitPakinItemLogCreate = (props) => { - const { open, setOpen } = props; - - const translate = useTranslate(); - const notify = useNotify(); - - const handleClose = (event, reason) => { - if (reason !== "backdropClick") { - setOpen(false); - } - }; - - const handleSuccess = async (data) => { - setOpen(false); - notify('common.response.success'); - }; - - const handleError = async (error) => { - notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } }); - }; - - return ( - <> - <CreateBase - record={{}} - transform={(data) => { - return data; - }} - mutationOptions={{ onSuccess: handleSuccess, onError: handleError }} - > - <Dialog - open={open} - onClose={handleClose} - aria-labelledby="form-dialog-title" - fullWidth - disableRestoreFocus - maxWidth="md" // 'xs' | 'sm' | 'md' | 'lg' | 'xl' - > - <Form> - <DialogTitle id="form-dialog-title" sx={{ - position: 'sticky', - top: 0, - backgroundColor: 'background.paper', - zIndex: 1000 - }} - > - {translate('create.title')} - <Box sx={{ position: 'absolute', top: 8, right: 8, zIndex: 1001 }}> - <DialogCloseButton onClose={handleClose} /> - </Box> - </DialogTitle> - <DialogContent sx={{ mt: 2 }}> - <Grid container rowSpacing={2} columnSpacing={2}> - <Grid item xs={6} display="flex" gap={1}> - <ReferenceInput - source="pakinId" - reference="waitPakin" - autoFocus - > - <AutocompleteInput - label="table.field.waitPakinItemLog.pakinId" - optionText="id" - filterToQuery={(val) => ({ id: val })} - /> - </ReferenceInput> - </Grid> - <Grid item xs={6} display="flex" gap={1}> - <NumberInput - label="table.field.waitPakinItemLog.pakinItemId" - source="pakinItemId" - /> - </Grid> - <Grid item xs={6} display="flex" gap={1}> - <NumberInput - label="table.field.waitPakinItemLog.asnId" - source="asnId" - /> - </Grid> - <Grid item xs={6} display="flex" gap={1}> - <TextInput - label="table.field.waitPakinItemLog.asnCode" - source="asnCode" - parse={v => v} - /> - </Grid> - <Grid item xs={6} display="flex" gap={1}> - <NumberInput - label="table.field.waitPakinItemLog.asnItemId" - source="asnItemId" - /> - </Grid> - <Grid item xs={6} display="flex" gap={1}> - <TextInput - label="table.field.waitPakinItemLog.trackCode" - source="trackCode" - parse={v => v} - /> - </Grid> - <Grid item xs={6} display="flex" gap={1}> - <TextInput - label="table.field.waitPakinItemLog.maktx" - source="maktx" - parse={v => v} - /> - </Grid> - <Grid item xs={6} display="flex" gap={1}> - <ReferenceInput - source="matnrId" - reference="matnr" - > - <AutocompleteInput - label="table.field.waitPakinItemLog.matnrId" - optionText="unit" - filterToQuery={(val) => ({ unit: val })} - /> - </ReferenceInput> - </Grid> - <Grid item xs={6} display="flex" gap={1}> - <TextInput - label="table.field.waitPakinItemLog.matnrCode" - source="matnrCode" - parse={v => v} - /> - </Grid> - <Grid item xs={6} display="flex" gap={1}> - <NumberInput - label="table.field.waitPakinItemLog.anfme" - source="anfme" - /> - </Grid> - <Grid item xs={6} display="flex" gap={1}> - <NumberInput - label="table.field.waitPakinItemLog.workQty" - source="workQty" - /> - </Grid> - <Grid item xs={6} display="flex" gap={1}> - <TextInput - label="table.field.waitPakinItemLog.unit" - source="unit" - parse={v => v} - /> - </Grid> - <Grid item xs={6} display="flex" gap={1}> - <TextInput - label="table.field.waitPakinItemLog.fieldsIndex" - source="fieldsIndex" - parse={v => v} - /> - </Grid> - <Grid item xs={6} display="flex" gap={1}> - <NumberInput - label="table.field.waitPakinItemLog.qty" - source="qty" - /> - </Grid> - <Grid item xs={6} display="flex" gap={1}> - <TextInput - label="table.field.waitPakinItemLog.batch" - source="batch" - parse={v => v} - /> - </Grid> - - <Grid item xs={6} display="flex" gap={1}> - <StatusSelectInput /> - </Grid> - <Grid item xs={12} display="flex" gap={1}> - <Stack direction="column" spacing={1} width={'100%'}> - <MemoInput /> - </Stack> - </Grid> - </Grid> - </DialogContent> - <DialogActions sx={{ position: 'sticky', bottom: 0, backgroundColor: 'background.paper', zIndex: 1000 }}> - <Toolbar sx={{ width: '100%', justifyContent: 'space-between' }} > - <SaveButton /> - </Toolbar> - </DialogActions> - </Form> - </Dialog> - </CreateBase> - </> - ) -} - -export default WaitPakinItemLogCreate; diff --git a/rsf-admin/src/page/waitPakinItemLog/WaitPakinItemLogEdit.jsx b/rsf-admin/src/page/waitPakinItemLog/WaitPakinItemLogEdit.jsx deleted file mode 100644 index 80599c0..0000000 --- a/rsf-admin/src/page/waitPakinItemLog/WaitPakinItemLogEdit.jsx +++ /dev/null @@ -1,194 +0,0 @@ -import React, { useState, useRef, useEffect, useMemo } from "react"; -import { - Edit, - SimpleForm, - FormDataConsumer, - useTranslate, - TextInput, - NumberInput, - BooleanInput, - DateInput, - SelectInput, - ReferenceInput, - ReferenceArrayInput, - AutocompleteInput, - SaveButton, - Toolbar, - Labeled, - NumberField, - required, - useRecordContext, - DeleteButton, -} from 'react-admin'; -import { useWatch, useFormContext } from "react-hook-form"; -import { Stack, Grid, Box, Typography } from '@mui/material'; -import * as Common from '@/utils/common'; -import { EDIT_MODE, REFERENCE_INPUT_PAGESIZE } from '@/config/setting'; -import EditBaseAside from "../components/EditBaseAside"; -import CustomerTopToolBar from "../components/EditTopToolBar"; -import MemoInput from "../components/MemoInput"; -import StatusSelectInput from "../components/StatusSelectInput"; - -const FormToolbar = () => { - const { getValues } = useFormContext(); - - return ( - <Toolbar sx={{ justifyContent: 'space-between' }}> - <SaveButton /> - <DeleteButton mutationMode="optimistic" /> - </Toolbar> - ) -} - -const WaitPakinItemLogEdit = () => { - const translate = useTranslate(); - - return ( - <Edit - redirect="list" - mutationMode={EDIT_MODE} - actions={<CustomerTopToolBar />} - aside={<EditBaseAside />} - > - <SimpleForm - shouldUnregister - warnWhenUnsavedChanges - toolbar={<FormToolbar />} - mode="onTouched" - defaultValues={{}} - // validate={(values) => { }} - > - <Grid container width={{ xs: '100%', xl: '80%' }} rowSpacing={3} columnSpacing={3}> - <Grid item xs={12} md={8}> - <Typography variant="h6" gutterBottom> - {translate('common.edit.title.main')} - </Typography> - <Stack direction='row' gap={2}> - <ReferenceInput - source="pakinId" - reference="waitPakin" - perPage={REFERENCE_INPUT_PAGESIZE} - autoFocus - > - <AutocompleteInput - label="table.field.waitPakinItemLog.pakinId" - optionText="id" - filterToQuery={(val) => ({ id: val })} - /> - </ReferenceInput> - </Stack> - <Stack direction='row' gap={2}> - <NumberInput - label="table.field.waitPakinItemLog.pakinItemId" - source="pakinItemId" - /> - </Stack> - <Stack direction='row' gap={2}> - <NumberInput - label="table.field.waitPakinItemLog.asnId" - source="asnId" - /> - </Stack> - <Stack direction='row' gap={2}> - <TextInput - label="table.field.waitPakinItemLog.asnCode" - source="asnCode" - parse={v => v} - /> - </Stack> - <Stack direction='row' gap={2}> - <NumberInput - label="table.field.waitPakinItemLog.asnItemId" - source="asnItemId" - /> - </Stack> - <Stack direction='row' gap={2}> - <TextInput - label="table.field.waitPakinItemLog.trackCode" - source="trackCode" - parse={v => v} - /> - </Stack> - <Stack direction='row' gap={2}> - <TextInput - label="table.field.waitPakinItemLog.maktx" - source="maktx" - parse={v => v} - /> - </Stack> - <Stack direction='row' gap={2}> - <ReferenceInput - source="matnrId" - reference="matnr" - perPage={REFERENCE_INPUT_PAGESIZE} - > - <AutocompleteInput - label="table.field.waitPakinItemLog.matnrId" - optionText="unit" - filterToQuery={(val) => ({ unit: val })} - /> - </ReferenceInput> - </Stack> - <Stack direction='row' gap={2}> - <TextInput - label="table.field.waitPakinItemLog.matnrCode" - source="matnrCode" - parse={v => v} - /> - </Stack> - <Stack direction='row' gap={2}> - <NumberInput - label="table.field.waitPakinItemLog.anfme" - source="anfme" - /> - </Stack> - <Stack direction='row' gap={2}> - <NumberInput - label="table.field.waitPakinItemLog.workQty" - source="workQty" - /> - </Stack> - <Stack direction='row' gap={2}> - <TextInput - label="table.field.waitPakinItemLog.unit" - source="unit" - parse={v => v} - /> - </Stack> - <Stack direction='row' gap={2}> - <TextInput - label="table.field.waitPakinItemLog.fieldsIndex" - source="fieldsIndex" - parse={v => v} - /> - </Stack> - <Stack direction='row' gap={2}> - <NumberInput - label="table.field.waitPakinItemLog.qty" - source="qty" - /> - </Stack> - <Stack direction='row' gap={2}> - <TextInput - label="table.field.waitPakinItemLog.batch" - source="batch" - parse={v => v} - /> - </Stack> - - </Grid> - <Grid item xs={12} md={4}> - <Typography variant="h6" gutterBottom> - {translate('common.edit.title.common')} - </Typography> - <StatusSelectInput /> - <Box mt="2em" /> - <MemoInput /> - </Grid> - </Grid> - </SimpleForm> - </Edit > - ) -} - -export default WaitPakinItemLogEdit; diff --git a/rsf-admin/src/page/waitPakinItemLog/WaitPakinItemLogPanel.jsx b/rsf-admin/src/page/waitPakinItemLog/WaitPakinItemLogPanel.jsx deleted file mode 100644 index 8bb4f7e..0000000 --- a/rsf-admin/src/page/waitPakinItemLog/WaitPakinItemLogPanel.jsx +++ /dev/null @@ -1,141 +0,0 @@ -import React, { useState, useRef, useEffect, useMemo } from "react"; -import { Box, Card, CardContent, Grid, Typography, Tooltip } from '@mui/material'; -import { - useTranslate, - useRecordContext, -} from 'react-admin'; -import PanelTypography from "../components/PanelTypography"; -import * as Common from '@/utils/common' - -const WaitPakinItemLogPanel = () => { - const record = useRecordContext(); - if (!record) return null; - const translate = useTranslate(); - return ( - <> - <Card sx={{ width: { xs: 300, sm: 500, md: 600, lg: 800 }, margin: 'auto' }}> - <CardContent> - <Grid container spacing={2}> - <Grid item xs={12} sx={{ display: 'flex', justifyContent: 'space-between' }}> - <Typography variant="h6" gutterBottom align="left" sx={{ - maxWidth: { xs: '100px', sm: '180px', md: '260px', lg: '360px' }, - whiteSpace: 'nowrap', - overflow: 'hidden', - textOverflow: 'ellipsis', - }}> - {Common.camelToPascalWithSpaces(translate('table.field.waitPakinItemLog.id'))}: {record.id} - </Typography> - {/* inherit, primary, secondary, textPrimary, textSecondary, error */} - <Typography variant="h6" gutterBottom align="right" > - ID: {record.id} - </Typography> - </Grid> - </Grid> - <Grid container spacing={2}> - <Grid item xs={12} container alignContent="flex-end"> - <Typography variant="caption" color="textSecondary" sx={{ wordWrap: 'break-word', wordBreak: 'break-all' }}> - {Common.camelToPascalWithSpaces(translate('common.field.memo'))}:{record.memo} - </Typography> - </Grid> - </Grid> - <Box height={20}> </Box> - <Grid container spacing={2}> - <Grid item xs={6}> - <PanelTypography - title="table.field.waitPakinItemLog.pakinId" - property={record.pakinId$} - /> - </Grid> - <Grid item xs={6}> - <PanelTypography - title="table.field.waitPakinItemLog.pakinItemId" - property={record.pakinItemId} - /> - </Grid> - <Grid item xs={6}> - <PanelTypography - title="table.field.waitPakinItemLog.asnId" - property={record.asnId} - /> - </Grid> - <Grid item xs={6}> - <PanelTypography - title="table.field.waitPakinItemLog.asnCode" - property={record.asnCode} - /> - </Grid> - <Grid item xs={6}> - <PanelTypography - title="table.field.waitPakinItemLog.asnItemId" - property={record.asnItemId} - /> - </Grid> - <Grid item xs={6}> - <PanelTypography - title="table.field.waitPakinItemLog.trackCode" - property={record.trackCode} - /> - </Grid> - <Grid item xs={6}> - <PanelTypography - title="table.field.waitPakinItemLog.maktx" - property={record.maktx} - /> - </Grid> - <Grid item xs={6}> - <PanelTypography - title="table.field.waitPakinItemLog.matnrId" - property={record.matnrId$} - /> - </Grid> - <Grid item xs={6}> - <PanelTypography - title="table.field.waitPakinItemLog.matnrCode" - property={record.matnrCode} - /> - </Grid> - <Grid item xs={6}> - <PanelTypography - title="table.field.waitPakinItemLog.anfme" - property={record.anfme} - /> - </Grid> - <Grid item xs={6}> - <PanelTypography - title="table.field.waitPakinItemLog.workQty" - property={record.workQty} - /> - </Grid> - <Grid item xs={6}> - <PanelTypography - title="table.field.waitPakinItemLog.unit" - property={record.unit} - /> - </Grid> - <Grid item xs={6}> - <PanelTypography - title="table.field.waitPakinItemLog.fieldsIndex" - property={record.fieldsIndex} - /> - </Grid> - <Grid item xs={6}> - <PanelTypography - title="table.field.waitPakinItemLog.qty" - property={record.qty} - /> - </Grid> - <Grid item xs={6}> - <PanelTypography - title="table.field.waitPakinItemLog.batch" - property={record.batch} - /> - </Grid> - - </Grid> - </CardContent> - </Card > - </> - ); -}; - -export default WaitPakinItemLogPanel; diff --git a/rsf-admin/src/page/waitPakinItemLog/index.jsx b/rsf-admin/src/page/waitPakinItemLog/index.jsx deleted file mode 100644 index 52cacba..0000000 --- a/rsf-admin/src/page/waitPakinItemLog/index.jsx +++ /dev/null @@ -1,18 +0,0 @@ -import React, { useState, useRef, useEffect, useMemo } from "react"; -import { - ListGuesser, - EditGuesser, - ShowGuesser, -} from "react-admin"; - -import WaitPakinItemLogList from "./WaitPakinItemLogList"; -import WaitPakinItemLogEdit from "./WaitPakinItemLogEdit"; - -export default { - list: WaitPakinItemLogList, - edit: WaitPakinItemLogEdit, - show: ShowGuesser, - recordRepresentation: (record) => { - return `${record.id}` - } -}; diff --git a/rsf-admin/src/page/waitPakinItemLog/WaitPakinItemLogList.jsx b/rsf-admin/src/page/waitPakinLog/WaitPakinItemLogList.jsx similarity index 85% rename from rsf-admin/src/page/waitPakinItemLog/WaitPakinItemLogList.jsx rename to rsf-admin/src/page/waitPakinLog/WaitPakinItemLogList.jsx index 767197a..f7587c2 100644 --- a/rsf-admin/src/page/waitPakinItemLog/WaitPakinItemLogList.jsx +++ b/rsf-admin/src/page/waitPakinLog/WaitPakinItemLogList.jsx @@ -31,12 +31,10 @@ ReferenceArrayInput, AutocompleteInput, DeleteButton, + useGetRecordId, } from 'react-admin'; import { Box, Typography, Card, Stack } from '@mui/material'; -import { styled } from '@mui/material/styles'; -import WaitPakinItemLogCreate from "./WaitPakinItemLogCreate"; -import WaitPakinItemLogPanel from "./WaitPakinItemLogPanel"; -import EmptyData from "../components/EmptyData"; +import { styled } from '@mui/material/styles'; import EmptyData from "../components/EmptyData"; import MyCreateButton from "../components/MyCreateButton"; import MyExportButton from '../components/MyExportButton'; import PageDrawer from "../components/PageDrawer"; @@ -60,7 +58,6 @@ const filters = [ <SearchInput source="condition" alwaysOn />, - <ReferenceInput source="pakinId" label="table.field.waitPakinItemLog.pakinId" reference="waitPakin"> <AutocompleteInput label="table.field.waitPakinItemLog.pakinId" optionText="id" filterToQuery={(val) => ({ id: val })} /> </ReferenceInput>, @@ -80,7 +77,6 @@ <TextInput source="fieldsIndex" label="table.field.waitPakinItemLog.fieldsIndex" />, <NumberInput source="qty" label="table.field.waitPakinItemLog.qty" />, <TextInput source="batch" label="table.field.waitPakinItemLog.batch" />, - <TextInput label="common.field.memo" source="memo" />, <SelectInput label="common.field.status" @@ -95,13 +91,14 @@ const WaitPakinItemLogList = () => { const translate = useTranslate(); - const [createDialog, setCreateDialog] = useState(false); const [drawerVal, setDrawerVal] = useState(false); + const recordId = useGetRecordId(); return ( <Box display="flex"> <List + resource="waitPakinItemLog" sx={{ flexGrow: 1, transition: (theme) => @@ -113,11 +110,11 @@ title={"menu.waitPakinItemLog"} empty={<EmptyData onClick={() => { setCreateDialog(true) }} />} filters={filters} + filter={{ logId: recordId }} sort={{ field: "create_time", order: "desc" }} actions={( <TopToolbar> <FilterButton /> - <MyCreateButton onClick={() => { setCreateDialog(true) }} /> <SelectColumnsButton preferenceKey='waitPakinItemLog' /> <MyExportButton /> </TopToolbar> @@ -128,7 +125,7 @@ preferenceKey='waitPakinItemLog' bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />} rowClick={(id, resource, record) => false} - omit={['id', 'createTime', 'createBy', 'memo']} + omit={['id', 'createTime', 'createBy', 'memo', 'pakinId', 'pakinItemId', 'asnId' ,'asnItemId', 'createBy$', 'fieldsIndex']} > <NumberField source="id" /> <ReferenceField source="pakinId" label="table.field.waitPakinItemLog.pakinId" reference="waitPakin" link={false} sortable={false}> @@ -150,27 +147,14 @@ <TextField source="fieldsIndex" label="table.field.waitPakinItemLog.fieldsIndex" /> <NumberField source="qty" label="table.field.waitPakinItemLog.qty" /> <TextField source="batch" label="table.field.waitPakinItemLog.batch" /> - - <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}> - <TextField source="nickname" /> - </ReferenceField> + <TextField source="updateBy$" label="common.field.updateBy" /> <DateField source="updateTime" label="common.field.updateTime" showTime /> - <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}> - <TextField source="nickname" /> - </ReferenceField> + <TextField source="createBy$" label="common.field.createBy" /> <DateField source="createTime" label="common.field.createTime" showTime /> <BooleanField source="statusBool" label="common.field.status" sortable={false} /> <TextField source="memo" label="common.field.memo" sortable={false} /> - <WrapperField cellClassName="opt" label="common.field.opt"> - <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} /> - <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} /> - </WrapperField> </StyledDatagrid> </List> - <WaitPakinItemLogCreate - open={createDialog} - setOpen={setCreateDialog} - /> <PageDrawer title='WaitPakinItemLog Detail' drawerVal={drawerVal} diff --git a/rsf-admin/src/page/waitPakinLog/WaitPakinLogEdit.jsx b/rsf-admin/src/page/waitPakinLog/WaitPakinLogEdit.jsx index 3570c73..ac2350e 100644 --- a/rsf-admin/src/page/waitPakinLog/WaitPakinLogEdit.jsx +++ b/rsf-admin/src/page/waitPakinLog/WaitPakinLogEdit.jsx @@ -28,12 +28,13 @@ import CustomerTopToolBar from "../components/EditTopToolBar"; import MemoInput from "../components/MemoInput"; import StatusSelectInput from "../components/StatusSelectInput"; +import WaitPakinItemLogList from "./WaitPakinItemLogList"; const FormToolbar = () => { const { getValues } = useFormContext(); return ( - <Toolbar sx={{ justifyContent: 'space-between' }}> + <Toolbar sx={{ justifyContent: 'end' }}> <SaveButton /> <DeleteButton mutationMode="optimistic" /> </Toolbar> @@ -44,76 +45,62 @@ const translate = useTranslate(); return ( - <Edit - redirect="list" - mutationMode={EDIT_MODE} - actions={<CustomerTopToolBar />} - aside={<EditBaseAside />} - > - <SimpleForm - shouldUnregister - warnWhenUnsavedChanges - toolbar={<FormToolbar />} - mode="onTouched" - defaultValues={{}} - // validate={(values) => { }} + <> + <Edit + redirect="list" + mutationMode={EDIT_MODE} + actions={<CustomerTopToolBar />} + aside={<EditBaseAside />} > - <Grid container width={{ xs: '100%', xl: '80%' }} rowSpacing={3} columnSpacing={3}> - <Grid item xs={12} md={8}> - <Typography variant="h6" gutterBottom> - {translate('common.edit.title.main')} - </Typography> - <Stack direction='row' gap={2}> - <NumberInput - label="table.field.waitPakinLog.pakinId" - source="pakinId" - autoFocus - /> - </Stack> - <Stack direction='row' gap={2}> - <TextInput - label="table.field.waitPakinLog.code" - source="code" - parse={v => v} - /> - </Stack> - <Stack direction='row' gap={2}> - <TextInput - label="table.field.waitPakinLog.barcode" - source="barcode" - parse={v => v} - /> - </Stack> - <Stack direction='row' gap={2}> - <NumberInput - label="table.field.waitPakinLog.anfme" - source="anfme" - /> - </Stack> - <Stack direction='row' gap={2}> - <SelectInput - label="table.field.waitPakinLog.ioStatus" - source="ioStatus" - choices={[ - { id: 0, name: '寰呭叆搴�' }, - { id: 1, name: ' 鍏ュ簱涓�' }, - ]} - validate={required()} - /> - </Stack> - + <SimpleForm + shouldUnregister + warnWhenUnsavedChanges + toolbar={<FormToolbar />} + mode="onTouched" + defaultValues={{}} + // validate={(values) => { }} + > + <Grid container width={{ xs: '100%', xl: '80%' }} rowSpacing={3} columnSpacing={3}> + <Grid item xs={24} md={12}> + <Typography variant="h6" gutterBottom> + {translate('common.edit.title.main')} + </Typography> + <Stack direction='row' gap={2}> + <NumberInput + label="table.field.waitPakinLog.pakinId" + source="pakinId" + autoFocus + /> + <TextInput + label="table.field.waitPakinLog.code" + source="code" + parse={v => v} + /> + <TextInput + label="table.field.waitPakinLog.barcode" + source="barcode" + parse={v => v} + /> + <NumberInput + label="table.field.waitPakinLog.anfme" + source="anfme" + /> + <SelectInput + label="table.field.waitPakinLog.ioStatus" + source="ioStatus" + choices={[ + { id: 0, name: '寰呭叆搴�' }, + { id: 1, name: ' 鍏ュ簱涓�' }, + ]} + validate={required()} + /> + </Stack> + </Grid> </Grid> - <Grid item xs={12} md={4}> - <Typography variant="h6" gutterBottom> - {translate('common.edit.title.common')} - </Typography> - <StatusSelectInput /> - <Box mt="2em" /> - <MemoInput /> - </Grid> - </Grid> - </SimpleForm> - </Edit > + </SimpleForm> + </Edit > + <WaitPakinItemLogList /> + </> ) } diff --git a/rsf-admin/src/page/waitPakinLog/WaitPakinLogList.jsx b/rsf-admin/src/page/waitPakinLog/WaitPakinLogList.jsx index e9cb3f8..c689002 100644 --- a/rsf-admin/src/page/waitPakinLog/WaitPakinLogList.jsx +++ b/rsf-admin/src/page/waitPakinLog/WaitPakinLogList.jsx @@ -34,13 +34,9 @@ } from 'react-admin'; import { Box, Typography, Card, Stack } from '@mui/material'; import { styled } from '@mui/material/styles'; -import WaitPakinLogCreate from "./WaitPakinLogCreate"; -import WaitPakinLogPanel from "./WaitPakinLogPanel"; import EmptyData from "../components/EmptyData"; -import MyCreateButton from "../components/MyCreateButton"; import MyExportButton from '../components/MyExportButton'; import PageDrawer from "../components/PageDrawer"; -import MyField from "../components/MyField"; import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting'; import * as Common from '@/utils/common'; @@ -86,7 +82,6 @@ const WaitPakinLogList = () => { const translate = useTranslate(); - const [createDialog, setCreateDialog] = useState(false); const [drawerVal, setDrawerVal] = useState(false); @@ -108,7 +103,6 @@ actions={( <TopToolbar> <FilterButton /> - {/* <MyCreateButton onClick={() => { setCreateDialog(true) }} /> */} <SelectColumnsButton preferenceKey='waitPakinLog' /> <MyExportButton /> </TopToolbar> @@ -117,9 +111,9 @@ > <StyledDatagrid preferenceKey='waitPakinLog' - bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />} - rowClick={(id, resource, record) => false} - expand={() => <WaitPakinLogPanel />} + bulkActionButtons={false} + rowClick={'edit'} + expand={false} expandSingle={true} omit={['id', 'createTime', 'createBy', 'memo']} > @@ -146,10 +140,6 @@ </WrapperField> </StyledDatagrid> </List> - <WaitPakinLogCreate - open={createDialog} - setOpen={setCreateDialog} - /> <PageDrawer title='WaitPakinLog Detail' drawerVal={drawerVal} -- Gitblit v1.9.1