From c0a87b9244e1521c76b8a0dc70b922f6fc3e30a1 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期四, 17 七月 2025 16:35:23 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx | 36 ++++++++++++++---------------------- 1 files changed, 14 insertions(+), 22 deletions(-) diff --git a/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx b/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx index de45085..ecf1a27 100644 --- a/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx +++ b/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx @@ -49,6 +49,7 @@ mutationMode={EDIT_MODE} actions={<CustomerTopToolBar />} aside={<EditBaseAside />} + title={"menu.warehouse"} > <SimpleForm shouldUnregister @@ -65,6 +66,14 @@ </Typography> <Stack direction='row' gap={2}> <TextInput + label="table.field.warehouse.factory" + source="factory" + validate={[required()]} + parse={v => v} + /> + </Stack> + <Stack direction='row' gap={2}> + <TextInput label="table.field.warehouse.name" source="name" validate={[required()]} @@ -76,17 +85,11 @@ <TextInput label="table.field.warehouse.code" source="code" - parse={v => v} - /> - </Stack> - <Stack direction='row' gap={2}> - <TextInput - label="table.field.warehouse.factory" - source="factory" validate={[required()]} parse={v => v} /> </Stack> + <Stack direction='row' gap={2}> <TextInput label="table.field.warehouse.address" @@ -101,8 +104,6 @@ source="longitude" parse={v => v} /> - </Stack> - <Stack direction='row' gap={2}> <TextInput label="table.field.warehouse.latgitude" source="latgitude" @@ -110,33 +111,24 @@ /> </Stack> <Stack direction='row' gap={2}> + + </Stack> + <Stack direction='row' gap={2}> <NumberInput label="table.field.warehouse.length" source="length" /> - </Stack> - <Stack direction='row' gap={2}> <NumberInput label="table.field.warehouse.width" source="width" /> - </Stack> - <Stack direction='row' gap={2}> <NumberInput label="table.field.warehouse.height" source="height" /> </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 > -- Gitblit v1.9.1