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

skyouc

7 天以前 7e97f2a6bdce6997939db8882191665fd42ce2c5

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

 rsf-admin/src/page/task/TaskList.jsx

@@ -124,7 +124,7 @@
                title={"menu.task"}
                empty={false}
                filters={filters}
                sort={{ field: "create_time", order: "desc" }}
                sort={{ field: "sort", order: "desc" }}
                actions={(
                    <TopToolbar>
                        <FilterButton />
@@ -145,7 +145,7 @@
                    rowClick={false}
                    expand={false}
                    expandSingle={true}
                    omit={['id', 'createTime', 'createBy', 'memo', 'robotCode', 'exceStatus', 'expDesc', 'expCode', 'status', 'sort']}
                    omit={['id', 'createTime', 'createBy', 'memo', 'robotCode', 'exceStatus', 'expDesc', 'expCode', 'status']}
                >
                    <NumberField source="id" />
                    <TextField source="taskCode" label="table.field.task.taskCode" />
@@ -174,6 +174,7 @@
                        <CancelButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
                        <CheckButton />
                        <PickButton />
                        <SetTopButton />
                    </WrapperField>
                </StyledDatagrid>
            </List>
@@ -286,7 +287,7 @@
        }
    }
    return (
        (record.taskStatus == 1 || record.taskStatus == 101) && (record.taskType == 1 || record.taskType == 101 || record.taskType == 10 || record.taskType == 103 || record.taskType == 11 ) ?
        (record.taskStatus == 1 || record.taskStatus == 101) && (record.taskType == 1 || record.taskType == 101 || record.taskType == 10 || record.taskType == 103 || record.taskType == 11) ?
            <Button
                onClick={clickCancel}
                label="toolbar.cancel">
@@ -319,11 +320,14 @@
        }
    }
    return (
        <Button
            onClick={clickTop}
            label="toolbar.top">
            <AlignVerticalTopIcon />
        </Button>
        (record.taskStatus == 1 || record.taskStatus == 101) && (record.taskType == 1 || record.taskType == 101 || record.taskType == 10 || record.taskType == 103 || record.taskType == 11) ?
            <Button
                onClick={clickTop}
                label="toolbar.top">
                <AlignVerticalTopIcon />
            </Button>
        :
        <></>
    )
}