From a8bf6a39b243af3e6b3c0d52b7b836c9cdc743de Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 26 三月 2025 09:20:39 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatEdit.jsx | 49 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 39 insertions(+), 10 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatEdit.jsx b/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatEdit.jsx
index 752dbfd..9b0c23f 100644
--- a/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatEdit.jsx
@@ -43,6 +43,11 @@
const LocAreaMatEdit = () => {
const translate = useTranslate();
+ const [warehouseId, setWrehouseId] = useState();
+ const warehouseChange = (val) => {
+ setWrehouseId(val)
+ }
+
return (
<Edit
redirect="list"
@@ -71,18 +76,42 @@
autoFocus
/>
</Stack>
- {/* <Stack direction='row' gap={2}>
- <NumberInput
- label="table.field.locAreaMat.warehouseId"
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.locAreaMat.name"
+ source="name"
+ parse={v => v}
+ autoFocus
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <ReferenceInput
source="warehouseId"
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <NumberInput
- label="table.field.locAreaMat.areaId"
+ reference="warehouse"
+ >
+ <AutocompleteInput
+ label="table.field.loc.warehouseId"
+ optionText="name"
+ validate={[required()]}
+ onChange={warehouseChange}
+ filterToQuery={(val) => ({ name: val })}
+ />
+ </ReferenceInput>
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <ReferenceInput
source="areaId"
- />
- </Stack> */}
+ reference="warehouseAreas"
+ filter={{ warehouseId }}
+ >
+ <AutocompleteInput
+ label="table.field.loc.areaId"
+ optionText="name"
+ validate={[required()]}
+ filterToQuery={(val) => ({ name: val })}
+ />
+ </ReferenceInput>
+ </Grid>
<Stack direction='row' gap={2}>
<TextInput
label="table.field.locAreaMat.depict"
--
Gitblit v1.9.1