fix(wms/report): 修复年份变量格式错误并移除注释
修复两个报表组件中currentDate变量的多余大括号格式错误 在zinc报表中恢复createBy字段的注释状态为实际值
This commit is contained in:
@@ -161,7 +161,7 @@ export default {
|
|||||||
|
|
||||||
// 获取当前日期(默认选中当天)
|
// 获取当前日期(默认选中当天)
|
||||||
const now = new Date()
|
const now = new Date()
|
||||||
const currentDate = `${now.getFullYear()}}`
|
const currentDate = `${now.getFullYear()}`
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 生成指定年份的时间范围字符串
|
* 生成指定年份的时间范围字符串
|
||||||
@@ -183,6 +183,8 @@ export default {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
console.log(currentDate)
|
||||||
|
|
||||||
const { start, end } = getDayTimeRange(currentDate)
|
const { start, end } = getDayTimeRange(currentDate)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -161,7 +161,7 @@ export default {
|
|||||||
|
|
||||||
// 获取当前日期(默认选中当天)
|
// 获取当前日期(默认选中当天)
|
||||||
const now = new Date()
|
const now = new Date()
|
||||||
const currentDate = `${now.getFullYear()}}`
|
const currentDate = `${now.getFullYear()}`
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 生成指定年份的时间范围字符串
|
* 生成指定年份的时间范围字符串
|
||||||
@@ -224,32 +224,32 @@ export default {
|
|||||||
warehouseQueryMap: {
|
warehouseQueryMap: {
|
||||||
'1988150323162836993': {
|
'1988150323162836993': {
|
||||||
selectType: 'product',
|
selectType: 'product',
|
||||||
// createBy: 'suanzhakuguan',
|
createBy: 'suanzhakuguan',
|
||||||
warehouseId: '1988150323162836993'
|
warehouseId: '1988150323162836993'
|
||||||
},
|
},
|
||||||
'1988150487185289217': {
|
'1988150487185289217': {
|
||||||
selectType: 'raw_material',
|
selectType: 'raw_material',
|
||||||
// createBy: 'suanzhakuguan',
|
createBy: 'suanzhakuguan',
|
||||||
warehouseId: '1988150487185289217'
|
warehouseId: '1988150487185289217'
|
||||||
},
|
},
|
||||||
'2019583656787259393': {
|
'2019583656787259393': {
|
||||||
selectType: 'product',
|
selectType: 'product',
|
||||||
// createBy: 'suanzhakuguan',
|
createBy: 'suanzhakuguan',
|
||||||
warehouseId: '2019583656787259393'
|
warehouseId: '2019583656787259393'
|
||||||
},
|
},
|
||||||
'20195833325311414274': {
|
'20195833325311414274': {
|
||||||
selectType: 'product',
|
selectType: 'product',
|
||||||
// createBy: 'suanzhakuguan',
|
createBy: 'suanzhakuguan',
|
||||||
warehouseId: '20195833325311414274'
|
warehouseId: '20195833325311414274'
|
||||||
},
|
},
|
||||||
'2019583429955104769': {
|
'2019583429955104769': {
|
||||||
selectType: 'product',
|
selectType: 'product',
|
||||||
// createBy: 'suanzhakuguan',
|
createBy: 'suanzhakuguan',
|
||||||
warehouseId: '2019583429955104769'
|
warehouseId: '2019583429955104769'
|
||||||
},
|
},
|
||||||
'2019583137616310273': {
|
'2019583137616310273': {
|
||||||
selectType: 'product',
|
selectType: 'product',
|
||||||
// createBy: 'suanzhakuguan',
|
createBy: 'suanzhakuguan',
|
||||||
warehouseId: '2019583137616310273'
|
warehouseId: '2019583137616310273'
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user