From c0a87b9244e1521c76b8a0dc70b922f6fc3e30a1 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期四, 17 七月 2025 16:35:23 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-admin/src/page/basicInfo/loc/LocCreate.jsx | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-) diff --git a/rsf-admin/src/page/basicInfo/loc/LocCreate.jsx b/rsf-admin/src/page/basicInfo/loc/LocCreate.jsx index 9b368c1..23465f9 100644 --- a/rsf-admin/src/page/basicInfo/loc/LocCreate.jsx +++ b/rsf-admin/src/page/basicInfo/loc/LocCreate.jsx @@ -32,6 +32,7 @@ import StatusSelectInput from "../../components/StatusSelectInput"; import MemoInput from "../../components/MemoInput"; import request from '@/utils/request'; +import DictionarySelect from "../../components/DictionarySelect"; const LocCreate = (props) => { const { open, setOpen } = props; @@ -153,7 +154,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}> @@ -264,8 +265,28 @@ validate={required()} /> </Grid> */} - - + <Grid item xs={6} display="flex" gap={1}> + <DictionarySelect + label={translate("table.field.loc.useStatus")} + name="useStatus" + size="small" + validate={[required()]} + dictTypeCode="sys_loc_use_stas" + /> + {/* <ReferenceInput + source="useStatus" + reference="dictData" + filter={{ dictTypeCode: 'sys_loc_use_stas' }} + > + <AutocompleteInput + label="table.field.loc.useStatus" + optionText="label" + optionValue="value" + parse={v => v} + validate={[required()]} + /> + </ReferenceInput> */} + </Grid> <Grid item xs={6} display="flex" gap={1}> -- Gitblit v1.9.1