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

skyouc

2025-04-15 a1f5c7974cb66943c2d0edd285902bc34c4294c8

 rsf-admin/src/page/waitPakin/WaitPakinList.jsx

@@ -91,7 +91,34 @@
    const translate = useTranslate();
    const [createDialog, setCreateDialog] = useState(false);
    const [siteDialog, setSiteDialog] = useState(false);
    const [source, setSource] = useState(false);
    const [drawerVal, setDrawerVal] = useState(false);

    const CreateTaskButton = () => {
        const record = useRecordContext();
        const notify = useNotify();
        const refresh = useRefresh();
        const { selectedIds, onUnselectItems, data } = useListContext();
        const rows = data.filter(map => selectedIds.includes(map.id));
        const createTask = () => {
            setSiteDialog(true)
            setSource(rows)
            refresh()
        }

        return (
            <>
                <Button onClick={() => createTask()} label={"toolbar.createTask"}>
                    <AddIcon />
                </Button>
            </>
        )
    }

    const BulkActionButtons = () => {

    }


    return (
        <Box display="flex">
@@ -120,12 +147,12 @@
            >
                <StyledDatagrid
                    preferenceKey='waitPakin'
                    bulkActionButtons={<Box> <Button label="ra.action.edit" onClick={() => {
                        setSiteDialog(true)
                    }} /> <BulkDeleteButton mutationMode={OPERATE_MODE} /></Box>}
                    bulkActionButtons={
                        <>
                            <CreateTaskButton />
                            <BulkDeleteButton mutationMode={OPERATE_MODE} />
                        </>}
                    rowClick='edit'
                    expand={false}
                    expandSingle={true}
                    omit={['id', 'createTime', 'createBy', 'memo']}
                >
                    <NumberField source="id" />
@@ -146,7 +173,7 @@
                    </WrapperField>
                </StyledDatagrid>
            </List>
            <SelectSiteModel open={siteDialog} setOpen={setSiteDialog} />
            <SelectSiteModel open={siteDialog} setOpen={setSiteDialog} source={source} />
            <WaitPakinCreate
                open={createDialog}
                setOpen={setCreateDialog}
@@ -163,34 +190,4 @@

export default WaitPakinList;

const CreateTaskButton = () => {
    const record = useRecordContext();
    const [siteDialog, setSiteDialog] = useState(false);
    const notify = useNotify();
    const refresh = useRefresh();
    const { selectedIds, onUnselectItems, data } = useListContext();

    const createTask = () => {
        // const rows = data.filter((item) => selectedIds.includes(item.id)) || [];
        // const res = await request.post(`/waitPakin/merge`, rows);
        // if (res?.data?.code === 200) {
        //     refresh();
        //     notify(res.data.msg);
        // } else {
        //     notify(res.data.msg);
        // }
        console.log('-------->');
        setSiteDialog(true)

    }
    // return (
    //     <ConfirmButton label={"toolbar.createTask"} startIcon={<TaskIcon />} onConfirm={createTask} />
    // )
    return (
        <>
            <Button onClick={() => createTask()} label={"toolbar.createTask"}>
                <AddIcon />
            </Button>
        </>
    )
}