From f00f83d2b2a868e518b78c76d3e11bc01aabffa7 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期六, 22 三月 2025 15:38:35 +0800 Subject: [PATCH] Merge branch 'front' of http://47.97.1.152:5880/r/wms-master into front --- rsf-admin/src/page/basicInfo/loc/LocEdit.jsx | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/rsf-admin/src/page/basicInfo/loc/LocEdit.jsx b/rsf-admin/src/page/basicInfo/loc/LocEdit.jsx index 89ad805..3c32e39 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(); @@ -120,7 +121,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}> @@ -172,7 +173,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