From 843d5b6dd50567dadcc56257f074840e80d757aa Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 20 五月 2025 18:42:18 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatCreate.jsx | 46 ++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 38 insertions(+), 8 deletions(-) diff --git a/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatCreate.jsx b/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatCreate.jsx index 9f726dc..a4ef04a 100644 --- a/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatCreate.jsx +++ b/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatCreate.jsx @@ -52,6 +52,12 @@ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } }); }; + + const [warehouseId, setWrehouseId] = useState(); + const warehouseChange = (val) => { + setWrehouseId(val) + } + return ( <> <CreateBase @@ -92,18 +98,42 @@ autoFocus /> </Grid> - {/* <Grid item xs={6} display="flex" gap={1}> - <NumberInput - label="table.field.locAreaMat.warehouseId" - source="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}> - <NumberInput - label="table.field.locAreaMat.areaId" + <ReferenceInput + source="warehouseId" + 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" - /> - </Grid> */} + reference="warehouseAreas" + filter={{ warehouseId }} + > + <AutocompleteInput + label="table.field.loc.areaId" + optionText="name" + validate={[required()]} + filterToQuery={(val) => ({ name: val })} + /> + </ReferenceInput> + </Grid> <Grid item xs={6} display="flex" gap={1}> <TextInput label="table.field.locAreaMat.depict" -- Gitblit v1.9.1