Commit e60ebe40 authored by youjie's avatar youjie

no message

parent 5f38f11c
...@@ -3662,22 +3662,14 @@ ...@@ -3662,22 +3662,14 @@
); );
} else { } else {
this.chosenIndex = id; this.chosenIndex = id;
if (localStorage.openMode && localStorage.openMode == 1){ if (localStorage.openMode && localStorage.openMode == 1)
if(url=='/SalesVolumeRank'){
this.$router.push({
path: url,
query: {}
});
}else{
this.$router.push({ this.$router.push({
path: url, path: url,
query: { query: {
blank: 'y' blank: 'y'
} }
}); });
} else
}else
this.$router.push({ this.$router.push({
path: url, path: url,
query: {} query: {}
......
...@@ -39,16 +39,18 @@ ...@@ -39,16 +39,18 @@
let LastMonthTime = new Date().getMonth() let LastMonthTime = new Date().getMonth()
let MonthTime = new Date().getMonth() + 1 let MonthTime = new Date().getMonth() + 1
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
let MonthDayNum
let name let name
if(this.type!=3){ if(this.type!=3){
let DepartSTime let DepartSTime
let DepartETime let DepartETime
if(this.Month==1){ if(this.Month==1){
DepartSTime = Year+'-'+(MonthTime>10?MonthTime:'0'+MonthTime)+'-01' DepartSTime = Year+'-'+(MonthTime>10?MonthTime:'0'+MonthTime)+'-01'
DepartETime = this.getBeforeDate(0,this.getBeforeDate(0,new Date().Format("yyyy-MM-dd"))) MonthDayNum = new Date(Year, MonthTime, 0).getDate();
DepartETime = Year+'-'+(MonthTime>10?MonthTime:'0'+MonthTime)+'-'+(MonthDayNum>10?MonthDayNum:'0'+MonthDayNum)
}else{ }else{
DepartSTime = Year+'-'+(LastMonthTime>10?LastMonthTime:'0'+LastMonthTime)+'-01' DepartSTime = Year+'-'+(LastMonthTime>10?LastMonthTime:'0'+LastMonthTime)+'-01'
var MonthDayNum = new Date(Year, LastMonthTime, 0).getDate(); MonthDayNum = new Date(Year, LastMonthTime, 0).getDate();
DepartETime = Year+'-'+(LastMonthTime>10?LastMonthTime:'0'+LastMonthTime)+'-'+(MonthDayNum>10?MonthDayNum:'0'+MonthDayNum) DepartETime = Year+'-'+(LastMonthTime>10?LastMonthTime:'0'+LastMonthTime)+'-'+(MonthDayNum>10?MonthDayNum:'0'+MonthDayNum)
} }
name = 'erpMyCustomerOrder' name = 'erpMyCustomerOrder'
......
...@@ -72,8 +72,9 @@ ...@@ -72,8 +72,9 @@
<span></span> <span></span>
<span>{{data.totalCommission}}</span> <span>{{data.totalCommission}}</span>
</p> </p>
<p > <p style="margin-bottom: 3px;">
<span v-if="data.peopelBonus" style="margin-right: 10px;">人头奖励:+{{data.peopelBonus}}</span> <el-tag v-if="data.peopelBonus" size="mini" type="danger" effect="dark" style="color: #ffff;">奖+{{data.peopelBonus}}</el-tag>
<!-- <span v-if="data.peopelBonus" style="margin-right: 10px;">奖励:+{{data.peopelBonus}}</span> -->
<span style="color: #BDBDBD;font-size: 13px; <span style="color: #BDBDBD;font-size: 13px;
padding: 0 0 5px 0;">{{data.periodsName}}</span> padding: 0 0 5px 0;">{{data.periodsName}}</span>
</p> </p>
......
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