Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

verou

2025-04-02 2b35183407eb7b1b1524f7b101f1098d9caea042

 rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx

@@ -196,7 +196,7 @@
                    <NumberField key="stagn" source="stagn" label="table.field.matnr.stagn" />,
                    <NumberField key="valid" source="valid" label="table.field.matnr.valid" />,
                    <NumberField key="validWarn" source="validWarn" label="table.field.matnr.validWarn" />,
                    <NumberField key="flagCheck" source="flagCheck" label="table.field.matnr.flagCheck" />,
                    <BooleanField key="flagCheck" source="flagCheck" label="table.field.matnr.flagCheck" sortable={false} />,
                    <ReferenceField key="updateBy" source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
                        <TextField source="nickname" />
                    </ReferenceField>,
@@ -211,7 +211,7 @@
                const fields = data.map(el => <TextField key={el.fields} source={`extendFields.[${el.fields}]`} label={el.fieldsAlise} />)
                const opt = <WrapperField key="opt" cellClassName="fixed" className="fixed" label="common.field.opt">
                    <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
                    <EnableButton />
                    <PrintButton />
                </WrapperField>
                setColumns([...arr, ...fields, opt]);

@@ -242,10 +242,12 @@
                    preferenceKey='matnr'
                    bulkActionButtons={<>
                        <BatchGroupButton />
                        <BatchWarnButton />
                        <BatchFlagButton />
                        <BatchStatusButton />
                        <BatchLevelButton />
                        <BindButton />
                        <PrintButton />
                        <BatchPrintButton />
                        <BulkDeleteButton mutationMode={OPERATE_MODE} />
                    </>}
                    rowClick={(id, resource, record) => false}
@@ -388,6 +390,54 @@
    )
}

const BatchWarnButton = () => {
    const record = useRecordContext();
    const notify = useNotify();
    const refresh = useRefresh();


    const [createDialog, setCreateDialog] = useState(false);

    return (
        <>
            <Button onClick={() => setCreateDialog(true)} label={"toolbar.batchValidWarn"}>
                <EditIcon />
            </Button>

            <BatchModal
                open={createDialog}
                setOpen={setCreateDialog}
                fieldType={'validWarn'}
            />
        </>

    )
}

const BatchFlagButton = () => {
    const record = useRecordContext();
    const notify = useNotify();
    const refresh = useRefresh();


    const [createDialog, setCreateDialog] = useState(false);

    return (
        <>
            <Button onClick={() => setCreateDialog(true)} label={"toolbar.batchFlagCheck"}>
                <EditIcon />
            </Button>

            <BatchModal
                open={createDialog}
                setOpen={setCreateDialog}
                fieldType={'flagCheck'}
            />
        </>

    )
}

const BatchGroupButton = () => {
    const record = useRecordContext();
    const notify = useNotify();
@@ -411,7 +461,7 @@
    )
}

const PrintButton = () => {
const BatchPrintButton = () => {
    const record = useRecordContext();
    const { resource, selectedIds } = useListContext();
    const notify = useNotify();
@@ -434,6 +484,29 @@
    )
}

const PrintButton = () => {
    const record = useRecordContext();

    const notify = useNotify();
    const refresh = useRefresh();

    const [createDialog, setCreateDialog] = useState(false);

    return (
        <>
            <Button color="secondary" onClick={() => setCreateDialog(true)} label={"toolbar.print"}>
                <PrintIcon />
            </Button>

            <PrintModal
                open={createDialog}
                setOpen={setCreateDialog}
                rows={[record.id]}
            />
        </>
    )
}

const BindButton = () => {
    const record = useRecordContext();
    const notify = useNotify();