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 | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx b/rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx
index f32806c..175500a 100644
--- a/rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx
+++ b/rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx
@@ -63,7 +63,7 @@
<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"
@@ -71,7 +71,7 @@
validate={[required()]}
autoFocus
/>
- </Stack>
+ </Stack> */}
<Stack direction='row' gap={2}>
<TextInput
label="table.field.warehouseAreas.name"
@@ -91,22 +91,29 @@
<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"
optionText="name"
- validate={[required()]}
filterToQuery={(val) => ({ name: val })}
/>
</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
@@ -115,7 +122,7 @@
validate={[required()]}
choices={[
{ id: 0, name: '鍚�' },
- { id: 1, name: '鏄�' },
+ { id: 1, name: '鏄�' },
]}
/>
</Stack>
@@ -126,7 +133,7 @@
validate={[required()]}
choices={[
{ id: 0, name: ' 鍚�' },
- { id: 1, name: ' 鏄�' },
+ { id: 1, name: ' 鏄�' },
]}
/>
</Stack>
@@ -137,7 +144,7 @@
validate={[required()]}
choices={[
{ id: 0, name: '鍚�' },
- { id: 1, name: '鏄�' },
+ { id: 1, name: '鏄�' },
]}
/>
</Stack>
--
Gitblit v1.9.1