From 5ddf26e390c8ba6e35dfbf93502c9a46f1bc356c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 19 三月 2025 11:35:52 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx b/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx
index de45085..e95a188 100644
--- a/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx
@@ -65,6 +65,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()]}
@@ -72,21 +80,15 @@
autoFocus
/>
</Stack>
- <Stack direction='row' gap={2}>
+ {/* <Stack direction='row' gap={2}>
<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> */}
+
<Stack direction='row' gap={2}>
<TextInput
label="table.field.warehouse.address"
@@ -101,8 +103,6 @@
source="longitude"
parse={v => v}
/>
- </Stack>
- <Stack direction='row' gap={2}>
<TextInput
label="table.field.warehouse.latgitude"
source="latgitude"
@@ -110,24 +110,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>
--
Gitblit v1.9.1