From adb83050b74c2d7fa1845f18e016ef3b18496543 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期三, 22 十月 2025 17:15:43 +0800
Subject: [PATCH] pda波次揀貨優化 放貨成功上報優化 出入庫站點功能優化
---
rsf-admin/src/page/dashboard/index.jsx | 101 +++++++++++++++++++++++++-------------------------
1 files changed, 51 insertions(+), 50 deletions(-)
diff --git a/rsf-admin/src/page/dashboard/index.jsx b/rsf-admin/src/page/dashboard/index.jsx
index b832f8d..a41514c 100644
--- a/rsf-admin/src/page/dashboard/index.jsx
+++ b/rsf-admin/src/page/dashboard/index.jsx
@@ -3,6 +3,7 @@
import React, { useState, useRef, useEffect, useMemo } from "react";
import SensorOccupiedIcon from '@mui/icons-material/SensorOccupied';
import CardWithIcon from '../components/CardWithIcon';
+import CommentIcon from '@mui/icons-material/Comment';
import WifiIcon from '@mui/icons-material/Wifi';
import { useTheme } from '@mui/material/styles';
import { useNavigate } from 'react-router-dom';
@@ -13,6 +14,7 @@
import NbChart from "./NbChart";
import NbList from "./NbList";
import NbCard from "./NbCard";
+import NbPie from './NbPie';
const styles = {
flex: { display: 'flex' },
@@ -72,17 +74,26 @@
const notify = useNotify();
const [statistic, setStatistic] = useState({});
const [stock, setStock] = useState([]);
+ const [deadStock, setDeadStock] = useState([]);
+ const [locUsage, setLocUsages] = useState([]);
+ const [tasks, setTasks] = useState([]);
+ const [total, setTotal] = useState(0);
+
useEffect(() => {
getDashBoardHeader()
getRecentTrands()
getRecentStocks()
+ getRecentUsage()
+ getExcingTasks()
}, [])
const getDashBoardHeader = async () => {
await request.post('/asnOrder/dashbord/header').then(res => {
- const { code, msg, data } = res.data?.data;
+ const { code, msg, data } = res?.data;
+ console.log(code);
+
if (code === 200) {
setStatistic(data);
} else {
@@ -94,10 +105,10 @@
}
const getRecentStocks = async () => {
- await request.post('/asnOrder/dashbord/header').then(res => {
- const { code, msg, data } = res.data?.data;
+ await request.post('/locItem/page', { current: 1, pageSize: 10, orderBy: 'create_time asc' }).then(res => {
+ const { code, msg, data } = res?.data;
if (code === 200) {
- setStatistic(data);
+ setDeadStock(data?.records);
} else {
notify(msg, { type: 'error', messageArgs: { _: msg } });
}
@@ -106,6 +117,32 @@
})
}
+ const getExcingTasks = async () => {
+ await request.post('/task/page', { current: 1, pageSize: 100, orderBy: 'sort desc' }).then(res => {
+ const { code, msg, data } = res?.data;
+ if (code === 200) {
+ setTasks(data?.records)
+ setTotal(data?.total)
+ } else {
+ notify(msg, { type: 'error', messageArgs: { _: msg } });
+ }
+ }).catch((error) => {
+ notify(error.message, { type: 'error', messageArgs: { _: error.message } });
+ })
+ }
+
+ const getRecentUsage = () => {
+ request.post("/loc/pie/list").then(res => {
+ const { code, msg, data } = res?.data;
+ if (code === 200) {
+ setLocUsages(data?.data)
+ } else {
+ notify(msg, { type: 'error', messageArgs: { _: msg } });
+ }
+ }).catch((error) => {
+ notify(error.message, { type: 'error', messageArgs: { _: error.message } });
+ })
+ }
/**
* 鑾峰彇搴撹繎涓�涓湀鍑哄叆搴撲俊鎭�
@@ -123,47 +160,9 @@
})
}
- const recentOrders = [
- {
- id: 1,
- name: 'a',
- date: "2025-08-10T12:23:56.959Z",
- total: 138.94,
- inTotal: 254,
- },
- {
- id: 2,
- name: 'b',
- date: "2025-08-03T07:45:00.304Z",
- total: 214.66,
- inTotal: 258,
- },
- {
- id: 3,
- name: 'c',
- date: "2025-07-28T00:20:10.968Z",
- total: 68.19,
- inTotal: 154,
- },
- {
- id: 4,
- name: 'd',
- date: "2025-07-22T20:39:00.293Z",
- total: 36.56,
- inTotal: 124,
- },
- {
- id: 5,
- name: 'e',
- date: "2025-07-16T17:40:24.791Z",
- total: 100.82,
- inTotal: 354,
- },
- ]
-
return (
<>
- <Grid container md={12}>
+ <Grid container md={12} item>
<Grid item md={8}>
<Box sx={{ display: "flex" }}>
<CardWithIcon
@@ -177,10 +176,9 @@
<CardWithIcon
icon={SensorOccupiedIcon}
subtitle={translate('page.dashboard.header.outStockQty')}
- title={`${statistic?.membersTotalQua}`}
+ title={`${statistic?.outAnf}`}
type={"out"}
statistic={statistic}
-
/>
</Box>
<Spacer />
@@ -188,24 +186,27 @@
<NbChart orders={stock} />
</Box>
<Spacer />
- <Box>
- <NbList orders={recentOrders} />
+ <Box sx={{ display: 'flex', justifyContent: 'space-between' }}>
+ <NbList deadStock={deadStock} />
+ <NbPie locUsage={locUsage} />
</Box>
+ <Spacer />
</Grid>
<Grid item md={4}>
<Box sx={{ display: 'flex' }}>
<Spacer />
<NbCard
- icon={SensorOccupiedIcon}
+ icon={CommentIcon}
subtitle={translate('page.dashboard.header.taskWorkQty')}
- title={`${statistic?.membersTotalQua}`}
+ title={`${statistic?.taskQty}`}
+ total={total}
to={{
pathname: '/task',
search: JSON.stringify({
filter: JSON.stringify({ status: 1 }),
}),
}}
- list={recentOrders}
+ tasks={tasks}
/>
</Box>
</Grid>
--
Gitblit v1.9.1