From cc2984eeb289b54cfa193dde558417c46f309e8f Mon Sep 17 00:00:00 2001 From: DESKTOP-LMJ82IJ\Eno <creaycat@gmail.com> Date: 星期日, 13 四月 2025 19:32:38 +0800 Subject: [PATCH] #修改 1. 采购单界面优化及修改 --- rsf-admin/src/page/waitPakin/WaitPakinEdit.jsx | 160 ++++++++++++++++++++++++---------------------------- 1 files changed, 74 insertions(+), 86 deletions(-) diff --git a/rsf-admin/src/page/waitPakin/WaitPakinEdit.jsx b/rsf-admin/src/page/waitPakin/WaitPakinEdit.jsx index 93a66e4..91fcd56 100644 --- a/rsf-admin/src/page/waitPakin/WaitPakinEdit.jsx +++ b/rsf-admin/src/page/waitPakin/WaitPakinEdit.jsx @@ -2,38 +2,29 @@ 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"; +import WaitPakinItem from "../waitPakinItem"; +import WaitPakinItemList from "../waitPakinItem/WaitPakinItemList"; const FormToolbar = () => { const { getValues } = useFormContext(); return ( - <Toolbar sx={{ justifyContent: 'space-between' }}> + <Toolbar sx={{ justifyContent: 'end' }}> <SaveButton /> <DeleteButton mutationMode="optimistic" /> </Toolbar> @@ -44,82 +35,79 @@ 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}> - <TextInput - label="table.field.waitPakin.code" - source="code" - parse={v => v} - autoFocus - /> - </Stack> - <Stack direction='row' gap={2}> - <NumberInput - label="table.field.waitPakin.ansId" - source="ansId" - /> - </Stack> - <Stack direction='row' gap={2}> - <TextInput - label="table.field.waitPakin.asnCode" - source="asnCode" - parse={v => v} - /> - </Stack> - <Stack direction='row' gap={2}> - <TextInput - label="table.field.waitPakin.barcode" - source="barcode" - parse={v => v} - /> - </Stack> - <Stack direction='row' gap={2}> - <NumberInput - label="table.field.waitPakin.anfme" - source="anfme" - /> - </Stack> - <Stack direction='row' gap={2}> - <SelectInput - label="table.field.waitPakin.ioStatus" - source="ioStatus" - choices={[ - { id: 0, name: '寰呭叆搴�' }, - { id: 1, name: ' 鍏ュ簱涓�' }, - ]} - /> - </Stack> - + <SimpleForm + shouldUnregister + warnWhenUnsavedChanges + toolbar={<FormToolbar />} + mode="onTouched" + defaultValues={{}} + > + <Grid container width={{ xs: '100%', xl: '100%' }}> + <Grid item xs={12} md={8}> + <Typography variant="h6" gutterBottom> + {translate('common.edit.title.main')} + </Typography> + <Stack direction='row' gap={2}> + <TextInput + label="table.field.waitPakin.code" + source="code" + readOnly + parse={v => v} + autoFocus + /> + <NumberInput + label="table.field.waitPakin.ansId" + readOnly + source="ansId" + /> + <TextInput + label="table.field.waitPakin.asnCode" + readOnly + source="asnCode" + parse={v => v} + /> + <SelectInput + label="table.field.waitPakin.flagDefect" + readOnly + source="flagDefect" + parse={v => v} + /> + </Stack> + <Stack direction='row' gap={2}> + <TextInput + label="table.field.waitPakin.barcode" + readOnly + source="barcode" + parse={v => v} + /> + <NumberInput + label="table.field.waitPakin.anfme" + readOnly + source="anfme" + /> + <SelectInput + label="table.field.waitPakin.ioStatus" + readOnly + source="ioStatus" + choices={[ + { id: 0, name: '寰呭叆搴�' }, + { id: 1, name: ' 鍏ュ簱涓�' }, + ]} + /> + </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 > + <WaitPakinItemList /> + </> ) } -- Gitblit v1.9.1