From 519f7e2b61cb98f42d6f530b5ae0f434f67a1dbd Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 24 九月 2024 10:15:53 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/task/TaskList.jsx | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/zy-acs-flow/src/page/task/TaskList.jsx b/zy-acs-flow/src/page/task/TaskList.jsx
index 55a2262..b140bbd 100644
--- a/zy-acs-flow/src/page/task/TaskList.jsx
+++ b/zy-acs-flow/src/page/task/TaskList.jsx
@@ -30,8 +30,10 @@
ReferenceArrayInput,
AutocompleteInput,
DeleteButton,
+ FunctionField,
+ Pagination,
} from 'react-admin';
-import { Box, Typography, Card, Stack } from '@mui/material';
+import { Box, Chip, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
import TaskCreate from "./TaskCreate";
import TaskPanel from "./TaskPanel";
@@ -43,6 +45,7 @@
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
import TaskListAside from "./TaskListAside";
+import { getTaskStsChipColor } from '@/utils/color-util';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -68,8 +71,8 @@
<DateInput label='common.time.before' source="timeEnd" alwaysOn />,
// <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 source="busId" label="table.field.task.busId" reference="bus" >
+ <AutocompleteInput label="table.field.task.busId" optionText="busNo" filterToQuery={(val) => ({ seqNum: val })} />
</ReferenceInput>,
<TextInput source="seqNum" label="table.field.task.seqNum" />,
<NumberInput source="priority" label="table.field.task.priority" />,
@@ -150,7 +153,8 @@
<MyExportButton />
</TopToolbar>
)}
- perPage={DEFAULT_PAGE_SIZE}
+ pagination={<Pagination rowsPerPageOptions={[10, 20, 50, 100]} />}
+ perPage={20}
aside={<TaskListAside />}
>
<StyledDatagrid
@@ -161,7 +165,7 @@
expandSingle={true}
omit={['id', 'uuid', 'startTime', 'endTime', 'errTime', 'emptyMk', 'zpallet',
'oriSta', 'oriLoc', 'oriCode', 'destSta', 'destLoc', 'destCode',
- 'updateTime', 'updateBy', 'createTime', 'createBy', 'statusBool', 'memo']}
+ 'updateTime', 'updateBy', 'ioTime', 'createBy', 'statusBool', 'memo']}
>
<NumberField source="id" />
<TextField source="uuid" label="table.field.task.uuid" />
@@ -176,10 +180,21 @@
<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}>
+ {/* <ReferenceField source="taskSts" label="table.field.task.taskSts" reference="taskSts" link={false} sortable={false}>
<TextField source="name" />
+ </ReferenceField> */}
+ <ReferenceField source="taskSts" label="table.field.task.taskSts" reference="taskSts" link={false} sortable={true}>
+ <FunctionField render={record => (
+ <Chip
+ label={record.name}
+ variant="outlined"
+ size="small"
+ color={getTaskStsChipColor(record.name)}
+ sx={{ fontSize: '0.75rem' }}
+ />
+ )} />
+ {/* <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 />
@@ -204,6 +219,7 @@
</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" />
--
Gitblit v1.9.1