Merge branch 'hotfix/机构业绩日期无法选择将来问题修改' into release/1201

This commit is contained in:
mengxiaolong
2020-12-01 17:46:20 +08:00

View File

@@ -132,9 +132,9 @@ export default {
data() { data() {
return { return {
showText: true, showText: true,
YearColumns: ['2020', '2019'], YearColumns: [],
minDate: new Date(2019, 0, 1), minDate: new Date(2019, 0, 1),
maxDate: new Date(2020, 10, 1), maxDate: new Date(),
currentMonthDate: new Date(), currentMonthDate: new Date(),
currentYearDate: new Date(), currentYearDate: new Date(),
currentDate: new Date(), currentDate: new Date(),
@@ -271,7 +271,6 @@ export default {
// 日 // 日
this.dateType = 'd' this.dateType = 'd'
this.dateVal = this.dateFormat(this.currentDate) this.dateVal = this.dateFormat(this.currentDate)
console.log(this.dateVal)
// 左侧时间实时赋值 // 左侧时间实时赋值
this.timeVal = this.dateVal this.timeVal = this.dateVal
} else if (this.curTab == 2) { } else if (this.curTab == 2) {
@@ -336,7 +335,6 @@ export default {
branchOfficeApi(data) branchOfficeApi(data)
.then(res => { .then(res => {
if (res.result == 0) { if (res.result == 0) {
console.log(res.content.list)
$this.tableData = res.content.list $this.tableData = res.content.list
$this.ysjsTotal = 0 $this.ysjsTotal = 0
@@ -356,7 +354,6 @@ export default {
$this.cbbfTotal = Number($this.cbbfTotal) + Number(val.cbbf) $this.cbbfTotal = Number($this.cbbfTotal) + Number(val.cbbf)
$this.bzbfTotal = Number($this.bzbfTotal) + Number(val.bzbf) $this.bzbfTotal = Number($this.bzbfTotal) + Number(val.bzbf)
}) })
console.log($this.tableData)
} }
}) })
.catch(err => {}) .catch(err => {})
@@ -379,6 +376,10 @@ export default {
mounted() { mounted() {
// this.timeVal=this.$route.query.timeVal||"" // this.timeVal=this.$route.query.timeVal||""
// this.showText=this.$route.query.showText // this.showText=this.$route.query.showText
let currentYear = new Date().getFullYear()
for (let year = 2019; year <= currentYear; year++) {
this.YearColumns.unshift(year)
}
this.getCurrentDate() this.getCurrentDate()
setInterval(this.getCurrentDate, 1000 * 60) setInterval(this.getCurrentDate, 1000 * 60)