From 95cdabff1361fb00dafcb55780d69f67f32bf133 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 21 九月 2024 10:30:47 +0800
Subject: [PATCH] #

---
 zy-acs-flow/src/page/agv/AgvShow.jsx           |   19 ++++++---
 zy-acs-flow/src/page/agv/show/AgvShowAside.jsx |   90 +++++++++++++++++++++++++++++++++++----------
 2 files changed, 83 insertions(+), 26 deletions(-)

diff --git a/zy-acs-flow/src/page/agv/AgvShow.jsx b/zy-acs-flow/src/page/agv/AgvShow.jsx
index d381e4d..ddf0801 100644
--- a/zy-acs-flow/src/page/agv/AgvShow.jsx
+++ b/zy-acs-flow/src/page/agv/AgvShow.jsx
@@ -22,11 +22,13 @@
     ListItemText,
     Stack,
     Typography,
+    Avatar,
 } from '@mui/material';
 import { formatDistance } from 'date-fns';
 import { AgvShowDetail } from "./show/AgvShowDetail";
 import { AgvShowAside } from "./show/AgvShowAside";
-
+import CustomerTopToolBar from "../components/EditTopToolBar";
+import { useTheme } from '@mui/material/styles';
 
 export const AgvShow = () => {
 
@@ -41,6 +43,7 @@
 
 const AgvShowContent = (props) => {
     const { record, isPending } = useShowContext();
+    const theme = useTheme();
     if (isPending || !record) return null;
 
     return (
@@ -48,11 +51,15 @@
             <Box mt={2} display="flex">
                 <Box flex="1">
                     <Card>
-                        <CardContent>
-                            <Box display="flex" mb={1}>
-                                <Typography variant="h5" ml={2} flex="1">
-                                    {record.uuid}
-                                </Typography>
+                        <CardContent sx={{ pt: 0 }}>
+                            <Box display="flex" mb={1} sx={{
+                                justifyContent: 'space-between',
+                                alignItems: 'center',
+                            }}>
+                                <CustomerTopToolBar />
+                                <Box mt={1}>
+                                    <Avatar sx={{ bgcolor: theme.palette.primary.main }}>{record.uuid}</Avatar>
+                                </Box>
                             </Box>
 
                             <TabbedShowLayout
diff --git a/zy-acs-flow/src/page/agv/show/AgvShowAside.jsx b/zy-acs-flow/src/page/agv/show/AgvShowAside.jsx
index f3a60b7..2fddc37 100644
--- a/zy-acs-flow/src/page/agv/show/AgvShowAside.jsx
+++ b/zy-acs-flow/src/page/agv/show/AgvShowAside.jsx
@@ -2,12 +2,14 @@
 import {
     DateField,
     EditButton,
+    DeleteButton,
     ReferenceField,
     SelectField,
     ShowButton,
     TextField,
     UrlField,
     useRecordContext,
+    useTranslate,
 } from 'react-admin';
 import { Link as RouterLink, useLocation } from 'react-router-dom';
 import {
@@ -19,32 +21,80 @@
     Stack,
     Typography,
     Divider,
+    Grid,
 } from '@mui/material';
 import { formatDistance } from 'date-fns';
-
+import StatusField from "../../components/StatusField";
+import AccessTimeIcon from '@mui/icons-material/AccessTime';
 
 export const AgvShowAside = (props) => {
-    const { link = 'edit' } = props;
+    const translate = useTranslate();
     const record = useRecordContext();
     if (!record) return null;
 
-    return (<>
-        <Stack ml={4} width={250} minWidth={250} spacing={2}>
-            <Stack direction="row" spacing={1}>
-                {link === 'edit' ? (
-                    <EditButton label="Edit Company" />
-                ) : (
-                    <ShowButton label="Show Company" />
-                )}
-            </Stack>
 
-            {/* <CompanyInfo record={record} />
-
-            <AddressInfo record={record} />
-
-            <ContextInfo record={record} />
-
-            <AdditionalInfo record={record} /> */}
-        </Stack>
-    </>)
+    return (
+        <Box width={400} display={{ xs: 'none', lg: 'block' }}>
+            {record && (
+                <Box ml={2}>
+                    <Card>
+                        <CardContent>
+                            <Stack direction="row" spacing={1}>
+                                <EditButton label="Edit Company" />
+                            </Stack>
+                            <Stack direction="row" mt={1}>
+                                <DeleteButton mutationMode="optimistic" />
+                            </Stack>
+                            <Box mt={1} />
+                            <Typography variant="subtitle2" gutterBottom>
+                                {translate('common.edit.side.title')}
+                            </Typography>
+                            <Divider sx={{ mb: 1 }} />
+                            <Grid container rowSpacing={2} columnSpacing={1}>
+                                <Grid item xs={12} display="flex" gap={1}>
+                                    <StatusField label="Status" />
+                                </Grid>
+                                <Grid item xs={12} display="flex" gap={1}>
+                                    <Stack
+                                        direction="row"
+                                        alignItems="center"
+                                        gap={1}
+                                        minHeight={24}
+                                    >
+                                        <AccessTimeIcon fontSize="small" color="disabled" />
+                                        <Typography variant="body2">
+                                            {translate('common.field.createTime')}
+                                        </Typography>
+                                        <DateField
+                                            record={record}
+                                            source="createTime"
+                                            showTime
+                                        />
+                                    </Stack>
+                                </Grid>
+                                <Grid item xs={12} display="flex" gap={1}>
+                                    <Stack
+                                        direction="row"
+                                        alignItems="center"
+                                        gap={1}
+                                        minHeight={24}
+                                    >
+                                        <AccessTimeIcon fontSize="small" color="disabled" />
+                                        <Typography variant="body2">
+                                            {translate('common.field.updateTime')}
+                                        </Typography>
+                                        <DateField
+                                            record={record}
+                                            source="updateTime"
+                                            showTime
+                                        />
+                                    </Stack>
+                                </Grid>
+                            </Grid>
+                        </CardContent>
+                    </Card>
+                </Box>
+            )}
+        </Box>
+    );
 }
\ No newline at end of file

--
Gitblit v1.9.1