From 1c502c82c188292fd8c9337c221e1f09a86a642b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 15 八月 2025 13:34:03 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/dashboard/NbCard.jsx | 87 +++++++++++++++++++------------------------
1 files changed, 38 insertions(+), 49 deletions(-)
diff --git a/rsf-admin/src/page/dashboard/NbCard.jsx b/rsf-admin/src/page/dashboard/NbCard.jsx
index 4701aef..80c8772 100644
--- a/rsf-admin/src/page/dashboard/NbCard.jsx
+++ b/rsf-admin/src/page/dashboard/NbCard.jsx
@@ -4,12 +4,15 @@
Box,
Button,
List,
+ Grid,
ListItem,
+ Typography,
ListItemAvatar,
ListItemButton,
ListItemText,
} from '@mui/material';
import CommentIcon from '@mui/icons-material/Comment';
+import CardWithIcon from '../components/CardWithIcon';
import { Link } from 'react-router-dom';
import {
ReferenceField,
@@ -18,23 +21,12 @@
useTranslate,
useIsDataLoaded,
} from 'react-admin';
-import CardWithIcon from '../components/CardWithIcon';
const NbCard = (props) => {
- const { list, ...rest } = props;
+ const { tasks, total, ...rset } = props;
const translate = useTranslate();
- const {
- data: reviews,
- total,
- isPending,
- } = useGetList('reviews', {
- filter: { status: 'pending' },
- sort: { field: 'date', order: 'DESC' },
- pagination: { page: 1, perPage: 100 },
- });
const display = 'display';
- const newList = list.concat(list);
return (
<>
@@ -42,55 +34,49 @@
icon={CommentIcon}
title={translate('page.dashboard.pending_reviews')}
subtitle={total}
- {...rest}
+ {...rset}
>
<List sx={{ display }}>
- {newList?.map((record) => (
+ {tasks?.map((record) => (
<ListItem key={record.id} disablePadding>
<ListItemButton
alignItems="flex-start"
component={Link}
to={`/task/${record.id}`}
>
- {/* <ListItemAvatar>
- <Avatar
- sx={{
- // bgcolor: 'primary.main',
- bgcolor: '#a2beeaff',
- color: 'primary.contrastText', // 閬垮厤鐧藉瓧鐧藉簳
- // width: 40,
- // height: 40,
- // fontSize: 16,
- }}
- >
- {record.id}
- </Avatar>
- </ListItemAvatar> */}
-
- <ListItemText
- // primary={
- // <StarRatingField
- // record={record}
- // source="rating"
- // />
- // }
- primary={record.date + record.date}
- secondary={record.total}
- sx={{
- overflowY: 'hidden',
- height: '3em',
- display: '-webkit-box',
- WebkitLineClamp: 2,
- WebkitBoxOrient: 'vertical',
- paddingRight: 0,
- }}
- />
+ <Grid container item md={12}>
+ <Box sx={{ display: 'flex' }}>
+ <Box sx={{ display: 'flex', padding: '1em' }}>
+ <Typography color="textSecondary">{translate("table.field.task.taskCode")}锛�</Typography>
+ <Typography color="textSecondary">{record?.taskCode}</Typography>
+ </Box>
+ </Box>
+ <Box sx={{ display: 'flex' }}>
+ <Box sx={{ display: 'flex', padding: '1em' }}>
+ <Typography color="textSecondary">{translate("table.field.task.taskType")}锛�</Typography>
+ <Typography color="textSecondary" maxWidth="200" overflow="hidden">{record?.taskType$}</Typography>
+ </Box>
+ </Box>
+ <Box sx={{ display: 'flex' }}>
+ <Box sx={{ display: 'flex', padding: '1em' }}>
+ <Typography color="textSecondary">{translate("table.field.task.taskStatus")}锛�</Typography>
+ <Typography color="textSecondary">{record?.taskStatus$}</Typography>
+ </Box>
+ </Box>
+ <Box sx={{ display: 'flex' }}>
+ <Box sx={{ display: 'flex', padding: '1em' }}>
+ <Typography color="textSecondary">{translate("table.field.task.startTime")}锛�</Typography>
+ <Typography color="textSecondary">{record?.createTime}</Typography>
+ </Box>
+ </Box>
+ </Grid>
</ListItemButton>
+ <Spacer />
</ListItem>
))}
</List>
<Box flexGrow={1}> </Box>
- <Button
+ {/* <Button
sx={{ borderRadius: 0 }}
component={Link}
to="/task"
@@ -100,10 +86,13 @@
<Box p={1} sx={{ color: 'primary.main' }}>
{translate('pos.dashboard.all_reviews')}
</Box>
- </Button>
+ </Button> */}
</CardWithIcon>
</>
);
};
+const Spacer = () => <span style={{ width: '1em', }} />;
+
+
export default NbCard;
--
Gitblit v1.9.1