From d0c039c4924ab4348d5a44738f8359ed8f622a74 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期一, 07 四月 2025 17:05:06 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx
index c0d582a..ffec017 100644
--- a/rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx
@@ -22,7 +22,7 @@
useNotify,
} from 'react-admin';
import PropTypes from 'prop-types';
-import { useWatch, useFormContext } from "react-hook-form";
+import { useWatch, useFormContext, useForm, useFormState } from "react-hook-form";
import { Stack, Grid, Box, Typography, Tabs, Tab, } from '@mui/material';
import * as Common from '@/utils/common';
import { EDIT_MODE, REFERENCE_INPUT_PAGESIZE } from '@/config/setting';
@@ -33,7 +33,7 @@
import TreeSelectInput from "@/page/components/TreeSelectInput";
import request from '@/utils/request';
const FormToolbar = () => {
- const { getValues } = useFormContext();
+ const { getValues } = useFormState();
return (
<Toolbar sx={{ justifyContent: 'space-between' }}>
<SaveButton />
@@ -74,6 +74,7 @@
const MatnrEdit = () => {
const translate = useTranslate();
const [value, setValue] = React.useState(0);
+ const form = useForm();
const notify = useNotify();
const [dynamicFields, setDynamicFields] = useState([]);
@@ -87,6 +88,7 @@
} = await request.get("/fields/enable/list");
if (code === 200) {
setDynamicFields(data || [])
+
} else {
notify(msg);
@@ -269,7 +271,7 @@
<TextInput
label={item.fieldsAlise}
source={item.fields}
- validate={required()}
+ validate={item.unique === 1 ? required() : false}
/>
</Grid>
)
--
Gitblit v1.9.1