From 1e1cedc70758a7c17ccf63ea11d1db70c409aa66 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期五, 05 九月 2025 09:45:15 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/dashboard/NbList.jsx | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/rsf-admin/src/page/dashboard/NbList.jsx b/rsf-admin/src/page/dashboard/NbList.jsx
index 4cb2005..3794797 100644
--- a/rsf-admin/src/page/dashboard/NbList.jsx
+++ b/rsf-admin/src/page/dashboard/NbList.jsx
@@ -19,20 +19,23 @@
const NbList = ({ deadStock }) => {
const translate = useTranslate();
return (
- <Card sx={{ flex: 1 }}>
+ <Card sx={{
+ flex: 1,
+ }}>
<CardHeader title={translate('page.dashboard.list.stock')} />
- <List dense={true}>
- {deadStock.map(record => (
- <PendingOrder key={`record?.id + ${Math.random().toString(36).substr(2, 9)} `} order={record} />
- ))}
- </List>
+ <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',
@@ -41,7 +44,8 @@
return (
<ListItem disablePadding>
- <ListItemButton component={Link} to={`/orders/${order.id}`}>
+ {/* component={Link} to={`/locItem/${order.id}`} */}
+ <ListItemButton >
{/* <ListItemAvatar>
{isPending ? (
<Avatar />
--
Gitblit v1.9.1