From 2d5ffc17e5d76a468493b21c45df1ca547b10da3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 四月 2025 13:40:17 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx | 33 +++++++++++++++------------------
1 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx b/rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx
index f038e90..cb67494 100644
--- a/rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx
+++ b/rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx
@@ -42,6 +42,7 @@
const WarehouseAreasEdit = () => {
const translate = useTranslate();
+ const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_ware_areas_type')) || [];
return (
<Edit
@@ -58,8 +59,8 @@
defaultValues={{}}
// validate={(values) => { }}
>
- <Grid container width={{ xs: '100%', xl: '80%' }} rowSpacing={3} columnSpacing={3}>
- <Grid item xs={12} md={8}>
+ <Grid container width={{ xs: '100%', xl: '100%' }} rowSpacing={3} columnSpacing={3}>
+ <Grid item xs={16} md={10}>
<Typography variant="h6" gutterBottom>
{translate('common.edit.title.main')}
</Typography>
@@ -72,30 +73,35 @@
autoFocus
/>
</Stack> */}
- <Stack direction='row' gap={2}>
+ <Stack xs={16} direction='row' gap={2}>
<TextInput
label="table.field.warehouseAreas.name"
source="name"
validate={[required()]}
parse={v => v}
/>
- </Stack>
- <Stack direction='row' gap={2}>
<TextInput
label="table.field.warehouseAreas.code"
source="code"
validate={[required()]}
parse={v => v}
/>
- </Stack>
- <Stack direction='row' gap={2}>
+ <AutocompleteInput
+ choices={dicts}
+ optionText="label"
+ label="table.field.asnOrder.type"
+ source="type"
+ optionValue="value"
+ parse={v => v}
+ />
<ReferenceInput
- source="wareId"
+ source="warehouseId"
reference="warehouse"
>
<AutocompleteInput
label="table.field.warehouseAreas.wareId"
optionText="name"
+ validate={[required()]}
filterToQuery={(val) => ({ name: val })}
/>
</ReferenceInput>
@@ -112,8 +118,6 @@
filterToQuery={(val) => ({ name: val })}
/>
</ReferenceInput>
- </Stack>
- <Stack direction='row' gap={2}>
<ReferenceInput
source="supplierId"
reference="companys"
@@ -125,8 +129,6 @@
filterToQuery={(val) => ({ name: val })}
/>
</ReferenceInput>
- </Stack>
- <Stack direction='row' gap={2}>
<SelectInput
label="table.field.warehouseAreas.flagMinus"
source="flagMinus"
@@ -136,8 +138,6 @@
{ id: 1, name: '鏄�' },
]}
/>
- </Stack>
- <Stack direction='row' gap={2}>
<SelectInput
label="table.field.warehouseAreas.flagLabelMange"
source="flagLabelMange"
@@ -147,8 +147,6 @@
{ id: 1, name: ' 鏄�' },
]}
/>
- </Stack>
- <Stack direction='row' gap={2}>
<SelectInput
label="table.field.warehouseAreas.flagMix"
source="flagMix"
@@ -159,9 +157,8 @@
]}
/>
</Stack>
-
</Grid>
- <Grid item xs={12} md={4}>
+ <Grid item xs={8} md={2}>
<Typography variant="h6" gutterBottom>
{translate('common.edit.title.common')}
</Typography>
--
Gitblit v1.9.1