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: '操作',