保存一个版本

zhang

2025-07-25 443e32fec6aec9dfa2ca802246950dc3c36e6251

 zy-acs-flow/src/page/task/TaskList.jsx

@@ -89,14 +89,14 @@
    <ReferenceInput source="taskType" label="table.field.task.taskType" reference="taskType">
        <AutocompleteInput label="table.field.task.taskType" optionText="name" filterToQuery={(val) => ({ name: val })} />
    </ReferenceInput>,
    <ReferenceInput source="agvId" label="table.field.task.agvId" reference="agv">
    <ReferenceInput source="agvId" label="table.field.task.agvId" reference="agv" alwaysOn>
        <AutocompleteInput label="table.field.task.agvId" optionText="uuid" filterToQuery={(val) => ({ uuid: val })} />
    </ReferenceInput>,
    // <DateInput source="ioTime" label="table.field.task.ioTime" />,
    // <DateInput source="startTime" label="table.field.task.startTime" />,
    // <DateInput source="endTime" label="table.field.task.endTime" />,
    // <DateInput source="errTime" label="table.field.task.errTime" />,
    <ReferenceInput source="oriSta" label="table.field.task.oriSta" reference="sta" alwaysOn>
    <ReferenceInput source="oriSta" label="table.field.task.oriSta" reference="sta">
        <AutocompleteInput label="table.field.task.oriSta" optionText="staNo" filterToQuery={(val) => ({ staNo: val })} />
    </ReferenceInput>,
    <ReferenceInput source="oriLoc" label="table.field.task.oriLoc" reference="loc" alwaysOn>
@@ -105,7 +105,7 @@
    <ReferenceInput source="oriCode" label="table.field.task.oriCode" reference="code">
        <AutocompleteInput label="table.field.task.oriCode" optionText="data" filterToQuery={(val) => ({ data: val })} />
    </ReferenceInput>,
    <ReferenceInput source="destSta" label="table.field.task.destSta" reference="sta" alwaysOn>
    <ReferenceInput source="destSta" label="table.field.task.destSta" reference="sta">
        <AutocompleteInput label="table.field.task.destSta" optionText="staNo" filterToQuery={(val) => ({ staNo: val })} />
    </ReferenceInput>,
    <ReferenceInput source="destLoc" label="table.field.task.destLoc" reference="loc" alwaysOn>
@@ -137,6 +137,30 @@
    const [createDialog, setCreateDialog] = useState(false);
    const [drawerVal, setDrawerVal] = useState(false);

    const [taskStsByComplete, setTaskStsByComplete] = useState(null);
    const [taskStsByCancel, setTaskStsByCancel] = useState(null);

    useEffect(() => {
        request.post('/taskSts/list', {
            uuid: 'COMPLETE'
        }, {
            headers: {
                'Content-Type': 'application/x-www-form-urlencoded'
            }
        }).then(res => {
            setTaskStsByComplete(res.data.data[0]?.id);
        })
        request.post('/taskSts/list', {
            uuid: 'CANCEL'
        }, {
            headers: {
                'Content-Type': 'application/x-www-form-urlencoded'
            }
        }).then(res => {
            setTaskStsByCancel(res.data.data[0]?.id);
        })
    }, []);

    const onComplete = (taskId) => {
        request.get("/task/complete/" + taskId).then(res => {
            const { code, msg, data } = res.data;
@@ -146,6 +170,8 @@
            } else {
                notify(msg || 'common.response.fail', { type: 'error', messageArgs: { _: msg } });
            }
        }).catch(error => {
            notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
        })
    }

@@ -158,6 +184,8 @@
            } else {
                notify(msg || 'common.response.fail', { type: 'error', messageArgs: { _: msg } });
            }
        }).catch(error => {
            notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
        })
    }

@@ -175,7 +203,7 @@
                title={"menu.task"}
                empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
                filters={filters}
                sort={{ field: "create_time", order: "desc" }}
                sort={{ field: "", order: "" }}
                actions={(
                    <TopToolbar>
                        <FilterButton />
@@ -195,12 +223,12 @@
                    expand={() => <TaskPanel />}
                    expandSingle={true}
                    omit={['id', 'uuid', 'startTime', 'endTime', 'errTime', 'emptyMk', 'zpallet',
                        'oriSta', 'oriLoc', 'oriCode', 'destSta', 'destLoc', 'destCode',
                        'oriSta', 'oriLoc', 'oriCode', 'destSta', 'destLoc', 'destCode', 'errDesc',
                        'updateTime', 'updateBy', 'ioTime', 'createBy', 'statusBool', 'memo']}
                >
                    <NumberField source="id" />
                    <TextField source="uuid" label="table.field.task.uuid" />
                    <TextField source="seqNum" label="table.field.task.seqNum" />
                    <TextField source="uuid" label="table.field.task.uuid" sortable={false} />
                    <TextField source="seqNum" label="table.field.task.seqNum" sortable={false} />
                    <ReferenceField source="busId" label="table.field.task.busId" reference="bus" link={false} sortable={false}>
                        <TextField source="busNo" />
                    </ReferenceField>
@@ -226,10 +254,10 @@
                        )} />
                        {/* <TextField source="name" /> */}
                    </ReferenceField>
                    <DateField source="ioTime" label="table.field.task.ioTime" showTime />
                    <DateField source="startTime" label="table.field.task.startTime" showTime />
                    <DateField source="endTime" label="table.field.task.endTime" showTime />
                    <DateField source="errTime" label="table.field.task.errTime" showTime />
                    <DateField source="ioTime" label="table.field.task.ioTime" showTime sortable={false} />
                    <DateField source="startTime" label="table.field.task.startTime" showTime sortable={false} />
                    <DateField source="endTime" label="table.field.task.endTime" showTime sortable={false} />
                    <DateField source="errTime" label="table.field.task.errTime" showTime sortable={false} />
                    <ReferenceField source="oriSta" label="table.field.task.oriSta" reference="sta" link={false} sortable={false}>
                        <TextField source="staNo" />
                    </ReferenceField>
@@ -248,12 +276,12 @@
                    <ReferenceField source="destCode" label="table.field.task.destCode" reference="code" link={false} sortable={false}>
                        <TextField source="data" />
                    </ReferenceField>
                    <TextField source="oriDesc" label="table.field.task.oriDesc" />
                    <TextField source="destDesc" label="table.field.task.destDesc" />
                    <NumberField source="priority" label="table.field.task.priority" />
                    <TextField source="emptyMk" label="table.field.task.emptyMk" />
                    <TextField source="zpallet" label="table.field.task.zpallet" />
                    <TextField source="errDesc" label="table.field.task.errDesc" />
                    <TextField source="oriDesc" label="table.field.task.oriDesc" sortable={false} />
                    <TextField source="destDesc" label="table.field.task.destDesc" sortable={false} />
                    <NumberField source="priority" label="table.field.task.priority" sortable={false} />
                    <TextField source="emptyMk" label="table.field.task.emptyMk" sortable={false} />
                    <TextField source="zpallet" label="table.field.task.zpallet" sortable={false} />
                    <TextField source="errDesc" label="table.field.task.errDesc" sortable={false} />

                    <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
                        <TextField source="nickname" />
@@ -262,11 +290,11 @@
                    <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
                        <TextField source="nickname" />
                    </ReferenceField>
                    <DateField source="createTime" label="common.field.createTime" showTime />
                    <DateField source="createTime" label="common.field.createTime" showTime sortable={false} />
                    <BooleanField source="statusBool" label="common.field.status" sortable={false} />
                    <TextField source="memo" label="common.field.memo" sortable={false} />
                    <FunctionField label="common.field.opt" cellClassName="opt" render={record => (
                        (record.taskSts === 15 || true) && (
                        (record.taskSts !== taskStsByComplete && record.taskSts !== taskStsByCancel) && (
                            <>
                                <ConfirmButton
                                    label="common.action.complete"