From 031e36213941ad3430da2b0429701e742f09f5d8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 18 三月 2025 11:14:20 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-admin/src/page/basicInfo/loc/LocCreate.jsx | 46 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/loc/LocCreate.jsx b/rsf-admin/src/page/basicInfo/loc/LocCreate.jsx
index 831412b..0602179 100644
--- a/rsf-admin/src/page/basicInfo/loc/LocCreate.jsx
+++ b/rsf-admin/src/page/basicInfo/loc/LocCreate.jsx
@@ -119,20 +119,27 @@
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
- <TextInput
- label="table.field.loc.type"
+ <ReferenceInput
source="type"
- parse={v => v}
- validate={required()}
- />
+ reference="dictData"
+ filter={{ dictTypeCode: 'sys_loc_type' }}
+ >
+ <AutocompleteInput
+ label="table.field.loc.type"
+ optionText="label"
+ optionValue="value"
+ parse={v => v}
+ validate={[required()]}
+ />
+ </ReferenceInput>
</Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ {/* <Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.loc.name"
source="name"
parse={v => v}
/>
- </Grid>
+ </Grid> */}
<Grid item xs={6} display="flex" gap={1}>
<NumberInput
label="table.field.loc.flagLogic"
@@ -153,24 +160,41 @@
parse={v => v}
/>
</Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ {/* <Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.loc.unit"
source="unit"
parse={v => v}
/>
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ </Grid> */}
+ {/* <Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.loc.size"
source="size"
parse={v => v}
/>
+ </Grid> */}
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.loc.length"
+ source="length"
+ validate={required()}
+ />
+ <NumberInput
+ label="table.field.loc.width"
+ source="width"
+ validate={required()}
+ />
+ <NumberInput
+ label="table.field.loc.height"
+ source="height"
+ validate={required()}
+ />
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<NumberInput
label="table.field.loc.row"
- source="lrow"
+ source="row"
validate={required()}
/>
<NumberInput
--
Gitblit v1.9.1