From 7f70cb15d035f0c233b9e62b9e43aa985317c908 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 04 十一月 2024 10:22:45 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/task/TaskList.jsx | 193 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 157 insertions(+), 36 deletions(-)
diff --git a/zy-acs-flow/src/page/task/TaskList.jsx b/zy-acs-flow/src/page/task/TaskList.jsx
index 817c3a7..5ec10b1 100644
--- a/zy-acs-flow/src/page/task/TaskList.jsx
+++ b/zy-acs-flow/src/page/task/TaskList.jsx
@@ -30,8 +30,12 @@
ReferenceArrayInput,
AutocompleteInput,
DeleteButton,
+ FunctionField,
+ Pagination,
+ useNotify,
+ useRefresh,
} 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";
@@ -40,8 +44,14 @@
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";
+import { getTaskStsChipColor } from '@/utils/color-util';
+import ConfirmButton from "../components/ConfirmButton";
+import ClearIcon from '@mui/icons-material/Clear';
+import CheckIcon from '@mui/icons-material/Check';
+import request from '@/utils/request';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -50,7 +60,11 @@
'& .RaDatagrid-row': {
cursor: 'auto'
},
- '& .column-name': {
+ '& .column-busId': {
+ maxWidth: '8em',
+ overflow: 'hidden',
+ textOverflow: 'ellipsis',
+ whiteSpace: 'nowrap',
},
'& .opt': {
width: 200
@@ -58,17 +72,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" />,
- <ReferenceInput source="busId" label="table.field.task.busId" reference="bus">
- <AutocompleteInput label="table.field.task.busId" optionText="seqNum" filterToQuery={(val) => ({ seqNum: val })} />
+ // <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="busNo" 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 +92,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 +116,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" />,
@@ -118,9 +132,62 @@
const TaskList = () => {
const translate = useTranslate();
-
+ const notify = useNotify();
+ const refresh = useRefresh();
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;
+ if (code === 200) {
+ notify(msg || 'common.response.success', { type: 'success', messageArgs: { _: msg } });
+ refresh();
+ } else {
+ notify(msg || 'common.response.fail', { type: 'error', messageArgs: { _: msg } });
+ }
+ }).catch(error => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
+ })
+ }
+
+ const onCancel = (taskId) => {
+ request.get("/task/cancel/" + taskId).then(res => {
+ const { code, msg, data } = res.data;
+ if (code === 200) {
+ notify(msg || 'common.response.success', { type: 'success', messageArgs: { _: msg } });
+ refresh();
+ } else {
+ notify(msg || 'common.response.fail', { type: 'error', messageArgs: { _: msg } });
+ }
+ }).catch(error => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
+ })
+ }
return (
<Box display="flex">
@@ -140,37 +207,52 @@
actions={(
<TopToolbar>
<FilterButton />
- <MyCreateButton onClick={() => { setCreateDialog(true) }} />
+ {/* <MyCreateButton onClick={() => { setCreateDialog(true) }} /> */}
<SelectColumnsButton preferenceKey='task' />
<MyExportButton />
</TopToolbar>
)}
+ pagination={<Pagination rowsPerPageOptions={[10, 25, 50, 100]} />}
perPage={25}
+ 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', 'ioTime', 'createBy', 'statusBool', 'memo']}
>
<NumberField source="id" />
<TextField source="uuid" label="table.field.task.uuid" />
- <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 source="busId" label="table.field.task.busId" reference="bus" link={false} sortable={false}>
+ <TextField source="busNo" />
</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> */}
+ <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>
<DateField source="ioTime" label="table.field.task.ioTime" showTime />
<DateField source="startTime" label="table.field.task.startTime" showTime />
@@ -194,9 +276,11 @@
<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="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}>
@@ -209,10 +293,47 @@
<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">
- <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
- <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
- </WrapperField>
+ <FunctionField label="common.field.opt" cellClassName="opt" render={record => (
+ (record.taskSts !== taskStsByComplete && record.taskSts !== taskStsByCancel) && (
+ <>
+ <ConfirmButton
+ label="common.action.complete"
+ size="small"
+ color="primary"
+ startIcon={<CheckIcon />}
+ sx={{
+ padding: '1px',
+ fontSize: '.75rem',
+ '& .MuiButton-startIcon': {
+ marginRight: '2px'
+ },
+ mr: 1
+ }}
+ data={record.seqNum}
+ onConfirm={() => {
+ onComplete(record.id);
+ }}
+ />
+ <ConfirmButton
+ label="ra.action.cancel"
+ size="small"
+ color="error"
+ startIcon={<ClearIcon />}
+ sx={{
+ padding: '1px',
+ fontSize: '.75rem',
+ '& .MuiButton-startIcon': {
+ marginRight: '1.5px'
+ },
+ }}
+ data={record.seqNum}
+ onConfirm={() => {
+ onCancel(record.id);
+ }}
+ />
+ </>
+ )
+ )} />
</StyledDatagrid>
</List>
<TaskCreate
--
Gitblit v1.9.1