From 2513e34278d23b5e9e6a531771638df2113d0281 Mon Sep 17 00:00:00 2001
From: zhouxin <zhou.xin@free-sun.com.cn>
Date: Thu, 24 Nov 2022 09:27:23 +0800
Subject: [PATCH] =?UTF-8?q?(*)=E6=B1=87=E6=80=BB=E3=80=81=E4=B8=A2?=
 =?UTF-8?q?=E5=8D=95=E7=BB=9F=E8=AE=A1=E5=90=8C=E5=91=A8=E6=9C=9F=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/.vscode/extensions.json                   |  5 --
 web/.vscode/settings.json                     |  4 --
 .../containers/reserveItemsDepSummary.jsx     | 58 +++++++++++++++----
 .../containers/reserveItemsLostStatistics.jsx | 57 ++++++++++++++----
 .../reserveItemsPeriodicStatistics.jsx        |  5 +-
 5 files changed, 96 insertions(+), 33 deletions(-)
 delete mode 100644 web/.vscode/extensions.json
 delete mode 100644 web/.vscode/settings.json

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) => (<Button theme='solid' type='secondary' onClick={() => exportReport(record.path)} > 导出</Button >)
+        },
+    ];
+
 
     return (
         <>
@@ -26,12 +57,17 @@ const ReserveItemsDepSummary = (props) => {
                         </div>
                     </div>
                     <div style={{ borderBottom: '1px solid #F2F3F5', marginLeft: '-20px', marginBottom: 16 }}></div>
-                    <div style={{ display: 'flex', justifyContent: 'space-between', marginBottom: 22 }}>
-                        <div style={{ display: 'flex', }}>
-                            <div style={{ color: '#646566', fontSize: 14 }}>
-                                当前显示
-                            </div>
-                        </div>
+                    {
+                        downloadUrl ? <iframe key={downloadKey} src={downloadUrl} style={{ display: 'none' }} /> : ''
+                    }
+                    <div style={{ marginBottom: 22 }}>
+                        <Spin spinning={isRequesting}>
+                            <Table
+                                rowKey={"id"}
+                                columns={columns}
+                                dataSource={reserveItemReport}
+                            />
+                        </Spin>
                     </div>
                 </div>
             </div>
@@ -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) => (<Button theme='solid' type='secondary' onClick={() => exportReport(record.path)} > 导出</Button >)
+        },
+    ];
 
     return (
         <>
@@ -26,12 +56,17 @@ const ReserveItemsLostStatistics = (props) => {
                         </div>
                     </div>
                     <div style={{ borderBottom: '1px solid #F2F3F5', marginLeft: '-20px', marginBottom: 16 }}></div>
-                    <div style={{ display: 'flex', justifyContent: 'space-between', marginBottom: 22 }}>
-                        <div style={{ display: 'flex', }}>
-                            <div style={{ color: '#646566', fontSize: 14 }}>
-                                当前显示
-                            </div>
-                        </div>
+                    {
+                        downloadUrl ? <iframe key={downloadKey} src={downloadUrl} style={{ display: 'none' }} /> : ''
+                    }
+                    <div style={{ marginBottom: 22 }}>
+                        <Spin spinning={isRequesting}>
+                            <Table
+                                rowKey={"id"}
+                                columns={columns}
+                                dataSource={reserveItemReport}
+                            />
+                        </Spin>
                     </div>
                 </div>
             </div>
@@ -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}
                             />
                         </Spin>
                     </div>