From 2ac6ad1062319d1bfca94550097ace88d6df4a13 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期六, 14 九月 2024 12:53:08 +0800 Subject: [PATCH] # --- zy-acs-flow/src/page/loc/LocEdit.jsx | 69 ++++++++++------------ zy-acs-flow/src/page/loc/LocCreate.jsx | 56 ++++++++++-------- 2 files changed, 62 insertions(+), 63 deletions(-) diff --git a/zy-acs-flow/src/page/loc/LocCreate.jsx b/zy-acs-flow/src/page/loc/LocCreate.jsx index 89ab5a5..3619fc1 100644 --- a/zy-acs-flow/src/page/loc/LocCreate.jsx +++ b/zy-acs-flow/src/page/loc/LocCreate.jsx @@ -84,14 +84,14 @@ </DialogTitle> <DialogContent> <Grid container rowSpacing={2} columnSpacing={2}> - <Grid item xs={6} display="flex" gap={1}> + {/* <Grid item xs={6} display="flex" gap={1}> <TextInput label="table.field.loc.uuid" source="uuid" parse={v => v} autoFocus /> - </Grid> + </Grid> */} <Grid item xs={6} display="flex" gap={1}> <ReferenceInput source="zoneId" @@ -101,6 +101,7 @@ label="table.field.loc.zoneId" optionText="name" filterToQuery={(val) => ({ name: val })} + validate={required()} /> </ReferenceInput> </Grid> @@ -109,15 +110,36 @@ label="table.field.loc.locNo" source="locNo" parse={v => v} + validate={required()} /> </Grid> - <Grid item xs={6} display="flex" gap={1}> + <Grid item xs={12} display="flex" gap={1}> + <Grid item xs={4} display="flex" gap={1}> + <NumberInput + label="table.field.loc.row" + source="row" + /> + </Grid> + <Grid item xs={4} display="flex" gap={1}> + <NumberInput + label="table.field.loc.bay" + source="bay" + /> + </Grid> + <Grid item xs={4} display="flex" gap={1}> + <NumberInput + label="table.field.loc.lev" + source="lev" + /> + </Grid> + </Grid> + {/* <Grid item xs={6} display="flex" gap={1}> <TextInput label="table.field.loc.name" source="name" parse={v => v} /> - </Grid> + </Grid> */} <Grid item xs={6} display="flex" gap={1}> <ReferenceInput source="code" @@ -159,37 +181,19 @@ /> </Grid> <Grid item xs={6} display="flex" gap={1}> - <NumberInput - label="table.field.loc.row" - source="row" - /> - </Grid> - <Grid item xs={6} display="flex" gap={1}> - <NumberInput - label="table.field.loc.bay" - source="bay" - /> - </Grid> - <Grid item xs={6} display="flex" gap={1}> - <NumberInput - label="table.field.loc.lev" - source="lev" - /> - </Grid> - <Grid item xs={6} display="flex" gap={1}> <TextInput label="table.field.loc.barcode" source="barcode" parse={v => v} /> </Grid> - <Grid item xs={6} display="flex" gap={1}> + {/* <Grid item xs={6} display="flex" gap={1}> <TextInput label="table.field.loc.zpallet" source="zpallet" parse={v => v} /> - </Grid> + </Grid> */} <Grid item xs={6} display="flex" gap={1}> <ReferenceInput source="locType" @@ -203,9 +207,9 @@ </ReferenceInput> </Grid> - <Grid item xs={6} display="flex" gap={1}> + {/* <Grid item xs={6} display="flex" gap={1}> <StatusSelectInput /> - </Grid> + </Grid> */} <Grid item xs={12} display="flex" gap={1}> <Stack direction="column" spacing={1} width={'100%'}> <MemoInput /> diff --git a/zy-acs-flow/src/page/loc/LocEdit.jsx b/zy-acs-flow/src/page/loc/LocEdit.jsx index 744c494..c83eb7b 100644 --- a/zy-acs-flow/src/page/loc/LocEdit.jsx +++ b/zy-acs-flow/src/page/loc/LocEdit.jsx @@ -63,14 +63,14 @@ <Typography variant="h6" gutterBottom> {translate('common.edit.title.main')} </Typography> - <Stack direction='row' gap={2}> + {/* <Stack direction='row' gap={2}> <TextInput label="table.field.loc.uuid" source="uuid" parse={v => v} autoFocus /> - </Stack> + </Stack> */} <Stack direction='row' gap={2}> <ReferenceInput source="zoneId" @@ -83,8 +83,6 @@ filterToQuery={(val) => ({ name: val })} /> </ReferenceInput> - </Stack> - <Stack direction='row' gap={2}> <TextInput label="table.field.loc.locNo" source="locNo" @@ -92,12 +90,32 @@ /> </Stack> <Stack direction='row' gap={2}> + <Stack direction='row' gap={2}> + <NumberInput + label="table.field.loc.row" + source="row" + /> + </Stack> + <Stack direction='row' gap={2}> + <NumberInput + label="table.field.loc.bay" + source="bay" + /> + </Stack> + <Stack direction='row' gap={2}> + <NumberInput + label="table.field.loc.lev" + source="lev" + /> + </Stack> + </Stack> + {/* <Stack direction='row' gap={2}> <TextInput label="table.field.loc.name" source="name" parse={v => v} /> - </Stack> + </Stack> */} <Stack direction='row' gap={2}> <ReferenceInput source="code" @@ -110,8 +128,6 @@ filterToQuery={(val) => ({ data: val })} /> </ReferenceInput> - </Stack> - <Stack direction='row' gap={2}> <SelectInput label="table.field.loc.compDirect" source="compDirect" @@ -133,29 +149,9 @@ filterToQuery={(val) => ({ name: val })} /> </ReferenceInput> - </Stack> - <Stack direction='row' gap={2}> <NumberInput label="table.field.loc.offset" source="offset" - /> - </Stack> - <Stack direction='row' gap={2}> - <NumberInput - label="table.field.loc.row" - source="row" - /> - </Stack> - <Stack direction='row' gap={2}> - <NumberInput - label="table.field.loc.bay" - source="bay" - /> - </Stack> - <Stack direction='row' gap={2}> - <NumberInput - label="table.field.loc.lev" - source="lev" /> </Stack> <Stack direction='row' gap={2}> @@ -164,8 +160,6 @@ source="barcode" parse={v => v} /> - </Stack> - <Stack direction='row' gap={2}> <TextInput label="table.field.loc.zpallet" source="zpallet" @@ -173,7 +167,15 @@ /> </Stack> <Stack direction='row' gap={2}> - <ReferenceInput + + </Stack> + + </Grid> + <Grid item xs={12} md={4}> + <Typography variant="h6" gutterBottom> + {translate('common.edit.title.common')} + </Typography> + <ReferenceInput source="locType" reference="locType" perPage={REFERENCE_INPUT_PAGESIZE} @@ -184,13 +186,6 @@ filterToQuery={(val) => ({ name: val })} /> </ReferenceInput> - </Stack> - - </Grid> - <Grid item xs={12} md={4}> - <Typography variant="h6" gutterBottom> - {translate('common.edit.title.common')} - </Typography> <StatusSelectInput /> <Box mt="2em" /> <MemoInput /> -- Gitblit v1.9.1