#

zjj

2025-05-23 0a961cda12ec39dc0e33fc9148f902a7bed7bd76

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

@@ -18,13 +18,14 @@
    TextField,
    NumberField,
    DateField,
    AutocompleteInput,
    BooleanField,
    TextInput,
    DateInput,
    SelectInput,
    NumberInput,

    Button,
    EditButton,
} from 'react-admin';
import { Box, Typography, Card, Stack, Drawer } from '@mui/material';
import { styled } from '@mui/material/styles';
@@ -39,8 +40,10 @@
import CancelIcon from '@mui/icons-material/Cancel';
import PageDrawer from "../components/PageDrawer";
import MyField from "../components/MyField";
import ConfirmButton from "../components/ConfirmButton";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
import ColorizeOutlinedIcon from '@mui/icons-material/ColorizeOutlined';

const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
    '& .css-1vooibu-MuiSvgIcon-root': {
@@ -56,40 +59,46 @@
    },
}));

const filters = [
    <SearchInput source="condition" alwaysOn />,
    <DateInput label='common.time.after' source="timeStart" />,
    <DateInput label='common.time.before' source="timeEnd" />,
    <TextInput source="taskCode" label="table.field.task.taskCode" />,
    <NumberInput source="taskStatus" label="table.field.task.taskStatus" />,
    <NumberInput source="taskType" label="table.field.task.taskType" />,
    <TextInput source="orgLoc" label="table.field.task.orgLoc" />,
    <TextInput source="orgSite" label="table.field.task.orgSite" />,
    <TextInput source="targLoc" label="table.field.task.targLoc" />,
    <TextInput source="targSite" label="table.field.task.targSite" />,
    <TextInput source="barcode" label="table.field.task.barcode" />,
    <TextInput source="robotCode" label="table.field.task.robotCode" />,
    <NumberInput source="exceStatus" label="table.field.task.exceStatus" />,
    <TextInput source="expDesc" label="table.field.task.expDesc" />,
    <NumberInput source="sort" label="table.field.task.sort" />,
    <TextInput source="expCode" label="table.field.task.expCode" />,
    <DateInput source="startTime" label="table.field.task.startTime" />,
    <DateInput source="endTime" label="table.field.task.endTime" />,
    <TextInput label="common.field.memo" source="memo" />,
    <SelectInput
        label="common.field.status"
        source="status"
        choices={[
            { id: '1', name: 'common.enums.statusTrue' },
            { id: '0', name: 'common.enums.statusFalse' },
        ]}
        resettable
    />,
]

const TaskList = () => {
const TaskList = (props) => {
    const translate = useTranslate();
    const [drawerVal, setDrawerVal] = useState(false);
    const dict = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_warehouse_type')) || [];

    const filters = [
        <SearchInput source="condition" alwaysOn />,
        <DateInput label='common.time.after' source="timeStart" />,
        <DateInput label='common.time.before' source="timeEnd" />,
        <TextInput source="taskCode" label="table.field.task.taskCode" />,
        <NumberInput source="taskStatus" label="table.field.task.taskStatus" />,
        <NumberInput source="taskType" label="table.field.task.taskType" />,
        <AutocompleteInput choices={dict} optionText='label' optionValue="value" source="warehType" label="table.field.task.warehType" />,
        <TextInput source="orgLoc" label="table.field.task.orgLoc" />,
        <TextInput source="orgSite" label="table.field.task.orgSite" />,
        <TextInput source="targLoc" label="table.field.task.targLoc" />,
        <TextInput source="targSite" label="table.field.task.targSite" />,
        <TextInput source="barcode" label="table.field.task.barcode" />,
        <TextInput source="robotCode" label="table.field.task.robotCode" />,
        <NumberInput source="exceStatus" label="table.field.task.exceStatus" />,
        <TextInput source="expDesc" label="table.field.task.expDesc" />,
        <NumberInput source="sort" label="table.field.task.sort" />,
        <TextInput source="expCode" label="table.field.task.expCode" />,
        <DateInput source="startTime" label="table.field.task.startTime" />,
        <DateInput source="endTime" label="table.field.task.endTime" />,
        <TextInput label="common.field.memo" source="memo" />,
        <SelectInput
            label="common.field.status"
            source="status"
            choices={[
                { id: '1', name: 'common.enums.statusTrue' },
                { id: '0', name: 'common.enums.statusFalse' },
            ]}
            resettable
        />,
    ]



    return (
        <Box display="flex">
            <List
@@ -104,7 +113,7 @@
                title={"menu.task"}
                empty={false}
                filters={filters}
                sort={{ field: "sort", order: "desc" }}
                sort={{ field: "create_time", order: "desc" }}
                actions={(
                    <TopToolbar>
                        <FilterButton />
@@ -131,6 +140,7 @@
                    <TextField source="taskCode" label="table.field.task.taskCode" />
                    <NumberField source="taskStatus$" label="table.field.task.taskStatus" />
                    <NumberField source="taskType$" label="table.field.task.taskType" />
                    <NumberField source="warehType$" label="table.field.task.warehType" />
                    <TextField source="orgLoc" label="table.field.task.orgLoc" />
                    <TextField source="orgSite" label="table.field.task.orgSite" />
                    <TextField source="targLoc" label="table.field.task.targLoc" />
@@ -147,10 +157,11 @@
                    <DateField source="createTime" label="common.field.createTime" showTime />
                    {/* <BooleanField source="statusBool" label="common.field.status" sortable={false} /> */}
                    <TextField source="memo" label="common.field.memo" sortable={false} />
                    <WrapperField cellClassName="opt" label="common.field.opt">
                    <WrapperField cellClassName="opt" label="common.field.opt" onClick={(e) => e.stopPropagation()} >
                        <EditButton label="toolbar.detail" />
                        <DoneButton sx={{ padding: '1px', fontSize: '.75rem' }} ></DoneButton>
                        <CancelButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
                        <SetTopButton sx={{ padding: '1px', fontSize: '.75rem' }} ></SetTopButton>
                        <PickButton />
                    </WrapperField>
                </StyledDatagrid>
            </List>
@@ -168,16 +179,40 @@


/**
 * 拣料出库
 * @returns 
 */
const PickButton = () => {
    const record = useRecordContext();
    const notify = useNotify();
    const refresh = useRefresh();

    const pickClick = async () => {
        const { data: { code, data, msg } } = await request.post(`/task/pick/` + record.id);
        if (code === 200) {
            notify(msg);
            refresh();
        } else {
            notify(msg);
        }
    }

    return (
        record?.taskStatus == 198 ? <ConfirmButton label={"toolbar.pick"} startIcon={<ColorizeOutlinedIcon />} onConfirm={pickClick} /> : <></>
    )
}


/**
 * 完成操作
 * @returns 
 */
const DoneButton = () => {
const DoneButton = (props) => {
    const record = useRecordContext();
    const notify = useNotify(); 
    const notify = useNotify();
    const refresh = useRefresh();
    const clickComplete = () => {
        console.log('------->');
        completeTask([record])
        completeTask(record)
    };
    //完成任务
    const completeTask = async (row) => {
@@ -190,11 +225,7 @@
        }
    }
    return (
        <Button
            onClick={clickComplete}
            label="toolbar.complete">
            <TaskAltIcon />
        </Button>
        ((record?.taskStatus < 98) || (record?.taskType > 101 && record?.taskStatus < 198)) ? (<ConfirmButton label={"toolbar.complete"} color="secondary" startIcon={<TaskAltIcon />} onConfirm={clickComplete} />) : (<></>)
    )
}

@@ -206,11 +237,12 @@
    const record = useRecordContext();
    const notify = useNotify();
    const refresh = useRefresh();
    const clickCancel = () => {
    const clickCancel = (event) => {
        event.stopPropagation();
        cancleTask(record)
    };
    //取消任务
    const cancleTask = async (row) => { 
    const cancleTask = async (row) => {
        console.log(row);
        const { data: { code, data, msg } } = await request.post(`/task/remove/` + row.id);
        if (code === 200) {
@@ -221,11 +253,14 @@
        }
    }
    return (
        <Button
            onClick={clickCancel}
            label="toolbar.cancel">
            <CancelIcon />
        </Button>
        record.taskStatus === 1 ?
            <Button
                onClick={clickCancel}
                label="toolbar.cancel">
                <CancelIcon />
            </Button>
            :
            <></>
    )
}
/**
@@ -236,7 +271,8 @@
    const record = useRecordContext();
    const notify = useNotify();
    const refresh = useRefresh();
    const clickTop = () => {
    const clickTop = (event) => {
        event.stopPropagation();
        topTask(record)
    };
    //置顶任务