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 | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/loc/LocEdit.jsx b/rsf-admin/src/page/basicInfo/loc/LocEdit.jsx
index f4f7f61..5b1182e 100644
--- a/rsf-admin/src/page/basicInfo/loc/LocEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/loc/LocEdit.jsx
@@ -20,6 +20,7 @@
required,
useRecordContext,
DeleteButton,
+ useNotify,
} from 'react-admin';
import { useWatch, useFormContext } from "react-hook-form";
import { Stack, Grid, Box, Typography } from '@mui/material';
@@ -29,6 +30,8 @@
import CustomerTopToolBar from "../../components/EditTopToolBar";
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();
@@ -44,12 +47,19 @@
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
redirect="list"
mutationMode={EDIT_MODE}
actions={<CustomerTopToolBar />}
aside={<EditBaseAside />}
+ title={"menu.loc"}
>
<SimpleForm
shouldUnregister
@@ -74,6 +84,7 @@
label="table.field.loc.warehouseId"
optionText="name"
validate={[required()]}
+ onChange={warehouseChange}
filterToQuery={(val) => ({ name: val })}
/>
</ReferenceInput>
@@ -82,6 +93,7 @@
<ReferenceInput
source="areaId"
reference="warehouseAreas"
+ filter={{ warehouseId }}
>
<AutocompleteInput
label="table.field.loc.areaId"
@@ -110,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}>
@@ -162,6 +174,16 @@
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>
<Grid item xs={12} md={2}>
--
Gitblit v1.9.1