From 65a30e30a0df5d92bdf5290a636db56ca79b9562 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 21 三月 2025 13:09:31 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/basicInfo/loc/InitModal.jsx | 33 ++++++++++++++-------------------
1 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/loc/InitModal.jsx b/rsf-admin/src/page/basicInfo/loc/InitModal.jsx
index f0c4c48..a677559 100644
--- a/rsf-admin/src/page/basicInfo/loc/InitModal.jsx
+++ b/rsf-admin/src/page/basicInfo/loc/InitModal.jsx
@@ -19,6 +19,7 @@
useCreateController,
useListContext,
useRefresh,
+ SelectArrayInput
} from 'react-admin';
import {
Dialog,
@@ -70,7 +71,8 @@
"startBay": undefined,
"startLev": undefined,
"startRow": undefined,
- "type": ""
+ "type": "",
+ "typeIds": undefined,
});
const handleClose = (event, reason) => {
@@ -86,7 +88,7 @@
const handleChange = (value, name) => {
setFormData((prevData) => ({
...prevData,
- [name]: ['locType', 'type'].includes(name) ? value : +value
+ [name]: value
}));
};
@@ -133,21 +135,14 @@
value={formData.locType}
onChange={(e) => handleChange(e.target.value, 'locType')}
size="small"
- validate={[required()]}
dictTypeCode="sys_width_type"
/>
</Grid>
<Grid item xs={4}>
- <DictionarySelect
- label={translate("table.field.loc.type")}
- name="type"
- value={formData.type}
- onChange={(e) => handleChange(e.target.value, 'type')}
- size="small"
- validate={[required()]}
- dictTypeCode="sys_loc_type"
- />
+ <ReferenceArrayInput source="typeIds" reference="locType" >
+ <SelectArrayInput label="table.field.loc.type" onChange={(e) => handleChange(e.target.value, 'typeIds')} />
+ </ReferenceArrayInput>
</Grid>
<Grid item xs={4}>
@@ -155,7 +150,7 @@
label={translate("table.field.loc.startBay")}
name="startBay"
value={formData.startBay}
- onChange={(e) => handleChange(e.target.value, 'startBay')}
+ onChange={(e) => handleChange(+e.target.value, 'startBay')}
size="small"
type="number"
validate={[required()]}
@@ -167,7 +162,7 @@
label={translate("table.field.loc.startLev")}
name="startLev"
value={formData.startLev}
- onChange={(e) => handleChange(e.target.value, 'startLev')}
+ onChange={(e) => handleChange(+e.target.value, 'startLev')}
size="small"
type="number"
validate={[required()]}
@@ -179,7 +174,7 @@
label={translate("table.field.loc.startRow")}
name="startRow"
value={formData.startRow}
- onChange={(e) => handleChange(e.target.value, 'startRow')}
+ onChange={(e) => handleChange(+e.target.value, 'startRow')}
size="small"
type="number"
validate={[required()]}
@@ -191,7 +186,7 @@
label={translate("table.field.loc.endBay")}
name="endBay"
value={formData.endBay}
- onChange={(e) => handleChange(e.target.value, 'endBay')}
+ onChange={(e) => handleChange(+e.target.value, 'endBay')}
size="small"
type="number"
validate={[required()]}
@@ -203,7 +198,7 @@
label={translate("table.field.loc.endLev")}
name="endLev"
value={formData.endLev}
- onChange={(e) => handleChange(e.target.value, 'endLev')}
+ onChange={(e) => handleChange(+e.target.value, 'endLev')}
size="small"
type="number"
validate={[required()]}
@@ -215,7 +210,7 @@
label={translate("table.field.loc.endRow")}
name="endRow"
value={formData.endRow}
- onChange={(e) => handleChange(e.target.value, 'endRow')}
+ onChange={(e) => handleChange(+e.target.value, 'endRow')}
size="small"
type="number"
validate={[required()]}
@@ -229,7 +224,7 @@
<DialogActions sx={{ position: 'sticky', bottom: 0, backgroundColor: 'background.paper', zIndex: 1000 }}>
<Box sx={{ width: '100%', display: 'flex', justifyContent: 'space-between' }}>
<Button type="submit" variant="contained" startIcon={<SaveIcon />}>
- 纭
+ {translate('toolbar.confirm')}
</Button>
</Box>
</DialogActions>
--
Gitblit v1.9.1