From 6d6a1b26fcdad0ae743a6e99c8f321969bd2345f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 12 五月 2025 16:26:16 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx b/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx
index b2127b6..daf37a0 100644
--- a/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx
+++ b/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx
@@ -86,23 +86,27 @@
<Grid container rowSpacing={2} columnSpacing={2}>
<Grid item xs={6} display="flex" gap={1}>
<TextInput
- label="table.field.warehouse.name"
- source="name"
+ label="table.field.warehouse.factory"
+ source="factory"
+ validate={[required()]}
parse={v => v}
autoFocus
/>
+
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.warehouse.code"
source="code"
+ validate={[required()]}
parse={v => v}
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<TextInput
- label="table.field.warehouse.factory"
- source="factory"
+ label="table.field.warehouse.name"
+ source="name"
+ validate={[required()]}
parse={v => v}
/>
</Grid>
@@ -110,6 +114,7 @@
<TextInput
label="table.field.warehouse.address"
source="address"
+ validate={[required()]}
parse={v => v}
/>
</Grid>
@@ -119,8 +124,6 @@
source="longitude"
parse={v => v}
/>
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.warehouse.latgitude"
source="latgitude"
@@ -132,14 +135,10 @@
label="table.field.warehouse.length"
source="length"
/>
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
<NumberInput
label="table.field.warehouse.width"
source="width"
/>
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
<NumberInput
label="table.field.warehouse.height"
source="height"
@@ -149,10 +148,19 @@
<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%'}>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="common.field.memo"
+ source="memo"
+ parse={v => v}
+ fullWidth
+ multiline
+ minRows={2}
+ autoFocus
+ />
+ {/* <Stack direction="column" spacing={1} width={'100%'}>
<MemoInput />
- </Stack>
+ </Stack> */}
</Grid>
</Grid>
</DialogContent>
--
Gitblit v1.9.1