From 5ddf26e390c8ba6e35dfbf93502c9a46f1bc356c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 19 三月 2025 11:35:52 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx b/rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx
index a9a513e..175500a 100644
--- a/rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx
+++ b/rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx
@@ -63,18 +63,20 @@
<Typography variant="h6" gutterBottom>
{translate('common.edit.title.main')}
</Typography>
- <Stack direction='row' gap={2}>
+ {/* <Stack direction='row' gap={2}>
<TextInput
label="table.field.warehouseAreas.uuid"
source="uuid"
parse={v => v}
+ validate={[required()]}
autoFocus
/>
- </Stack>
+ </Stack> */}
<Stack direction='row' gap={2}>
<TextInput
label="table.field.warehouseAreas.name"
source="name"
+ validate={[required()]}
parse={v => v}
/>
</Stack>
@@ -82,14 +84,16 @@
<TextInput
label="table.field.warehouseAreas.code"
source="code"
+ validate={[required()]}
parse={v => v}
/>
</Stack>
<Stack direction='row' gap={2}>
<ReferenceInput
source="shipperId"
- reference="shipper"
+ reference="companys"
perPage={REFERENCE_INPUT_PAGESIZE}
+ filter={{ type: 'shipper' }}
>
<AutocompleteInput
label="table.field.warehouseAreas.shipperId"
@@ -99,18 +103,26 @@
</ReferenceInput>
</Stack>
<Stack direction='row' gap={2}>
- <NumberInput
- label="table.field.warehouseAreas.supplierId"
+ <ReferenceInput
source="supplierId"
- />
+ reference="companys"
+ filter={{ type: 'supplier' }}
+ >
+ <AutocompleteInput
+ label="table.field.warehouseAreas.supplierId"
+ optionText="name"
+ filterToQuery={(val) => ({ name: val })}
+ />
+ </ReferenceInput>
</Stack>
<Stack direction='row' gap={2}>
<SelectInput
label="table.field.warehouseAreas.flagMinus"
source="flagMinus"
+ validate={[required()]}
choices={[
{ id: 0, name: '鍚�' },
- { id: 1, name: '鏄�' },
+ { id: 1, name: '鏄�' },
]}
/>
</Stack>
@@ -118,22 +130,22 @@
<SelectInput
label="table.field.warehouseAreas.flagLabelMange"
source="flagLabelMange"
+ validate={[required()]}
choices={[
{ id: 0, name: ' 鍚�' },
- { id: 1, name: ' 鏄�' },
+ { id: 1, name: ' 鏄�' },
]}
- validate={required()}
/>
</Stack>
<Stack direction='row' gap={2}>
<SelectInput
label="table.field.warehouseAreas.flagMix"
source="flagMix"
+ validate={[required()]}
choices={[
{ id: 0, name: '鍚�' },
- { id: 1, name: '鏄�' },
+ { id: 1, name: '鏄�' },
]}
- validate={required()}
/>
</Stack>
--
Gitblit v1.9.1