Skip to content

S
SuperMan
Commit a48388ed authored by youjie's avatar youjie
Browse files
Options

操作 销售 提成详情 时间查询修复

parent a0fb7501
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 2 deletions
src/components/sale/ExpectedCommission.vue
View file @ a48388ed
...@@ -567,6 +567,8 @@ ...@@ -567,6 +567,8 @@
CommissionInfor:{}, CommissionInfor:{},
OrderList: [], OrderList: [],
loading: true, loading: true,
Year: "",
Year2: "",
YearTime:'', YearTime:'',
LastMonthTime: '', LastMonthTime: '',
MonthTime: '', MonthTime: '',
...@@ -611,7 +613,9 @@ ...@@ -611,7 +613,9 @@
} }
let nowdays = new Date() let nowdays = new Date()
this.Year = new Date().getFullYear() this.Year = new Date().getFullYear()
this.Year2 = new Date().getFullYear()-1
this.LastMonthTime = new Date().getMonth() this.LastMonthTime = new Date().getMonth()
this.LastMonthTime = this.LastMonthTime==0?12:this.LastMonthTime
this.MonthTime = new Date().getMonth() + 1 this.MonthTime = new Date().getMonth() + 1
this.msg.Month = this.Year+'-'+(this.MonthTime>=10?this.MonthTime:'0'+this.MonthTime) this.msg.Month = this.Year+'-'+(this.MonthTime>=10?this.MonthTime:'0'+this.MonthTime)
this.MonthList[0].Name = this.MonthList[0].Name+'('+this.LastMonthTime+'月)' this.MonthList[0].Name = this.MonthList[0].Name+'('+this.LastMonthTime+'月)'
...@@ -640,7 +644,9 @@ ...@@ -640,7 +644,9 @@
if(item.Id==1){ if(item.Id==1){
this.msg.Month = this.Year+'-'+(this.MonthTime>=10?this.MonthTime:'0'+this.MonthTime) this.msg.Month = this.Year+'-'+(this.MonthTime>=10?this.MonthTime:'0'+this.MonthTime)
}else{ }else{
this.msg.Month = this.Year+'-'+(this.LastMonthTime>=10?this.LastMonthTime:'0'+this.LastMonthTime) console.log(item)
if(this.LastMonthTime==12)this.msg.Month = this.Year2+'-'+(this.LastMonthTime>=10?this.LastMonthTime:'0'+this.LastMonthTime)
else this.msg.Month = this.Year+'-'+(this.LastMonthTime>=10?this.LastMonthTime:'0'+this.LastMonthTime)
} }
this.getList() this.getList()
// this.getData() // this.getData()
......
src/components/temp/operation.vue
View file @ a48388ed
...@@ -645,6 +645,8 @@ ...@@ -645,6 +645,8 @@
], ],
CommissionInfor: {}, CommissionInfor: {},
OrderList: [], OrderList: [],
Year: "",
Year2: "",
YearTime: '', YearTime: '',
LastMonthTime: '', LastMonthTime: '',
MonthTime: '', MonthTime: '',
...@@ -716,7 +718,8 @@ ...@@ -716,7 +718,8 @@
if (item.Id == 1) { if (item.Id == 1) {
this.msg.Month = this.Year + '-' + (this.MonthTime >= 10 ? this.MonthTime : '0' + this.MonthTime) this.msg.Month = this.Year + '-' + (this.MonthTime >= 10 ? this.MonthTime : '0' + this.MonthTime)
} else { } else {
this.msg.Month = this.Year + '-' + (this.LastMonthTime >= 10 ? this.LastMonthTime : '0' + this.LastMonthTime) if(this.LastMonthTime==12) this.msg.Month = this.Year2 + '-' + (this.LastMonthTime >= 10 ? this.LastMonthTime : '0' + this.LastMonthTime)
else this.msg.Month = this.Year + '-' + (this.LastMonthTime >= 10 ? this.LastMonthTime : '0' + this.LastMonthTime)
} }
this.getList() this.getList()
}, },
...@@ -889,7 +892,9 @@ ...@@ -889,7 +892,9 @@
} }
let nowdays = new Date() let nowdays = new Date()
this.Year = new Date().getFullYear() this.Year = new Date().getFullYear()
this.Year2 = new Date().getFullYear()-1
this.LastMonthTime = new Date().getMonth() this.LastMonthTime = new Date().getMonth()
this.LastMonthTime = this.LastMonthTime==0?12:this.LastMonthTime
this.MonthTime = new Date().getMonth() + 1 this.MonthTime = new Date().getMonth() + 1
this.msg.Month = this.Year + '-' + (this.MonthTime >= 10 ? this.MonthTime : '0' + this.MonthTime) this.msg.Month = this.Year + '-' + (this.MonthTime >= 10 ? this.MonthTime : '0' + this.MonthTime)
this.MonthList[0].Name = this.MonthList[0].Name + '(' + this.LastMonthTime + '月)' this.MonthList[0].Name = this.MonthList[0].Name + '(' + this.LastMonthTime + '月)'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment