From afac377f99fd8d2cd24c2ac73555a9f20426ef1d Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期一, 07 十月 2024 08:19:06 +0800 Subject: [PATCH] # --- zy-acs-flow/src/page/mission/MissionShow.jsx | 85 +++++++++++++++++++++++------------------- 1 files changed, 46 insertions(+), 39 deletions(-) diff --git a/zy-acs-flow/src/page/mission/MissionShow.jsx b/zy-acs-flow/src/page/mission/MissionShow.jsx index accfa7d..8a6c6af 100644 --- a/zy-acs-flow/src/page/mission/MissionShow.jsx +++ b/zy-acs-flow/src/page/mission/MissionShow.jsx @@ -23,10 +23,14 @@ Stack, Typography, Avatar, + useTheme, } from '@mui/material'; import DialogCloseButton from "../components/DialogCloseButton"; -import { blueGrey } from '@mui/material/colors'; +import { blueGrey, blue } from '@mui/material/colors'; import MoveToInboxIcon from '@mui/icons-material/MoveToInbox'; +import { format } from 'date-fns'; +import { TaskList } from "./TaskList"; +import { ActionsIterator } from "../action/ActionsIterator"; const MissionShow = ({ open, id }) => { const redirect = useRedirect(); @@ -58,9 +62,10 @@ } const MissionShowContent = ({ handleClose }) => { + const theme = useTheme(); const record = useRecordContext(); + const translate = useTranslate(); if (!record) return null; - console.log(record); return ( <> @@ -81,7 +86,7 @@ sx={{ width: 30, height: 30, - bgcolor: blueGrey[500], + bgcolor: theme.palette.primary.main, }} > {record.agv} @@ -105,7 +110,7 @@ color="textSecondary" variant="caption" > - Expected closing date + {translate('table.field.mission.lastSendDate')} </Typography> <Stack direction="row" @@ -113,15 +118,8 @@ gap={1} > <Typography variant="body2"> + {format(record.sendTime, 'yyyy-MM-dd HH:mm:ss') || '-'} </Typography> - {new Date(record.expected_closing_date) < - new Date() ? ( - <Chip - label="Past" - color="error" - size="small" - /> - ) : null} </Stack> </Box> @@ -130,43 +128,39 @@ color="textSecondary" variant="caption" > - Budget + {translate('table.field.bus.busNo')} </Typography> <Typography variant="body2"> + {record.busNo || '-'} </Typography> </Box> - - {record.category && ( - <Box - display="flex" - mr={5} - flexDirection="column" - > - <Typography - color="textSecondary" - variant="caption" - > - Category - </Typography> - <Typography variant="body2"> - {record.category} - </Typography> - </Box> - )} <Box display="flex" mr={5} flexDirection="column"> <Typography color="textSecondary" variant="caption" > - Stage + {translate('table.field.segment.posType')} </Typography> <Typography variant="body2"> + {translate(`page.mission.enums.posType.${record.posType}`)} + </Typography> + </Box> + + <Box display="flex" mr={5} flexDirection="column"> + <Typography + color="textSecondary" + variant="caption" + > + {translate('table.field.mission.actionCount')} + </Typography> + <Typography variant="body2"> + {record.actionCount || 'unknown'} </Typography> </Box> </Box> - {!!record.contact_ids?.length && ( + {!!record.taskIds?.length && ( <Box m={2}> <Box display="flex" @@ -178,34 +172,47 @@ color="textSecondary" variant="caption" > - Contacts + {translate('table.field.mission.task')} </Typography> <ReferenceArrayField source="contact_ids" reference="contacts_summary" > - <ContactList /> + <TaskList taskIds={record.taskIds} /> </ReferenceArrayField> </Box> </Box> )} - {record.description && ( + {!!record.codeList?.length && ( <Box m={2} sx={{ whiteSpace: 'pre-line' }}> <Typography color="textSecondary" variant="caption" > - Description + {translate('table.field.mission.runPath')} </Typography> - <Typography variant="body2"> - {record.description} + <Typography variant="body2" sx={{ whiteSpace: 'normal', overflow: 'hidden', display: 'flex', flexWrap: 'wrap' }}> + [ {record.codeList.map((code, index) => ( + <span key={index} style={{ + color: record.currCode === code ? theme.palette.primary.main : 'inherit', + }}> + {code}{index < record.codeList.length - 1 && ','} + </span> + ))} ] </Typography> </Box> )} <Box m={2}> + <Typography + color="textSecondary" + variant="caption" + > + {translate('table.field.mission.actions')} + </Typography> <Divider /> + <ActionsIterator actionIds={record.actionIds} /> </Box> </Box> </Box> -- Gitblit v1.9.1