From 007a9dba69ac16cf8ddacb95d6e105710f42a27d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 07 十月 2024 08:11:36 +0800
Subject: [PATCH] #

---
 zy-acs-flow/src/page/mission/MissionShow.jsx |   46 +++++++++++++++++++++++++++++++---------------
 1 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/zy-acs-flow/src/page/mission/MissionShow.jsx b/zy-acs-flow/src/page/mission/MissionShow.jsx
index 451db8c..8a6c6af 100644
--- a/zy-acs-flow/src/page/mission/MissionShow.jsx
+++ b/zy-acs-flow/src/page/mission/MissionShow.jsx
@@ -23,11 +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();
@@ -59,10 +62,10 @@
 }
 
 const MissionShowContent = ({ handleClose }) => {
+    const theme = useTheme();
     const record = useRecordContext();
     const translate = useTranslate();
     if (!record) return null;
-    console.log(record);
 
     return (
         <>
@@ -83,7 +86,7 @@
                                     sx={{
                                         width: 30,
                                         height: 30,
-                                        bgcolor: blueGrey[500],
+                                        bgcolor: theme.palette.primary.main,
                                     }}
                                 >
                                     {record.agv}
@@ -107,7 +110,7 @@
                                     color="textSecondary"
                                     variant="caption"
                                 >
-                                    Last sending date
+                                    {translate('table.field.mission.lastSendDate')}
                                 </Typography>
                                 <Stack
                                     direction="row"
@@ -115,7 +118,7 @@
                                     gap={1}
                                 >
                                     <Typography variant="body2">
-                                        {format(record.sendTime, 'yyyy-MM-dd HH:mm:ss')}
+                                        {format(record.sendTime, 'yyyy-MM-dd HH:mm:ss') || '-'}
                                     </Typography>
                                 </Stack>
                             </Box>
@@ -125,10 +128,10 @@
                                     color="textSecondary"
                                     variant="caption"
                                 >
-                                    Bus No
+                                    {translate('table.field.bus.busNo')}
                                 </Typography>
                                 <Typography variant="body2">
-                                    {record.busNo}
+                                    {record.busNo || '-'}
                                 </Typography>
                             </Box>
 
@@ -149,7 +152,7 @@
                                     color="textSecondary"
                                     variant="caption"
                                 >
-                                    Action Count
+                                    {translate('table.field.mission.actionCount')}
                                 </Typography>
                                 <Typography variant="body2">
                                     {record.actionCount || 'unknown'}
@@ -157,7 +160,7 @@
                             </Box>
                         </Box>
 
-                        {!!record.contact_ids?.length && (
+                        {!!record.taskIds?.length && (
                             <Box m={2}>
                                 <Box
                                     display="flex"
@@ -169,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' }}>
+                                    [&nbsp;{record.codeList.map((code, index) => (
+                                        <span key={index} style={{
+                                            color: record.currCode === code ? theme.palette.primary.main : 'inherit',
+                                        }}>
+                                            {code}{index < record.codeList.length - 1 && ','}&nbsp;
+                                        </span>
+                                    ))}&nbsp;]
                                 </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