From 210988b56322931b9e0c91194f5c50f84b007688 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 20 三月 2025 14:21:34 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-admin/src/page/basicInfo/loc/LocEdit.jsx | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/loc/LocEdit.jsx b/rsf-admin/src/page/basicInfo/loc/LocEdit.jsx
index 4452ef1..1505a82 100644
--- a/rsf-admin/src/page/basicInfo/loc/LocEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/loc/LocEdit.jsx
@@ -10,6 +10,7 @@
DateInput,
SelectInput,
ReferenceInput,
+ SelectArrayInput,
ReferenceArrayInput,
AutocompleteInput,
SaveButton,
@@ -19,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';
@@ -28,6 +30,7 @@
import CustomerTopToolBar from "../../components/EditTopToolBar";
import MemoInput from "../../components/MemoInput";
import StatusSelectInput from "../../components/StatusSelectInput";
+import request from '@/utils/request';
const FormToolbar = () => {
const { getValues } = useFormContext();
@@ -43,6 +46,8 @@
const LocEdit = () => {
const translate = useTranslate();
const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_loc_type')) || [];
+
+
return (
<Edit
redirect="list"
@@ -99,7 +104,7 @@
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
- <AutocompleteInput
+ {/* <AutocompleteInput
choices={dicts}
source="type"
optionText="label"
@@ -107,7 +112,10 @@
optionValue="value"
parse={v => v}
validate={[required()]}
- />
+ /> */}
+ <ReferenceArrayInput source="typeIds" reference="locType" >
+ <SelectArrayInput label="table.field.loc.type" />
+ </ReferenceArrayInput>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<TextInput
@@ -158,6 +166,8 @@
validate={required()}
/>
</Grid>
+
+
</Grid>
</Grid>
<Grid item xs={12} md={2}>
--
Gitblit v1.9.1