From 61135b200c008f41aeb0befc221951b866321bec Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 25 二月 2025 11:13:57 +0800
Subject: [PATCH] #
---
rsf-admin/src/page/basicInfo/warehouse/WarehouseList.jsx | 2
rsf-admin/src/page/basicInfo/warehouse/WarehousePanel.jsx | 10 ++--
rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx | 20 ++++------
rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx | 26 ++++++-------
rsf-admin/src/page/loc/LocCreate.jsx | 6 --
5 files changed, 27 insertions(+), 37 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx b/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx
index 4f4eb57..2d234a2 100644
--- a/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx
+++ b/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx
@@ -86,24 +86,26 @@
<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}
/>
@@ -122,9 +124,7 @@
source="longitude"
parse={v => v}
/>
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <TextInput
+ <TextInput
label="table.field.warehouse.latgitude"
source="latgitude"
parse={v => v}
@@ -135,14 +135,10 @@
label="table.field.warehouse.length"
source="length"
/>
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <NumberInput
+ <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"
diff --git a/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx b/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx
index de45085..2e1dee5 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()]}
@@ -76,17 +84,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 +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>
diff --git a/rsf-admin/src/page/basicInfo/warehouse/WarehouseList.jsx b/rsf-admin/src/page/basicInfo/warehouse/WarehouseList.jsx
index 233fce1..691d9b3 100644
--- a/rsf-admin/src/page/basicInfo/warehouse/WarehouseList.jsx
+++ b/rsf-admin/src/page/basicInfo/warehouse/WarehouseList.jsx
@@ -125,9 +125,9 @@
omit={['id', 'createTime', 'createBy', 'memo']}
>
<NumberField source="id" />
+ <TextField source="factory" label="table.field.warehouse.factory" />
<TextField source="name" label="table.field.warehouse.name" />
<TextField source="code" label="table.field.warehouse.code" />
- <TextField source="factory" label="table.field.warehouse.factory" />
<TextField source="address" label="table.field.warehouse.address" />
<TextField source="longitude" label="table.field.warehouse.longitude" />
<TextField source="latgitude" label="table.field.warehouse.latgitude" />
diff --git a/rsf-admin/src/page/basicInfo/warehouse/WarehousePanel.jsx b/rsf-admin/src/page/basicInfo/warehouse/WarehousePanel.jsx
index b1fc42f..af584fa 100644
--- a/rsf-admin/src/page/basicInfo/warehouse/WarehousePanel.jsx
+++ b/rsf-admin/src/page/basicInfo/warehouse/WarehousePanel.jsx
@@ -64,31 +64,31 @@
property={record.address}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.warehouse.longitude"
property={record.longitude}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3} >
<PanelTypography
title="table.field.warehouse.latgitude"
property={record.latgitude}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={2}>
<PanelTypography
title="table.field.warehouse.length"
property={record.length}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={2}>
<PanelTypography
title="table.field.warehouse.width"
property={record.width}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={2}>
<PanelTypography
title="table.field.warehouse.height"
property={record.height}
diff --git a/rsf-admin/src/page/loc/LocCreate.jsx b/rsf-admin/src/page/loc/LocCreate.jsx
index e47f97b..d2f7dab 100644
--- a/rsf-admin/src/page/loc/LocCreate.jsx
+++ b/rsf-admin/src/page/loc/LocCreate.jsx
@@ -160,16 +160,12 @@
source="lrow"
validate={required()}
/>
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
<NumberInput
label="table.field.loc.col"
source="col"
validate={required()}
/>
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <NumberInput
+ <NumberInput
label="table.field.loc.lev"
source="lev"
validate={required()}
--
Gitblit v1.9.1