From 014270352f8e19b51bbb4367ae2ff256050a30a2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 22 四月 2025 14:03:42 +0800
Subject: [PATCH] #修改优化 1. 字典优化修改 2. 编码规则优化 3. 出库单编码生成为空问题修复
---
rsf-admin/src/page/system/dicts/dictData/DictDataEdit.jsx | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/rsf-admin/src/page/system/dicts/dictData/DictDataEdit.jsx b/rsf-admin/src/page/system/dicts/dictData/DictDataEdit.jsx
index d04c3e1..55f78a6 100644
--- a/rsf-admin/src/page/system/dicts/dictData/DictDataEdit.jsx
+++ b/rsf-admin/src/page/system/dicts/dictData/DictDataEdit.jsx
@@ -21,10 +21,10 @@
DeleteButton,
useNotify,
useRedirect,
+ useEditContext,
} from 'react-admin';
import { useWatch, useFormContext } from "react-hook-form";
import { Stack, Grid, Box, Typography } from '@mui/material';
-import * as Common from '@/utils/common';
import { EDIT_MODE, REFERENCE_INPUT_PAGESIZE } from '@/config/setting';
import EditBaseAside from "../../../components/EditBaseAside";
import CustomerTopToolBar from "../../../components/EditTopToolBar";
@@ -33,17 +33,13 @@
const FormToolbar = () => {
const form = useFormContext();
+ const { record, isPending } = useEditContext();
const redirect = useRedirect();
- const notify = useNotify();
- const onSuccess = (data) => {
- const { dictTypeId, dictTypeCode } = data
- notify(`淇敼鎴愬姛!`);
- redirect(`/dictData?dictTypeId=${dictTypeId}&code=${dictTypeCode}`);
- }
-
return (
- <Toolbar sx={{ justifyContent: 'space-between' }}>
- <SaveButton type="button" mutationOptions={{ onSuccess }} />
+ <Toolbar sx={{ justifyContent: 'end' }}>
+ <SaveButton type="button" mutationOptions={{onSuccess:() => {
+ redirect('/dictType/' + record?.dictTypeId)
+ } }}/>
<DeleteButton mutationMode="optimistic" />
</Toolbar>
)
@@ -52,17 +48,15 @@
const DictDataEdit = () => {
const translate = useTranslate();
-
return (
<Edit
redirect="list"
+ resource="dictData"
mutationMode={EDIT_MODE}
actions={<CustomerTopToolBar backPrevious={true} />}
aside={<EditBaseAside />}
>
<SimpleForm
- shouldUnregister
- warnWhenUnsavedChanges
toolbar={<FormToolbar />}
mode="onTouched"
defaultValues={{}}
@@ -77,8 +71,8 @@
<TextInput
label="table.field.dictData.dictTypeId"
source="dictTypeId"
+ readOnly
parse={v => v}
- autoFocus
validate={required()}
/>
</Stack>
@@ -86,6 +80,7 @@
<TextInput
label="table.field.dictData.dictTypeCode"
source="dictTypeCode"
+ readOnly
parse={v => v}
validate={required()}
/>
--
Gitblit v1.9.1