From 70707360887cf4acde963c35c92b6de97107fecb Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期日, 29 九月 2024 14:18:33 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/i18n/en.js | 1 +
zy-acs-flow/src/i18n/zh.js | 1 +
zy-acs-flow/src/page/mission/MissionShow.jsx | 45 ++++++++++++++++++++++++++++++++++++++++-----
3 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/zy-acs-flow/src/i18n/en.js b/zy-acs-flow/src/i18n/en.js
index 53217ad..e9c4ead 100644
--- a/zy-acs-flow/src/i18n/en.js
+++ b/zy-acs-flow/src/i18n/en.js
@@ -65,6 +65,7 @@
loadMore: 'Load More Data',
complete: 'Complete',
deprecate: 'Deprecate',
+ resend: 'RESEND',
},
msg: {
confirm: {
diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js
index 019c870..6329b2f 100644
--- a/zy-acs-flow/src/i18n/zh.js
+++ b/zy-acs-flow/src/i18n/zh.js
@@ -65,6 +65,7 @@
loadMore: '鍔犺浇鏇村',
complete: '瀹屾垚',
deprecate: '搴熷純',
+ resend: '閲嶅彂',
},
msg: {
confirm: {
diff --git a/zy-acs-flow/src/page/mission/MissionShow.jsx b/zy-acs-flow/src/page/mission/MissionShow.jsx
index 26e8e0e..accfa7d 100644
--- a/zy-acs-flow/src/page/mission/MissionShow.jsx
+++ b/zy-acs-flow/src/page/mission/MissionShow.jsx
@@ -1,6 +1,6 @@
import React, { useState, useRef, useEffect, useMemo, useCallback } from "react";
import {
- DeleteButton,
+ useTranslate,
EditButton,
ReferenceArrayField,
ReferenceField,
@@ -22,8 +22,11 @@
Divider,
Stack,
Typography,
+ Avatar,
} from '@mui/material';
import DialogCloseButton from "../components/DialogCloseButton";
+import { blueGrey } from '@mui/material/colors';
+import MoveToInboxIcon from '@mui/icons-material/MoveToInbox';
const MissionShow = ({ open, id }) => {
const redirect = useRedirect();
@@ -54,7 +57,6 @@
)
}
-const CLOSE_TOP_WITH_ARCHIVED = 14;
const MissionShowContent = ({ handleClose }) => {
const record = useRecordContext();
if (!record) return null;
@@ -64,6 +66,7 @@
<>
<DialogCloseButton
onClose={handleClose}
+ top={12}
/>
<Stack gap={1}>
<Box display="flex" p={2}>
@@ -74,15 +77,25 @@
mb={4}
>
<Stack direction="row" alignItems="center" gap={2}>
+ <Avatar
+ sx={{
+ width: 30,
+ height: 30,
+ bgcolor: blueGrey[500],
+ }}
+ >
+ {record.agv}
+ </Avatar>
<Typography variant="h5">
- {record.name}
+ {record.groupNo}
</Typography>
</Stack>
<Stack
gap={1}
direction="row"
- pr={record.archived_at ? 0 : 6}
+ pr={6}
>
+ <ResendButton record={record} />
</Stack>
</Stack>
@@ -199,6 +212,28 @@
</Stack>
</>
)
-}
+};
+
+const ResendButton = ({ record }) => {
+ const dataProvider = useDataProvider();
+ const redirect = useRedirect();
+ const notify = useNotify();
+ const refresh = useRefresh();
+ const translate = useTranslate();
+
+ const handleClick = () => {
+ alert(1);
+ };
+
+ return (
+ <Button
+ onClick={handleClick}
+ startIcon={<MoveToInboxIcon />}
+ size="small"
+ >
+ {translate('common.action.resend')}
+ </Button>
+ );
+};
export default MissionShow;
\ No newline at end of file
--
Gitblit v1.9.1