From 1864f916e0359d0814416cf94feda3a3662ed193 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 05 九月 2025 16:39:29 +0800
Subject: [PATCH] 1
---
zy-acs-flow/src/page/task/TaskList.jsx | 40 ++++++++++++++++++++++------------------
1 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/zy-acs-flow/src/page/task/TaskList.jsx b/zy-acs-flow/src/page/task/TaskList.jsx
index a72bf79..b1b4bd3 100644
--- a/zy-acs-flow/src/page/task/TaskList.jsx
+++ b/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>
@@ -170,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 } });
})
}
@@ -182,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 } });
})
}
@@ -199,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 />
@@ -219,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>
@@ -250,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>
@@ -272,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" />
@@ -286,7 +290,7 @@
<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 => (
--
Gitblit v1.9.1