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

skyouc

4 天以前 1de6b39bfe3967916dcab8122be0d69fbaba8cca

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

@@ -58,7 +58,7 @@
        width: 90
    },
    '& .opt': {
        width: 180
        width: 210
    },
}));

@@ -101,6 +101,7 @@
        const createTask = () => {
            setSiteDialog(true)
            setSource(rows)
            onUnselectItems()
            refresh()
        }

@@ -113,9 +114,26 @@
        )
    }

    const BulkActionButtons = () => {
    const CreateTaskRowButton = () => {
        const record = useRecordContext();
        const refresh = useRefresh();

        const createTask = (event) => {
            event.stopPropagation();
            setSiteDialog(true)
            setSource([record])
            refresh()
        }

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

    return (
        <Box display="flex">
            <List
@@ -129,7 +147,7 @@
                    marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
                }}
                title={"menu.waitPakin"}
                empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
                empty={false}
                filters={filters}
                sort={{ field: "create_time", order: "desc" }}
                actions={(
@@ -146,9 +164,9 @@
                    bulkActionButtons={
                        <>
                            <CreateTaskButton />
                            <BulkDeleteButton mutationMode={OPERATE_MODE} />
                            {/* <BulkDeleteButton mutationMode={OPERATE_MODE} /> */}
                        </>}
                    rowClick='edit'
                    rowClick={false}
                    omit={['id', 'createTime', 'createBy', 'memo']}
                >
                    <NumberField source="id" />
@@ -163,7 +181,8 @@
                    <TextField source="memo" label="common.field.memo" sortable={false} />
                    <WrapperField cellClassName="opt" label="common.field.opt">
                        <EditButton label="toolbar.detail" sx={{ padding: '1px', fontSize: '.75rem' }} />
                        {/* <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} /> */}
                        <CreateTaskRowButton />
                        <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
                    </WrapperField>
                </StyledDatagrid>
            </List>
@@ -185,3 +204,5 @@
export default WaitPakinList;