Teams/shanghaigangxiangtuzhuangVUE
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(报表): 修改默认日期范围并添加箱数列

Browse Source 
将库存和出库报表的默认日期范围从当月25日改为当日
在报表导出中添加箱数列并移除日期范围行
This commit is contained in:
赵正易
2025-08-15 20:46:50 +08:00
parent ebe3b4681b
commit 59d2e7094e
2 changed files with 57 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/views/materialManagement/mmInventoryReport/index.vue
View File

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

62
src/views/materialManagement/mmOutboundReport/index.vue
View File

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