diff --git a/src/views/materialManagement/mmInventoryReport/index.vue b/src/views/materialManagement/mmInventoryReport/index.vue index a3fdca7..97f3645 100644 --- a/src/views/materialManagement/mmInventoryReport/index.vue +++ b/src/views/materialManagement/mmInventoryReport/index.vue @@ -60,22 +60,22 @@ import { saveAs } from 'file-saver' export default { name: 'mmDailyInventoryReport', data() { - // 默认日期范围为当月25日到本月25日 - const startOfMonth = this.$dayjs().subtract(1, 'month').date(25).toDate() - const endOfMonth = this.$dayjs().date(25).toDate() + // 默认日期范围为今日零点到今日结束 + const startOfDay = this.$dayjs().startOf('day').toDate() + const endOfDay = this.$dayjs().endOf('day').toDate() - return { - loading: false, - showSearch: true, - queryParams: { - pageNum: 1, - pageSize: 10, - dateRange: [startOfMonth, endOfMonth], - partNumber: '', - materialName: '', - operator: '', - source: '', - }, + return { + loading: false, + showSearch: true, + queryParams: { + pageNum: 1, + pageSize: 10, + dateRange: [startOfDay, endOfDay], + partNumber: '', + materialName: '', + operator: '', + source: '', + }, columns: [], total: 0, dataList: [], @@ -195,30 +195,26 @@ export default { const worksheet = workbook.addWorksheet('库存报表') // 设置列标题和样式 - const columns = [ - { header: '物料编号', key: 'partnumber', width: 20 }, - { header: '物料名称', key: 'description', width: 30 }, - { header: '数量', key: 'changeQuantity', width: 15 }, - { header: '操作人', key: 'createdBy', width: 15 }, - ] - worksheet.columns = columns + const columns = [ + { header: '物料编号', key: 'partnumber', width: 20 }, + { header: '物料名称', key: 'description', width: 30 }, + { header: '箱数', key: 'changePackage', width: 15 }, + { header: '数量', key: 'changeQuantity', width: 15 }, + { header: '操作人', key: 'createdBy', width: 15 }, + ] + worksheet.columns = columns - // 设置标题行样式 - const headerRow = worksheet.getRow(1) - headerRow.font = { bold: true } - headerRow.alignment = { horizontal: 'center' } - - // 添加日期范围行 - const dateRangeRow = worksheet.addRow([`日期范围: ${startDate} 至 ${endDate}`]) - dateRangeRow.font = { bold: true } - dateRangeRow.alignment = { horizontal: 'left' } - worksheet.addRow([]) // 添加空行 + // 设置标题行样式 + const headerRow = worksheet.getRow(1) + headerRow.font = { bold: true } + headerRow.alignment = { horizontal: 'center' } // 添加数据行 allData.forEach((item) => { worksheet.addRow({ partnumber: item.partnumber, description: item.description, + changePackage: item.changePackage, changeQuantity: item.changeQuantity, createdBy: item.createdBy, }) diff --git a/src/views/materialManagement/mmOutboundReport/index.vue b/src/views/materialManagement/mmOutboundReport/index.vue index 7150645..19da1c2 100644 --- a/src/views/materialManagement/mmOutboundReport/index.vue +++ b/src/views/materialManagement/mmOutboundReport/index.vue @@ -60,22 +60,22 @@ import { saveAs } from 'file-saver' export default { name: 'mmDailyOutboundReport', data() { - // 默认日期范围为当月25日到本月25日 - const startOfMonth = this.$dayjs().subtract(1, 'month').date(25).toDate() - const endOfMonth = this.$dayjs().date(25).toDate() + // 默认日期范围为今日零点到今日结束 + const startOfDay = this.$dayjs().startOf('day').toDate() + const endOfDay = this.$dayjs().endOf('day').toDate() - return { - loading: false, - showSearch: true, - queryParams: { - pageNum: 1, - pageSize: 10, - dateRange: [startOfMonth, endOfMonth], - partNumber: '', - materialName: '', - operator: '', - source: '' - }, + return { + loading: false, + showSearch: true, + queryParams: { + pageNum: 1, + pageSize: 10, + dateRange: [startOfDay, endOfDay], + partNumber: '', + materialName: '', + operator: '', + source: '' + }, columns: [], total: 0, dataList: [], @@ -195,31 +195,27 @@ export default { const worksheet = workbook.addWorksheet('出库报表') // 设置列标题和样式 - const columns = [ - { header: '物料编号', key: 'partnumber', width: 20 }, - { header: '物料名称', key: 'description', width: 30 }, - { header: '数量', key: 'changeQuantity', width: 15 }, - { header: '操作人', key: 'createdBy', width: 15 }, - { header: '操作时间', key: 'createdTime', width: 20 } - ] - worksheet.columns = columns + const columns = [ + { header: '物料编号', key: 'partnumber', width: 20 }, + { header: '物料名称', key: 'description', width: 30 }, + { header: '箱数', key: 'changePackage', width: 15 }, + { header: '数量', key: 'changeQuantity', width: 15 }, + { header: '操作人', key: 'createdBy', width: 15 }, + { header: '操作时间', key: 'createdTime', width: 20 } + ] + worksheet.columns = columns - // 设置标题行样式 - const headerRow = worksheet.getRow(1) - headerRow.font = { bold: true } - headerRow.alignment = { horizontal: 'center' } - - // 添加日期范围行 - const dateRangeRow = worksheet.addRow([`日期范围: ${startDate} 至 ${endDate}`]) - dateRangeRow.font = { bold: true } - dateRangeRow.alignment = { horizontal: 'left' } - worksheet.addRow([]) // 添加空行 + // 设置标题行样式 + const headerRow = worksheet.getRow(1) + headerRow.font = { bold: true } + headerRow.alignment = { horizontal: 'center' } // 添加数据行 allData.forEach(item => { worksheet.addRow({ partnumber: item.partnumber, description: item.description, + changePackage: item.changePackage, changeQuantity: item.changeQuantity, createdBy: item.createdBy, createdTime: item.createdTime