[FIX]修改查询今日时结束时间未重置问题

This commit is contained in:
mengxiaolong
2020-07-30 09:17:21 +08:00
parent 6e79b2c122
commit 3ca9079ccb

View File

@@ -254,7 +254,6 @@ export default {
pageSize: 0, pageSize: 0,
pageNum: 0 pageNum: 0
} }
console.log(condition)
const rs = await getTableList(condition) const rs = await getTableList(condition)
if (rs.result === '1') { if (rs.result === '1') {
this.tableData = [] this.tableData = []
@@ -280,7 +279,6 @@ export default {
}, },
async getRankList() { async getRankList() {
const rs = await getRankList() const rs = await getRankList()
console.log('rs ::::: ', rs)
rs.content.branchGroupBaseDtoList.map(item => { rs.content.branchGroupBaseDtoList.map(item => {
return (item.text = item.name) return (item.text = item.name)
}) })
@@ -314,7 +312,6 @@ export default {
this.params[`picker_${this.pickerType}`] = data this.params[`picker_${this.pickerType}`] = data
if (this.pickerType === 1) { if (this.pickerType === 1) {
let data = await getGankLevel(this.params.picker_1.agentgroup) let data = await getGankLevel(this.params.picker_1.agentgroup)
console.log(data)
this.pickerData.branchGroupBaseDtoList = data.content this.pickerData.branchGroupBaseDtoList = data.content
} }
this.getTableList() this.getTableList()
@@ -339,6 +336,7 @@ export default {
this.searchType = false this.searchType = false
this.showTime = false this.showTime = false
this.startTime = new Date() this.startTime = new Date()
this.endTime = new Date()
this.startTimeStr = dateUtil.formatDate(this.startTime, 'yyyy-MM-dd') this.startTimeStr = dateUtil.formatDate(this.startTime, 'yyyy-MM-dd')
this.endTimeStr = dateUtil.formatDate(this.endTime, 'yyyy-MM-dd') this.endTimeStr = dateUtil.formatDate(this.endTime, 'yyyy-MM-dd')
this.getTableList() this.getTableList()
@@ -367,7 +365,6 @@ export default {
pageNum: 0 pageNum: 0
} }
}) })
console.log(rs)
this.excelUrl = config.imgDomain + '/returnDirectStream?imgPath=' + rs.content this.excelUrl = config.imgDomain + '/returnDirectStream?imgPath=' + rs.content
}, },
async appCallBack(data) { async appCallBack(data) {
@@ -377,7 +374,6 @@ export default {
if (res.result == '0') { if (res.result == '0') {
if (res.content.length > 0) { if (res.content.length > 0) {
this.downLoadUrl = config.imgDomain + '/returnDirectStream?imgPath=' + res.content this.downLoadUrl = config.imgDomain + '/returnDirectStream?imgPath=' + res.content
console.log('this.downLoadUrl == ', this.downLoadUrl)
} }
} else return this.$toast(res.resultMessage) } else return this.$toast(res.resultMessage)
}) })
@@ -430,6 +426,7 @@ export default {
this.endTimeStr = dateUtil.formatDate(value, 'yyyy-MM-dd') this.endTimeStr = dateUtil.formatDate(value, 'yyyy-MM-dd')
}, },
queryTableList() { queryTableList() {
if (this.startTime.getTime() > this.endTime.getTime()) return this.$toast('开始时间不能大于结束时间')
this.searchType = true this.searchType = true
this.getTableList() this.getTableList()
} }