From a6991a33e18f69264f93a63459a4b64ea799295a Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 05 八月 2025 13:02:24 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupEdit.jsx | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupEdit.jsx b/rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupEdit.jsx index 9a9b31b..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,8 +60,9 @@ const http = async (val) => { const res = await request.post(`/matnrGroup/page`, { id: val }); const code = res.data.data.records[0].code || '' - editRecord && (editRecord.parCode = code); - update(code) + + formContext.setValue('parCode', code) + } return ( <Grid container rowSpacing={2} columnSpacing={2}> @@ -73,15 +73,13 @@ 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} readOnly /> </Grid> @@ -133,7 +131,6 @@ const onSubmit = (data) => { const _params = { ...data }; if (editRecord) { - debugger if (_params.parentId === editRecord.id) { notify('common.response.dataError', { type: 'error' }); return; @@ -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