From e6af1100ab9b98b142ce2e0b158f5416f499628b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 22 三月 2025 15:38:08 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/container/ContainerEdit.jsx | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/rsf-admin/src/page/container/ContainerEdit.jsx b/rsf-admin/src/page/container/ContainerEdit.jsx
index d4496c9..d31de24 100644
--- a/rsf-admin/src/page/container/ContainerEdit.jsx
+++ b/rsf-admin/src/page/container/ContainerEdit.jsx
@@ -42,6 +42,7 @@
const ContainerEdit = () => {
const translate = useTranslate();
+ const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_container_type')) || [];
return (
<Edit
@@ -63,7 +64,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.container.code"
source="code"
@@ -71,7 +72,7 @@
autoFocus
validate={required()}
/>
- </Stack>
+ </Stack> */}
<Stack direction='row' gap={2}>
<TextInput
label="table.field.container.name"
@@ -80,10 +81,14 @@
/>
</Stack>
<Stack direction='row' gap={2}>
- <NumberInput
+ <AutocompleteInput
+ choices={dicts}
+ optionText="label"
label="table.field.container.typeId"
- source="typeId"
- />
+ source="type"
+ optionValue="value"
+ parse={v => v}
+ validate={[required()]} />
</Stack>
<Stack direction='row' gap={2}>
<NumberInput
@@ -95,7 +100,7 @@
<Stack direction='row' gap={2}>
<NumberInput
label="table.field.container.lenght"
- source="lenght"
+ source="length"
/>
</Stack>
<Stack direction='row' gap={2}>
@@ -135,11 +140,19 @@
/>
</Stack>
<Stack direction='row' gap={2}>
- <NumberInput
- label="table.field.container.panrentId"
+ <ReferenceInput
source="panrentId"
- />
+ reference="container"
+ >
+ <AutocompleteInput
+ label="table.field.container.panrentId"
+ optionText="name"
+ filterToQuery={(val) => ({ name: val })}
+ />
+ </ReferenceInput>
+
</Stack>
+
<Stack direction='row' gap={2}>
<DateInput
label="table.field.container.vaildTime"
@@ -152,7 +165,7 @@
source="flagRycle"
choices={[
{ id: 1, name: '鏄�' },
- { id: 0, name: '鍚�' },
+ { id: 0, name: '鍚�' },
]}
validate={required()}
/>
@@ -163,7 +176,7 @@
source="flagLogic"
choices={[
{ id: 1, name: '鏄�' },
- { id: 0, name: '鍚�' },
+ { id: 0, name: '鍚�' },
]}
validate={required()}
/>
--
Gitblit v1.9.1