From d97d7346ec794ffa34077160bb13424f2f84bc57 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 30 四月 2025 10:47:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupEdit.jsx | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupEdit.jsx b/rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupEdit.jsx
index b2d9744..c2e5226 100644
--- a/rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupEdit.jsx
@@ -47,8 +47,7 @@
const EditContent = ({ editRecord }) => {
const { resource } = useCreateContext();
const translate = useTranslate();
-
- const { update } = useFieldArray({ name: "parCode" })
+ const formContext = useFormContext()
const pChange = (val) => {
if (val > 0) {
@@ -61,9 +60,9 @@
const http = async (val) => {
const res = await request.post(`/matnrGroup/page`, { id: val });
const code = res.data.data.records[0].code || ''
- // setpCode(code)
- editRecord.parCode = code;
- update(code)
+
+ formContext.setValue('parCode', code)
+
}
return (
<Grid container rowSpacing={2} columnSpacing={2}>
@@ -74,16 +73,14 @@
isTranslate
resource={resource}
onChange={(e) => pChange(e.target.value)}
+ required
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.matnrGroup.parCode"
- validate={[required()]}
source="parCode"
- value={editRecord?.parCode}
- parse={v => v}
- disabled
+ readOnly
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
@@ -99,7 +96,7 @@
label="table.field.matnrGroup.code"
source="code"
parse={v => v}
- disabled={!!editRecord}
+ readOnly={!!editRecord}
/>
</Grid>
</Grid>
@@ -180,7 +177,7 @@
disableRestoreFocus
maxWidth="md" // 'xs' | 'sm' | 'md' | 'lg' | 'xl'
>
- <Form record={editRecord} onSubmit={onSubmit}>
+ <Form record={editRecord || {}} onSubmit={onSubmit}>
<DialogTitle id="form-dialog-title" sx={{
position: 'sticky',
top: 0,
--
Gitblit v1.9.1