#优化修改 1. 再次收货，先收货30再次收货30累加才对 2. 批次号整个流程走不通 3. 任务工作档排序，最新的永远在最上面

skyouc

2025-04-30 7f9fa6378436a22a6b7df8c8ddb3af83f42c7d8b

 rsf-admin/src/page/system/dicts/dictData/DictDataEdit.jsx

@@ -19,10 +19,12 @@
    required,
    useRecordContext,
    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";
@@ -30,11 +32,14 @@
import StatusSelectInput from "../../../components/StatusSelectInput";

const FormToolbar = () => {
    const { getValues } = useFormContext();

    const form = useFormContext();
    const { record, isPending } = useEditContext();
    const redirect = useRedirect();
    return (
        <Toolbar sx={{ justifyContent: 'space-between' }}>
            <SaveButton />
        <Toolbar sx={{ justifyContent: 'end' }}>
            <SaveButton type="button" mutationOptions={{onSuccess:() => {
                redirect('/dictType/' + record?.dictTypeId)
            } }}/>
            <DeleteButton mutationMode="optimistic" />
        </Toolbar>
    )
@@ -43,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={{}}
@@ -68,8 +71,8 @@
                            <TextInput
                                label="table.field.dictData.dictTypeId"
                                source="dictTypeId"
                                readOnly
                                parse={v => v}
                                autoFocus
                                validate={required()}
                            />
                        </Stack>
@@ -77,6 +80,7 @@
                            <TextInput
                                label="table.field.dictData.dictTypeCode"
                                source="dictTypeCode"
                                readOnly
                                parse={v => v}
                                validate={required()}
                            />
@@ -93,8 +97,8 @@
                            <TextInput
                                label="table.field.dictData.label"
                                source="label"
                                parse={v => v}
                                validate={required()}
                                parse={v => v}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
@@ -103,13 +107,13 @@
                                source="sort"
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                        {/* <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.dictData.color"
                                source="color"
                                parse={v => v}
                            />
                        </Stack>
                        </Stack> */}

                    </Grid>
                    <Grid item xs={12} md={4}>