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

skyouc

2025-03-26 1f5173508a63509985b27d94660f6ad251d18e6e

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

@@ -54,7 +54,10 @@
import PrintIcon from '@mui/icons-material/Print';
import request from '@/utils/request';
import BatchModal from './BatchModal';
import BatchGropuModal from './BatchGropuModal';
import PrintModal from './PrintModal';
import LinkIcon from '@mui/icons-material/Link';
import BindModal from './BindModal';

const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
    '& .css-1vooibu-MuiSvgIcon-root': {
@@ -84,10 +87,11 @@
        overflow: 'hidden',
        textOverflow: 'ellipsis',
        display: 'block',
        width: '100px',
        width: '200px',
    },
    '& .RaDatagrid-table': {
        width: '100%'
        width: '100%',
        position: 'relative',
    }
}));

@@ -156,7 +160,6 @@

    const [columns, setColumns] = useState([]);
    const refresh = useRefresh();
    const { refetch } = useListContext();

    useEffect(() => {
        getDynamicFields();
@@ -193,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>,
@@ -206,9 +209,9 @@
                    <TextField key="memo" source="memo" label="common.field.memo" sortable={false} />,
                ]
                const fields = data.map(el => <TextField key={el.fields} source={`extendFields.[${el.fields}]`} label={el.fieldsAlise} />)
                const opt = <WrapperField key="opt" cellClassName="opt" label="common.field.opt">
                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]);

@@ -238,8 +241,13 @@
                <StyledDatagrid
                    preferenceKey='matnr'
                    bulkActionButtons={<>
                        <BatchButton />
                        <PrintButton />
                        <BatchGroupButton />
                        <BatchWarnButton />
                        <BatchFlagButton />
                        <BatchStatusButton />
                        <BatchLevelButton />
                        <BindButton />
                        <BatchPrintButton />
                        <BulkDeleteButton mutationMode={OPERATE_MODE} />
                    </>}
                    rowClick={(id, resource, record) => false}
@@ -335,7 +343,7 @@
    )
}

const BatchButton = () => {
const BatchStatusButton = () => {
    const record = useRecordContext();
    const notify = useNotify();
    const refresh = useRefresh();
@@ -345,11 +353,106 @@

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

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

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


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

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

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

    )
}

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();
    const refresh = useRefresh();


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

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

            <BatchGropuModal
                open={createDialog}
                setOpen={setCreateDialog}
            />
@@ -358,8 +461,9 @@
    )
}

const PrintButton = () => {
const BatchPrintButton = () => {
    const record = useRecordContext();
    const { resource, selectedIds } = useListContext();
    const notify = useNotify();
    const refresh = useRefresh();

@@ -374,6 +478,52 @@
            <PrintModal
                open={createDialog}
                setOpen={setCreateDialog}
                rows={selectedIds}
            />
        </>
    )
}

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]}
            />
        </>
    )
}

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


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

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

            <BindModal
                open={createDialog}
                setOpen={setCreateDialog}
            />
        </>