Commit e8970357 authored by Mac's avatar Mac

1

parent 17c9e546
...@@ -197,125 +197,95 @@ ...@@ -197,125 +197,95 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- <div style="width: 100%;display: flex;"> <div style="width: 100%;display: flex;" v-if='RateList && RateList.length>0 '>
<div style="width: 130px;"> <div style="width: 150px;">
<table class="singeRowTable TcNewTable" border="1" cellspacing="0" cellpadding="0" :style="{width: '150px'}">
<tr > <td class="qthuanbicheng" style="width: 150px;"></td> </tr>
<tr v-for='(x,y) in leftData' :key = 'y'> <td class="qthuanbicheng">{{x.Name}}</td></tr>
</table>
</div> </div>
</div> --> <div style="width:1px; overflow:scroll;flex:1" >
<div style="width:100%; overflow:scroll;" v-if='RateList && RateList.length>0 && loading'>
<table class="singeRowTable TcNewTable" border="1" cellspacing="0" cellpadding="0" :style="{width: tablewidth+'px'}"> <table class="singeRowTable TcNewTable" border="1" cellspacing="0" cellpadding="0" :style="{width: tablewidth+'px'}">
<tr > <tr > <td class="qthuanbicheng" style="width:90px;font-size: 12px;" v-for='(x,y) in RateList' :key = 'y'>{{x.Date}}</td></tr>
<td class="qthuanbicheng" style="width: 150px;"></td> <tr> <td v-for='(x,y) in RateList' :key = 'y'><span :style="{color: getisred(x.MAvgPeopleNum) == true?'#FD0F05':'#111111'}">{{x.MAvgPeopleNum}}%</span> </td></tr>
<td class="qthuanbicheng" style="width:90px;font-size: 12px;" v-for='(x,y) in RateList' :key = 'y'>{{x.Date}}</td> <tr><td v-for='(x,y) in RateList' :key = 'y'><span :style="{color: getisred(x.MAvgOrderNum) == true?'#FD0F05':'#111111'}">{{x.MAvgOrderNum}}%</span></td></tr>
</tr>
<tr>
<td class="qthuanbicheng">平均付款人数成长率</td>
<td v-for='(x,y) in RateList' :key = 'y'>
<span :style="{color: getisred(x.MAvgPeopleNum) == true?'#FD0F05':'#111111'}">{{x.MAvgPeopleNum}}%</span>
</td>
</tr>
<tr> <tr>
<td class="qthuanbicheng">平均付款单数成长率</td>
<td v-for='(x,y) in RateList' :key = 'y'>
<span :style="{color: getisred(x.MAvgOrderNum) == true?'#FD0F05':'#111111'}">{{x.MAvgOrderNum}}%</span>
</td>
</tr>
<tr>
<td class="qthuanbicheng">平均付款金额成长率</td>
<td v-for='(x,y) in RateList' :key = 'y'> <td v-for='(x,y) in RateList' :key = 'y'>
<span :style="{color: getisred(x.MAvgPayMoney) == true?'#FD0F05':'#111111'}">{{x.MAvgPayMoney}}%</span> <span :style="{color: getisred(x.MAvgPayMoney) == true?'#FD0F05':'#111111'}">{{x.MAvgPayMoney}}%</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="qthuanbicheng">平均付款件数成长率</td>
<td v-for='(x,y) in RateList' :key = 'y'> <td v-for='(x,y) in RateList' :key = 'y'>
<span :style="{color: getisred(x.MAvgBuyNum) == true?'#FD0F05':'#111111'}">{{x.MAvgBuyNum}}%</span> <span :style="{color: getisred(x.MAvgBuyNum) == true?'#FD0F05':'#111111'}">{{x.MAvgBuyNum}}%</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="qthuanbicheng">平均每人购买单数成长率</td>
<td v-for='(x,y) in RateList' :key = 'y'> <td v-for='(x,y) in RateList' :key = 'y'>
<span :style="{color: getisred(x.PAvgOrderNum) == true?'#FD0F05':'#111111'}">{{x.PAvgOrderNum}}%</span> <span :style="{color: getisred(x.PAvgOrderNum) == true?'#FD0F05':'#111111'}">{{x.PAvgOrderNum}}%</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="qthuanbicheng">平均每人购买件数成长率</td>
<td v-for='(x,y) in RateList' :key = 'y'> <td v-for='(x,y) in RateList' :key = 'y'>
<span :style="{color: getisred(x.PAvgBuyNum) == true?'#FD0F05':'#111111'}">{{x.PAvgBuyNum}}%</span> <span :style="{color: getisred(x.PAvgBuyNum) == true?'#FD0F05':'#111111'}">{{x.PAvgBuyNum}}%</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="qthuanbicheng">平均每单单价成长率</td>
<td v-for='(x,y) in RateList' :key = 'y'> <td v-for='(x,y) in RateList' :key = 'y'>
<span :style="{color: getisred(x.PAvgUnitPrice) == true?'#FD0F05':'#111111'}">{{x.PAvgUnitPrice}}%</span> <span :style="{color: getisred(x.PAvgUnitPrice) == true?'#FD0F05':'#111111'}">{{x.PAvgUnitPrice}}%</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="qthuanbicheng">平均每人购买单价成长率</td>
<td v-for='(x,y) in RateList' :key = 'y'> <td v-for='(x,y) in RateList' :key = 'y'>
<span :style="{color: getisred(x.PAvgBuyPrice) == true?'#FD0F05':'#111111'}">{{x.PAvgBuyPrice}}%</span> <span :style="{color: getisred(x.PAvgBuyPrice) == true?'#FD0F05':'#111111'}">{{x.PAvgBuyPrice}}%</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="qthuanbicheng">毛利率成长率</td>
<td v-for='(x,y) in RateList' :key = 'y'> <td v-for='(x,y) in RateList' :key = 'y'>
<span :style="{color: getisred(x.PAvgProfitRate) == true?'#FD0F05':'#111111'}">{{x.PAvgProfitRate}}%</span> <span :style="{color: getisred(x.PAvgProfitRate) == true?'#FD0F05':'#111111'}">{{x.PAvgProfitRate}}%</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="qthuanbicheng">毛利成长率</td>
<td v-for='(x,y) in RateList' :key = 'y'> <td v-for='(x,y) in RateList' :key = 'y'>
<span :style="{color: getisred(x.PAvgProfit) == true?'#FD0F05':'#111111'}">{{x.PAvgProfit}}%</span> <span :style="{color: getisred(x.PAvgProfit) == true?'#FD0F05':'#111111'}">{{x.PAvgProfit}}%</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="qthuanbicheng">会员下订单成长率</td>
<td v-for='(x,y) in RateList' :key = 'y'> <td v-for='(x,y) in RateList' :key = 'y'>
<span :style="{color: getisred(x.PAvgMOrderRate) == true?'#FD0F05':'#111111'}">{{x.PAvgMOrderRate}}%</span> <span :style="{color: getisred(x.PAvgMOrderRate) == true?'#FD0F05':'#111111'}">{{x.PAvgMOrderRate}}%</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="qthuanbicheng">普象会员成长率</td>
<td v-for='(x,y) in RateList' :key = 'y'> <td v-for='(x,y) in RateList' :key = 'y'>
<span :style="{color: getisred(x.PAvgPXNum) == true?'#FD0F05':'#111111'}">{{x.PAvgPXNum}}%</span> <span :style="{color: getisred(x.PAvgPXNum) == true?'#FD0F05':'#111111'}">{{x.PAvgPXNum}}%</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="qthuanbicheng">VIP会员成长率</td>
<td v-for='(x,y) in RateList' :key = 'y'> <td v-for='(x,y) in RateList' :key = 'y'>
<span :style="{color: getisred(x.PAvgVipNum) == true?'#FD0F05':'#111111'}">{{x.PAvgVipNum}}%</span> <span :style="{color: getisred(x.PAvgVipNum) == true?'#FD0F05':'#111111'}">{{x.PAvgVipNum}}%</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="qthuanbicheng">银象会员成长率</td>
<td v-for='(x,y) in RateList' :key = 'y'> <td v-for='(x,y) in RateList' :key = 'y'>
<span :style="{color: getisred(x.PAvgYXNum) == true?'#FD0F05':'#111111'}">{{x.PAvgYXNum}}%</span> <span :style="{color: getisred(x.PAvgYXNum) == true?'#FD0F05':'#111111'}">{{x.PAvgYXNum}}%</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="qthuanbicheng">金象会员成长率</td>
<td v-for='(x,y) in RateList' :key = 'y'> <td v-for='(x,y) in RateList' :key = 'y'>
<span :style="{color: getisred(x.PAvgJXNum) == true?'#FD0F05':'#111111'}">{{x.PAvgJXNum}}%</span> <span :style="{color: getisred(x.PAvgJXNum) == true?'#FD0F05':'#111111'}">{{x.PAvgJXNum}}%</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="qthuanbicheng">会员总成长率</td>
<td v-for='(x,y) in RateList' :key = 'y'> <td v-for='(x,y) in RateList' :key = 'y'>
<span :style="{color: getisred(x.PAvgTotalMNum) == true?'#FD0F05':'#111111'}">{{x.PAvgTotalMNum}}%</span> <span :style="{color: getisred(x.PAvgTotalMNum) == true?'#FD0F05':'#111111'}">{{x.PAvgTotalMNum}}%</span>
</td> </td>
</tr> </tr>
</table> </table>
</div> </div>
</div>
</div> </div>
...@@ -340,7 +310,25 @@ ...@@ -340,7 +310,25 @@
DataList:[], DataList:[],
RateList:[], RateList:[],
tablewidth:0, tablewidth:0,
leftData:[
{Name:'平均付款人数成长率',DataObj:'MAvgPeopleNum'},
{Name:'平均付款单数成长率',DataObj:'MAvgOrderNum'},
{Name:'平均付款金额成长率',DataObj:'MAvgPayMoney'},
{Name:'平均付款件数成长率',DataObj:'MAvgBuyNum'},
{Name:'平均每人购买单数成长率',DataObj:'PAvgOrderNum'},
{Name:'平均每人购买件数成长率',DataObj:'PAvgBuyNum'},
{Name:'平均每单单价成长率',DataObj:'PAvgUnitPrice'},
{Name:'平均每人购买单价成长率',DataObj:'PAvgBuyPrice'},
{Name:'毛利率成长率',DataObj:'PAvgProfitRate'},
{Name:'毛利成长率',DataObj:'PAvgProfit'},
{Name:'会员下订单成长率',DataObj:'PAvgMOrderRate'},
{Name:'普象会员成长率',DataObj:'PAvgPXNum'},
{Name:'VIP会员成长率',DataObj:'PAvgVipNum'},
{Name:'银象会员成长率',DataObj:'PAvgYXNum'},
{Name:'金象会员成长率',DataObj:'PAvgJXNum'},
{Name:'会员总成长率',DataObj:'PAvgTotalMNum'},
]
} }
}, },
...@@ -356,12 +344,17 @@ ...@@ -356,12 +344,17 @@
}, },
getDateList() { getDateList() {
if(this.msg.StartTime =='' || this.msg.EndTime ==''){ if(this.msg.StartTime =='' || this.msg.EndTime ==''){
this.Info('请选择结束或者结束月份') this.Info('请选择开始或者结束月份')
return return
} }
if((new Date(this.msg.StartTime).getTime())>=(new Date(this.msg.EndTime)).getTime()){ if((new Date(this.msg.StartTime).getTime())>=(new Date(this.msg.EndTime)).getTime()){
this.msg.EndTime=''; this.msg.EndTime='';
this.Info('请选择结束月份') this.Info('结束月份不能大于开始月份')
return
}
if((new Date(this.msg.EndTime).getTime())>=(new Date()).getTime()){
this.msg.EndTime='';
this.Info('结束月份不能大于这个月')
return return
} }
this.loading = true; this.loading = true;
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
:key='item.ID'> :key='item.ID'>
</el-option> </el-option>
</el-select> </el-select>
<el-select filterable v-model='addMsg.startdistrict' @change="$forceUpdate()" > <el-select filterable v-model='addMsg.startdistrict' @change="$forceUpdate()" clearable>
<el-option v-for='item in district' <el-option v-for='item in district'
:label='item.Name' :label='item.Name'
:value='item.ID' :value='item.ID'
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
:key='item.ID'> :key='item.ID'>
</el-option> </el-option>
</el-select> </el-select>
<el-select filterable v-model='addMsg.arrivedistrict' @change="$forceUpdate()" > <el-select filterable v-model='addMsg.arrivedistrict' @change="$forceUpdate()" clearable>
<el-option v-for='item in district2' <el-option v-for='item in district2'
:label='item.Name' :label='item.Name'
:value='item.ID' :value='item.ID'
...@@ -429,6 +429,7 @@ ...@@ -429,6 +429,7 @@
this.addMsg.StartCityId = this.addMsg.SCityId this.addMsg.StartCityId = this.addMsg.SCityId
this.getProvinceList(this.addMsg.SCityId,3,1) this.getProvinceList(this.addMsg.SCityId,3,1)
this.addMsg.startdistrict = this.addMsg.SDistrictId this.addMsg.startdistrict = this.addMsg.SDistrictId
this.addMsg.startdistrict = this.addMsg.startdistrict>0?this.addMsg.startdistrict:''
} }
if(this.addMsg.ArriveCityType==1){ if(this.addMsg.ArriveCityType==1){
this.daProvinceId = this.addMsg.EProvinceId; this.daProvinceId = this.addMsg.EProvinceId;
...@@ -436,6 +437,8 @@ ...@@ -436,6 +437,8 @@
this.addMsg.ArriveCityId = this.addMsg.ECityId this.addMsg.ArriveCityId = this.addMsg.ECityId
this.getProvinceList(this.addMsg.ECityId,3,2) this.getProvinceList(this.addMsg.ECityId,3,2)
this.addMsg.arrivedistrict = this.addMsg.EDistrictId this.addMsg.arrivedistrict = this.addMsg.EDistrictId
this.addMsg.arrivedistrict = this.addMsg.arrivedistrict>0?this.addMsg.arrivedistrict:''
} }
} }
}, err => {}) }, err => {})
......
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