From a7a2a9b8f1524831898501d11bbedc0c4a3da3a4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 24 九月 2024 09:16:36 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/task/TaskList.jsx | 63 ++++++++++++++++++-------------
1 files changed, 36 insertions(+), 27 deletions(-)
diff --git a/zy-acs-flow/src/page/task/TaskList.jsx b/zy-acs-flow/src/page/task/TaskList.jsx
index 817c3a7..773cf7e 100644
--- a/zy-acs-flow/src/page/task/TaskList.jsx
+++ b/zy-acs-flow/src/page/task/TaskList.jsx
@@ -40,8 +40,9 @@
import MyExportButton from '../components/MyExportButton';
import PageDrawer from "../components/PageDrawer";
import MyField from "../components/MyField";
-import { PAGE_DRAWER_WIDTH, OPERATE_MODE } from '@/config/setting';
+import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
+import TaskListAside from "./TaskListAside";
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -50,7 +51,11 @@
'& .RaDatagrid-row': {
cursor: 'auto'
},
- '& .column-name': {
+ '& .column-busId': {
+ maxWidth: '8em',
+ overflow: 'hidden',
+ textOverflow: 'ellipsis',
+ whiteSpace: 'nowrap',
},
'& .opt': {
width: 200
@@ -58,17 +63,17 @@
}));
const filters = [
- <SearchInput source="condition" alwaysOn />,
+ // <SearchInput source="condition" alwaysOn />,
<DateInput label='common.time.after' source="timeStart" alwaysOn />,
<DateInput label='common.time.before' source="timeEnd" alwaysOn />,
- <TextInput source="uuid" label="table.field.task.uuid" />,
+ // <TextInput source="uuid" label="table.field.task.uuid" />,
<ReferenceInput source="busId" label="table.field.task.busId" reference="bus">
<AutocompleteInput label="table.field.task.busId" optionText="seqNum" filterToQuery={(val) => ({ seqNum: val })} />
</ReferenceInput>,
<TextInput source="seqNum" label="table.field.task.seqNum" />,
<NumberInput source="priority" label="table.field.task.priority" />,
- <TextInput source="name" label="table.field.task.name" />,
+ // <TextInput source="name" label="table.field.task.name" />,
<ReferenceInput source="taskSts" label="table.field.task.taskSts" reference="taskSts">
<AutocompleteInput label="table.field.task.taskSts" optionText="name" filterToQuery={(val) => ({ name: val })} />
</ReferenceInput>,
@@ -78,23 +83,23 @@
<ReferenceInput source="agvId" label="table.field.task.agvId" reference="agv">
<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">
+ // <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>
<AutocompleteInput label="table.field.task.oriSta" optionText="staNo" filterToQuery={(val) => ({ staNo: val })} />
</ReferenceInput>,
- <ReferenceInput source="oriLoc" label="table.field.task.oriLoc" reference="loc">
+ <ReferenceInput source="oriLoc" label="table.field.task.oriLoc" reference="loc" alwaysOn>
<AutocompleteInput label="table.field.task.oriLoc" optionText="locNo" filterToQuery={(val) => ({ locNo: val })} />
</ReferenceInput>,
<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">
+ <ReferenceInput source="destSta" label="table.field.task.destSta" reference="sta" alwaysOn>
<AutocompleteInput label="table.field.task.destSta" optionText="staNo" filterToQuery={(val) => ({ staNo: val })} />
</ReferenceInput>,
- <ReferenceInput source="destLoc" label="table.field.task.destLoc" reference="loc">
+ <ReferenceInput source="destLoc" label="table.field.task.destLoc" reference="loc" alwaysOn>
<AutocompleteInput label="table.field.task.destLoc" optionText="locNo" filterToQuery={(val) => ({ locNo: val })} />
</ReferenceInput>,
<ReferenceInput source="destCode" label="table.field.task.destCode" reference="code">
@@ -102,7 +107,7 @@
</ReferenceInput>,
<TextInput source="emptyMk" label="table.field.task.emptyMk" />,
<TextInput source="zpallet" label="table.field.task.zpallet" />,
- <TextInput source="phase" label="table.field.task.phase" />,
+ // <TextInput source="phase" label="table.field.task.phase" />,
<TextInput source="errDesc" label="table.field.task.errDesc" />,
<TextInput label="common.field.memo" source="memo" />,
@@ -145,33 +150,36 @@
<MyExportButton />
</TopToolbar>
)}
- perPage={25}
+ perPage={DEFAULT_PAGE_SIZE}
+ aside={<TaskListAside />}
>
<StyledDatagrid
preferenceKey='task'
- bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
+ bulkActionButtons={false}
rowClick={(id, resource, record) => false}
expand={() => <TaskPanel />}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'uuid', 'startTime', 'endTime', 'errTime', 'emptyMk', 'zpallet',
+ 'oriSta', 'oriLoc', 'oriCode', 'destSta', 'destLoc', 'destCode',
+ 'updateTime', 'updateBy', 'createTime', 'createBy', 'statusBool', 'memo']}
>
<NumberField source="id" />
<TextField source="uuid" label="table.field.task.uuid" />
+ <TextField source="seqNum" label="table.field.task.seqNum" />
<ReferenceField source="busId" label="table.field.task.busId" reference="bus" link={false} sortable={false}>
<TextField source="seqNum" />
- </ReferenceField>
- <TextField source="seqNum" label="table.field.task.seqNum" />
- <NumberField source="priority" label="table.field.task.priority" />
- <TextField source="name" label="table.field.task.name" />
- <ReferenceField source="taskSts" label="table.field.task.taskSts" reference="taskSts" link={false} sortable={false}>
- <TextField source="name" />
- </ReferenceField>
- <ReferenceField source="taskType" label="table.field.task.taskType" reference="taskType" link={false} sortable={false}>
- <TextField source="name" />
</ReferenceField>
<ReferenceField source="agvId" label="table.field.task.agvId" reference="agv" link={false} sortable={false}>
<TextField source="uuid" />
</ReferenceField>
+ {/* <TextField source="name" label="table.field.task.name" /> */}
+ <ReferenceField source="taskType" label="table.field.task.taskType" reference="taskType" link={false} sortable={false}>
+ <TextField source="name" />
+ </ReferenceField>
+ <ReferenceField source="taskSts" label="table.field.task.taskSts" reference="taskSts" link={false} sortable={false}>
+ <TextField source="name" />
+ </ReferenceField>
+ <NumberField source="priority" label="table.field.task.priority" />
<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 />
@@ -194,9 +202,10 @@
<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" />
<TextField source="emptyMk" label="table.field.task.emptyMk" />
<TextField source="zpallet" label="table.field.task.zpallet" />
- <TextField source="phase" label="table.field.task.phase" />
<TextField source="errDesc" label="table.field.task.errDesc" />
<ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
--
Gitblit v1.9.1