From 7f26038db785f902097422bfeaccfd52767fc7e1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 03 四月 2025 09:42:49 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/basicInfo/loc/LocEdit.jsx | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/loc/LocEdit.jsx b/rsf-admin/src/page/basicInfo/loc/LocEdit.jsx
index 1505a82..5b1182e 100644
--- a/rsf-admin/src/page/basicInfo/loc/LocEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/loc/LocEdit.jsx
@@ -31,6 +31,7 @@
import MemoInput from "../../components/MemoInput";
import StatusSelectInput from "../../components/StatusSelectInput";
import request from '@/utils/request';
+import DictionarySelect from "../../components/DictionarySelect";
const FormToolbar = () => {
const { getValues } = useFormContext();
@@ -46,7 +47,11 @@
const LocEdit = () => {
const translate = useTranslate();
const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_loc_type')) || [];
+ const [warehouseId, setWrehouseId] = useState();
+ const warehouseChange = (val) => {
+ setWrehouseId(val)
+ }
return (
<Edit
@@ -54,6 +59,7 @@
mutationMode={EDIT_MODE}
actions={<CustomerTopToolBar />}
aside={<EditBaseAside />}
+ title={"menu.loc"}
>
<SimpleForm
shouldUnregister
@@ -78,6 +84,7 @@
label="table.field.loc.warehouseId"
optionText="name"
validate={[required()]}
+ onChange={warehouseChange}
filterToQuery={(val) => ({ name: val })}
/>
</ReferenceInput>
@@ -86,6 +93,7 @@
<ReferenceInput
source="areaId"
reference="warehouseAreas"
+ filter={{ warehouseId }}
>
<AutocompleteInput
label="table.field.loc.areaId"
@@ -114,7 +122,7 @@
validate={[required()]}
/> */}
<ReferenceArrayInput source="typeIds" reference="locType" >
- <SelectArrayInput label="table.field.loc.type" />
+ <SelectArrayInput label="table.field.loc.type" validate={[required()]} />
</ReferenceArrayInput>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
@@ -166,7 +174,15 @@
validate={required()}
/>
</Grid>
-
+ <Grid item xs={6} display="flex" gap={1}>
+ <DictionarySelect
+ label={translate("table.field.loc.useStatus")}
+ name="useStatus"
+ validate={[required()]}
+ size="small"
+ dictTypeCode="sys_loc_use_stas"
+ />
+ </Grid>
</Grid>
</Grid>
--
Gitblit v1.9.1