diff --git a/web/.vscode/extensions.json b/web/.vscode/extensions.json
deleted file mode 100644
index 0925499..0000000
--- a/web/.vscode/extensions.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "recommendations": [
- "formulahendry.code-runner"
- ]
-}
\ No newline at end of file
diff --git a/web/.vscode/settings.json b/web/.vscode/settings.json
deleted file mode 100644
index f5f67f5..0000000
--- a/web/.vscode/settings.json
+++ /dev/null
@@ -1,4 +0,0 @@
-// 将设置放入此文件中以覆盖默认值和用户设置。
-{
- "editor.fontSize": 16,
-}
\ No newline at end of file
diff --git a/web/client/src/sections/business/containers/reserveItemsDepSummary.jsx b/web/client/src/sections/business/containers/reserveItemsDepSummary.jsx
index 5f46de5..bf9a4bc 100644
--- a/web/client/src/sections/business/containers/reserveItemsDepSummary.jsx
+++ b/web/client/src/sections/business/containers/reserveItemsDepSummary.jsx
@@ -1,11 +1,42 @@
import React, { useEffect, useState } from 'react';
import { connect } from 'react-redux';
-import { Select, Input, Button, RadioGroup, Radio, Tooltip } from '@douyinfe/semi-ui';
-import { IconSearch } from '@douyinfe/semi-icons';
+import { Select, Input, Table, Spin, Button } from '@douyinfe/semi-ui';
+import { RESERVEITEM_TYPE } from '../constants';
import '../style.less'
-import moment from 'moment'
const ReserveItemsDepSummary = (props) => {
+ const { dispatch, actions, isRequesting, reserveItemReport } = props;
+ const [downloadUrl, setDownloadUrl] = useState(null);
+ const [downloadKey, setDownloadKey] = useState(null);
+ useEffect(() => {
+ dispatch(actions.businessManagement.getReserveItemReport(RESERVEITEM_TYPE.depSummary));
+ }, []);
+
+ const exportReport = (url) => {
+ setDownloadUrl(`/_file-server${url}`);
+ setDownloadKey(Math.random());
+ }
+ const columns = [
+ {
+ title: '序号',
+ dataIndex: 'name',
+ render: (text, record, index) => index + 1
+ },
+ {
+ title: '时间',
+ dataIndex: 'date',
+ },
+ {
+ title: '名称',
+ dataIndex: 'path',
+ },
+ {
+ title: '操作',
+ dataIndex: 'action',
+ render: (text, record, indexe) => ()
+ },
+ ];
+
return (
<>
@@ -26,12 +57,17 @@ const ReserveItemsDepSummary = (props) => {
-
-
+ {
+ downloadUrl ?
: ''
+ }
+
@@ -41,10 +77,12 @@ const ReserveItemsDepSummary = (props) => {
function mapStateToProps(state) {
- const { auth, global } = state;
+ const { auth, global, reserveItemReport } = state;
return {
user: auth.user,
actions: global.actions,
+ reserveItemReport: reserveItemReport.data || [],
+ isRequesting: reserveItemReport.isRequesting
};
}
diff --git a/web/client/src/sections/business/containers/reserveItemsLostStatistics.jsx b/web/client/src/sections/business/containers/reserveItemsLostStatistics.jsx
index f3b88db..a0aea31 100644
--- a/web/client/src/sections/business/containers/reserveItemsLostStatistics.jsx
+++ b/web/client/src/sections/business/containers/reserveItemsLostStatistics.jsx
@@ -1,11 +1,41 @@
import React, { useEffect, useState } from 'react';
import { connect } from 'react-redux';
-import { Select, Input, Button, RadioGroup, Radio, Tooltip } from '@douyinfe/semi-ui';
-import { IconSearch } from '@douyinfe/semi-icons';
+import { Select, Input, Spin, Table, Button } from '@douyinfe/semi-ui';
+import { RESERVEITEM_TYPE } from '../constants';
import '../style.less'
-import moment from 'moment'
const ReserveItemsLostStatistics = (props) => {
+ const { dispatch, actions, isRequesting, reserveItemReport } = props;
+ const [downloadUrl, setDownloadUrl] = useState(null);
+ const [downloadKey, setDownloadKey] = useState(null);
+ useEffect(() => {
+ dispatch(actions.businessManagement.getReserveItemReport(RESERVEITEM_TYPE.lostStatistic));
+ }, []);
+
+ const exportReport = (url) => {
+ setDownloadUrl(`/_file-server${url}`);
+ setDownloadKey(Math.random());
+ }
+ const columns = [
+ {
+ title: '序号',
+ dataIndex: 'name',
+ render: (text, record, index) => index + 1
+ },
+ {
+ title: '时间',
+ dataIndex: 'date',
+ },
+ {
+ title: '名称',
+ dataIndex: 'path',
+ },
+ {
+ title: '操作',
+ dataIndex: 'action',
+ render: (text, record, indexe) => ()
+ },
+ ];
return (
<>
@@ -26,12 +56,17 @@ const ReserveItemsLostStatistics = (props) => {
-
-
+ {
+ downloadUrl ?
: ''
+ }
+
@@ -41,10 +76,12 @@ const ReserveItemsLostStatistics = (props) => {
function mapStateToProps(state) {
- const { auth, global } = state;
+ const { auth, global, reserveItemReport } = state;
return {
user: auth.user,
actions: global.actions,
+ reserveItemReport: reserveItemReport.data || [],
+ isRequesting: reserveItemReport.isRequesting
};
}
diff --git a/web/client/src/sections/business/containers/reserveItemsPeriodicStatistics.jsx b/web/client/src/sections/business/containers/reserveItemsPeriodicStatistics.jsx
index 9f56834..bbc9346 100644
--- a/web/client/src/sections/business/containers/reserveItemsPeriodicStatistics.jsx
+++ b/web/client/src/sections/business/containers/reserveItemsPeriodicStatistics.jsx
@@ -1,8 +1,6 @@
import React, { useEffect, useState } from 'react';
import { connect } from 'react-redux';
-import { Select, Input, Spin, Button, RadioGroup, Radio, Table } from '@douyinfe/semi-ui';
-import { IconSearch } from '@douyinfe/semi-icons';
-import { RouteRequest, RouteTable } from '$utils';
+import { Select, Input, Spin, Button, Table } from '@douyinfe/semi-ui';
import { RESERVEITEM_TYPE } from '../constants';
import '../style.less'
@@ -68,7 +66,6 @@ const ReserveItemsPeriodicStatistics = (props) => {
rowKey={"id"}
columns={columns}
dataSource={reserveItemReport}
- // pagination={false}
/>