From 843d5b6dd50567dadcc56257f074840e80d757aa Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 20 五月 2025 18:42:18 +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 | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx b/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx
index 5e83d70..b8d67b3 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,8 +66,17 @@
</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()]}
parse={v => v}
autoFocus
/>
@@ -75,20 +85,16 @@
<TextInput
label="table.field.warehouse.code"
source="code"
+ validate={[required()]}
parse={v => v}
/>
</Stack>
- <Stack direction='row' gap={2}>
- <TextInput
- label="table.field.warehouse.factory"
- source="factory"
- parse={v => v}
- />
- </Stack>
+
<Stack direction='row' gap={2}>
<TextInput
label="table.field.warehouse.address"
source="address"
+ validate={[required()]}
parse={v => v}
/>
</Stack>
@@ -98,8 +104,6 @@
source="longitude"
parse={v => v}
/>
- </Stack>
- <Stack direction='row' gap={2}>
<TextInput
label="table.field.warehouse.latgitude"
source="latgitude"
@@ -107,24 +111,22 @@
/>
</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>
@@ -132,7 +134,15 @@
</Typography>
<StatusSelectInput />
<Box mt="2em" />
- <MemoInput />
+ <TextInput
+ label="common.field.memo"
+ source="memo"
+ parse={v => v}
+ fullWidth
+ multiline
+ minRows={2}
+ autoFocus
+ />
</Grid>
</Grid>
</SimpleForm>
--
Gitblit v1.9.1