From 805d2c585c453051d67caf2246c3241c2f543770 Mon Sep 17 00:00:00 2001
From: Archer_cdm <chen.dinming@free-sun.com.cn>
Date: Thu, 24 Nov 2022 10:14:54 +0800
Subject: [PATCH] =?UTF-8?q?=EF=BC=88*=EF=BC=89=E5=A2=9E=E5=8A=A0name?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=96=87=E4=BB=B6=E5=90=8D=20=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9api=E6=8E=A5=E5=8F=A3=E5=92=8Cweb=E5=8F=96=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/app/lib/controllers/report/index.js                      | 3 ++-
 api/app/lib/models/reserveItemReport.js                      | 5 +++++
 .../sections/business/containers/reserveItemsDepSummary.jsx  | 2 +-
 .../business/containers/reserveItemsLostStatistics.jsx       | 2 +-
 .../business/containers/reserveItemsPeriodicStatistics.jsx   | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/api/app/lib/controllers/report/index.js b/api/app/lib/controllers/report/index.js
index 5562e2f..930fd12 100644
--- a/api/app/lib/controllers/report/index.js
+++ b/api/app/lib/controllers/report/index.js
@@ -14,7 +14,8 @@ async function getReserveItemReport(ctx, next) {
                 id: e.id,
                 date: e.year + '-' + e.month,
                 path: e.path,
-                type: e.type
+                type: e.type,
+                name: e.name
             }
         })
         ctx.status = 200
diff --git a/api/app/lib/models/reserveItemReport.js b/api/app/lib/models/reserveItemReport.js
index 532f1a7..67a9970 100644
--- a/api/app/lib/models/reserveItemReport.js
+++ b/api/app/lib/models/reserveItemReport.js
@@ -31,6 +31,11 @@ module.exports = dc => {
             type: DataTypes.STRING,
             allowNull: true,
             field: "type",
+        },
+        name: {
+            type: DataTypes.STRING,
+            allowNull: false,
+            field: "name",
         }
     }, {
         tableName: "reserve_item_report",
diff --git a/web/client/src/sections/business/containers/reserveItemsDepSummary.jsx b/web/client/src/sections/business/containers/reserveItemsDepSummary.jsx
index bf9a4bc..527a650 100644
--- a/web/client/src/sections/business/containers/reserveItemsDepSummary.jsx
+++ b/web/client/src/sections/business/containers/reserveItemsDepSummary.jsx
@@ -28,7 +28,7 @@ const ReserveItemsDepSummary = (props) => {
         },
         {
             title: '名称',
-            dataIndex: 'path',
+            dataIndex: 'name',
         },
         {
             title: '操作',
diff --git a/web/client/src/sections/business/containers/reserveItemsLostStatistics.jsx b/web/client/src/sections/business/containers/reserveItemsLostStatistics.jsx
index a0aea31..0d7d634 100644
--- a/web/client/src/sections/business/containers/reserveItemsLostStatistics.jsx
+++ b/web/client/src/sections/business/containers/reserveItemsLostStatistics.jsx
@@ -28,7 +28,7 @@ const ReserveItemsLostStatistics = (props) => {
         },
         {
             title: '名称',
-            dataIndex: 'path',
+            dataIndex: 'name',
         },
         {
             title: '操作',
diff --git a/web/client/src/sections/business/containers/reserveItemsPeriodicStatistics.jsx b/web/client/src/sections/business/containers/reserveItemsPeriodicStatistics.jsx
index bbc9346..63aa7fa 100644
--- a/web/client/src/sections/business/containers/reserveItemsPeriodicStatistics.jsx
+++ b/web/client/src/sections/business/containers/reserveItemsPeriodicStatistics.jsx
@@ -29,7 +29,7 @@ const ReserveItemsPeriodicStatistics = (props) => {
         },
         {
             title: '名称',
-            dataIndex: 'path',
+            dataIndex: 'name',
         },
         {
             title: '操作',