feat(报表): 修改默认日期范围并添加箱数列
将库存和出库报表的默认日期范围从当月25日改为当日 在报表导出中添加箱数列并移除日期范围行
This commit is contained in:
@@ -60,9 +60,9 @@ 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,
|
||||||
@@ -70,7 +70,7 @@ export default {
|
|||||||
queryParams: {
|
queryParams: {
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
dateRange: [startOfMonth, endOfMonth],
|
dateRange: [startOfDay, endOfDay],
|
||||||
partNumber: '',
|
partNumber: '',
|
||||||
materialName: '',
|
materialName: '',
|
||||||
operator: '',
|
operator: '',
|
||||||
@@ -198,6 +198,7 @@ export default {
|
|||||||
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: 'changePackage', width: 15 },
|
||||||
{ header: '数量', key: 'changeQuantity', width: 15 },
|
{ header: '数量', key: 'changeQuantity', width: 15 },
|
||||||
{ header: '操作人', key: 'createdBy', width: 15 },
|
{ header: '操作人', key: 'createdBy', width: 15 },
|
||||||
]
|
]
|
||||||
@@ -208,17 +209,12 @@ export default {
|
|||||||
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,
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -60,9 +60,9 @@ 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,
|
||||||
@@ -70,7 +70,7 @@ export default {
|
|||||||
queryParams: {
|
queryParams: {
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
dateRange: [startOfMonth, endOfMonth],
|
dateRange: [startOfDay, endOfDay],
|
||||||
partNumber: '',
|
partNumber: '',
|
||||||
materialName: '',
|
materialName: '',
|
||||||
operator: '',
|
operator: '',
|
||||||
@@ -198,6 +198,7 @@ export default {
|
|||||||
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: 'changePackage', width: 15 },
|
||||||
{ header: '数量', key: 'changeQuantity', width: 15 },
|
{ header: '数量', key: 'changeQuantity', width: 15 },
|
||||||
{ header: '操作人', key: 'createdBy', width: 15 },
|
{ header: '操作人', key: 'createdBy', width: 15 },
|
||||||
{ header: '操作时间', key: 'createdTime', width: 20 }
|
{ header: '操作时间', key: 'createdTime', width: 20 }
|
||||||
@@ -209,17 +210,12 @@ export default {
|
|||||||
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
|
||||||
|
|||||||
Reference in New Issue
Block a user