From 5b976ae793a2a068427fdb9c7d80fdf4ea6a96a5 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 22 八月 2025 15:12:14 +0800
Subject: [PATCH] 盘点功能优化，bug修复
---
rsf-admin/src/page/dashboard/NbList.jsx | 81 ++++++++++++++++++++++++++++------------
1 files changed, 56 insertions(+), 25 deletions(-)
diff --git a/rsf-admin/src/page/dashboard/NbList.jsx b/rsf-admin/src/page/dashboard/NbList.jsx
index 9bb7024..3794797 100644
--- a/rsf-admin/src/page/dashboard/NbList.jsx
+++ b/rsf-admin/src/page/dashboard/NbList.jsx
@@ -5,44 +5,47 @@
ListItemSecondaryAction,
ListItemAvatar,
ListItemText,
+ Typography,
Avatar,
Box,
ListItemButton,
Card,
CardHeader,
List,
+ Grid,
} from '@mui/material';
import { Link } from 'react-router-dom';
-const NbList = (props) => {
- const { orders = [] } = props;
+const NbList = ({ deadStock }) => {
const translate = useTranslate();
-
return (
- <Card sx={{ flex: 1 }}>
- <CardHeader title={translate('pos.dashboard.pending_orders')} />
- <List dense={true}>
- {orders.map(record => (
- <PendingOrder key={record.id} order={record} />
- ))}
- </List>
+ <Card sx={{
+ flex: 1,
+ }}>
+ <CardHeader title={translate('page.dashboard.list.stock')} />
+ <Box sx={{ maxHeight: 500, overflowY: 'auto',}}>
+ <List dense={true}>
+ {deadStock.map(record => (
+ <PendingOrder key={`record?.id + ${Math.random().toString(36).substr(2, 9)} `} order={record} />
+ ))}
+ </List>
+ </Box>
</Card>
);
};
export const PendingOrder = (props) => {
const { order } = props;
- console.log(order);
-
const translate = useTranslate();
- const { referenceRecord: customer, isPending } = useReference({
- reference: 'customers',
- id: order.customer_id,
- });
+ // const { referenceRecord: customer, isPending } = useReference({
+ // reference: 'customers',
+ // id: order.id,
+ // });
return (
<ListItem disablePadding>
- <ListItemButton component={Link} to={`/orders/${order.id}`}>
+ {/* component={Link} to={`/locItem/${order.id}`} */}
+ <ListItemButton >
{/* <ListItemAvatar>
{isPending ? (
<Avatar />
@@ -54,13 +57,41 @@
/>
)}
</ListItemAvatar> */}
- <ListItemText
- primary={new Date(order.date).toLocaleString('en-GB')}
- secondary={translate('pos.dashboard.order.items', {
- name: order.name
+ {/* <ListItemText
+ primary={new Date(order.createTime).toLocaleString('en-GB')}
+ secondary={translate('page.dashboard.list.stock', {
+ name: order.maktx
})}
- />
- <ListItemSecondaryAction>
+ >
+
+ </ListItemText> */}
+ <Grid container item md={12}>
+ <Box sx={{ display: 'flex' }}>
+ <Box sx={{ display: 'flex', padding: '1em' }}>
+ <Typography color="textSecondary">{translate("table.field.asnOrderItem.matnrCode")}锛�</Typography>
+ <Typography color="textSecondary">{order?.matnrCode}</Typography>
+ </Box>
+ </Box>
+ <Box sx={{ display: 'flex' }}>
+ <Box sx={{ display: 'flex', padding: '1em' }}>
+ <Typography color="textSecondary">{translate("table.field.asnOrderItem.maktx")}锛�</Typography>
+ <Typography color="textSecondary" maxWidth="200" overflow="hidden">{order?.maktx}</Typography>
+ </Box>
+ </Box>
+ <Box sx={{ display: 'flex' }}>
+ <Box sx={{ display: 'flex', padding: '1em' }}>
+ <Typography color="textSecondary">{translate("table.field.asnOrderItem.anfme")}锛�</Typography>
+ <Typography color="textSecondary">{order?.anfme}</Typography>
+ </Box>
+ </Box>
+ <Box sx={{ display: 'flex' }}>
+ <Box sx={{ display: 'flex', padding: '1em' }}>
+ <Typography color="textSecondary">{translate("table.field.locItem.deadTime")}锛�</Typography>
+ <Typography color="textSecondary">{order?.deadTime}</Typography>
+ </Box>
+ </Box>
+ </Grid>
+ {/* <ListItemSecondaryAction>
<Box
component="span"
sx={{
@@ -68,9 +99,9 @@
color: 'text.primary',
}}
>
- {order.total}$
+ {order.deadTime}
</Box>
- </ListItemSecondaryAction>
+ </ListItemSecondaryAction> */}
</ListItemButton>
</ListItem>
);
--
Gitblit v1.9.1