Commit b4747994 authored by 黄奎's avatar 黄奎

演示系统新增前端判断

parent 86139a42
...@@ -378,10 +378,12 @@ ...@@ -378,10 +378,12 @@
</template> </template>
<div class="border-bottom" v-if="isVisa"> <div class="border-bottom" v-if="isVisa">
<p style="font-size: 16px;font-weight: bold;color: black;padding: 10px 0 0 0;" <p style="font-size: 16px;font-weight: bold;color: black;padding: 10px 0 0 0;"
v-if="item.BranchList[0].GradeRuleList.length>0">小包团{{!isBranchCompany?'、落地团':''}}以及单项提成</p> v-if="item.BranchList&&item.BranchList.length>0&&item.BranchList[0].GradeRuleList&& item.BranchList[0].GradeRuleList && item.BranchList[0].GradeRuleList.length>0">
小包团{{!isBranchCompany?'、落地团':''}}以及单项提成</p>
<div class="ladder-form" style="margin-top: 3px;"> <div class="ladder-form" style="margin-top: 3px;">
<div class="ladder-form-box"> <div class="ladder-form-box">
<template v-if="item.BranchList[0].GradeRuleList.length>0"> <template
v-if="item.BranchList&&item.BranchList.length>0&&item.BranchList[0].GradeRuleList&&item.BranchList[0].GradeRuleList.length>0">
<div class="ladder-list" v-for="(s,indexs) in item.BranchList"> <div class="ladder-list" v-for="(s,indexs) in item.BranchList">
<div class="ladder-title">{{s.BranchName}}</div> <div class="ladder-title">{{s.BranchName}}</div>
<div class="CommissionInfor"> <div class="CommissionInfor">
...@@ -720,8 +722,10 @@ ...@@ -720,8 +722,10 @@
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 {
if(this.LastMonthTime==12) this.msg.Month = this.Year2 + '-' + (this.LastMonthTime >= 10 ? this.LastMonthTime : '0' + this.LastMonthTime) if (this.LastMonthTime == 12) this.msg.Month = this.Year2 + '-' + (this.LastMonthTime >= 10 ? this
else this.msg.Month = this.Year + '-' + (this.LastMonthTime >= 10 ? this.LastMonthTime : '0' + this.LastMonthTime) .LastMonthTime : '0' + this.LastMonthTime)
else this.msg.Month = this.Year + '-' + (this.LastMonthTime >= 10 ? this.LastMonthTime : '0' + this
.LastMonthTime)
} }
this.getList() this.getList()
}, },
...@@ -729,7 +733,7 @@ ...@@ -729,7 +733,7 @@
getList() { getList() {
this.loading = true this.loading = true
this.apipost("opcommission_GetOPExpectCommission", this.msg, res => { this.apipost("opcommission_GetOPExpectCommission", this.msg, res => {
this.loading=false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.OrderNum = 0 this.OrderNum = 0
this.groupNum = 0 this.groupNum = 0
...@@ -894,9 +898,9 @@ ...@@ -894,9 +898,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.Year2 = new Date().getFullYear() - 1
this.LastMonthTime = new Date().getMonth() this.LastMonthTime = new Date().getMonth()
this.LastMonthTime = this.LastMonthTime==0?12:this.LastMonthTime 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 + '月)'
...@@ -904,7 +908,8 @@ ...@@ -904,7 +908,8 @@
this.commissionMsg.DepartSTime = this.getBeforeDate(93, this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))) this.commissionMsg.DepartSTime = this.getBeforeDate(93, this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
var MonthDayNum = new Date(this.Year, this.MonthTime, 0).getDate(); //计算当月的天数 var MonthDayNum = new Date(this.Year, this.MonthTime, 0).getDate(); //计算当月的天数
this.commissionMsg.DepartETime = this.Year + '-' + (this.MonthTime >= 10 ? this.MonthTime : '0' + this.MonthTime) + this.commissionMsg.DepartETime = this.Year + '-' + (this.MonthTime >= 10 ? this.MonthTime : '0' + this
.MonthTime) +
'-' + (MonthDayNum > 10 ? MonthDayNum : '0' + MonthDayNum) //出发结束 '-' + (MonthDayNum > 10 ? MonthDayNum : '0' + MonthDayNum) //出发结束
this.iWorkbench() this.iWorkbench()
this.GetOrderPageList() this.GetOrderPageList()
......
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