Commit 72260c57 authored by wuchun's avatar wuchun
parents 61f64a15 fc98dd5d
...@@ -289,10 +289,7 @@ ...@@ -289,10 +289,7 @@
this.getCompanyMsg.RB_Group_Id=userInfo.RB_Group_id; //集团ID this.getCompanyMsg.RB_Group_Id=userInfo.RB_Group_id; //集团ID
this.departmentMsg.RB_Group_Id = userInfo.RB_Group_id; //集团 this.departmentMsg.RB_Group_Id = userInfo.RB_Group_id; //集团
this.departmentMsg.RB_Branch_Id = userInfo.RB_Branch_Id; this.departmentMsg.RB_Branch_Id = userInfo.RB_Branch_Id;
this.GetCommissionPeroidsList()//期数
this.getEmployee()//人员
this.getDepartment()
this.getCompany()
}, },
mounted() { mounted() {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
...@@ -308,11 +305,15 @@ ...@@ -308,11 +305,15 @@
this.msg.OutBranchId = -1 this.msg.OutBranchId = -1
this.msg.RB_Branch_Id = -1 this.msg.RB_Branch_Id = -1
// this.msg.RB_Department_Id = -1 // this.msg.RB_Department_Id = -1
this.msg.EmployeeId = -1 this.msg.EmployeeId = this.$route.query.UserId?Number(this.$route.query.UserId):-1
}else{ }else{
this.disabled = true; this.disabled = true;
this.msg.EmployeeId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
} }
this.GetCommissionPeroidsList()//期数
this.getEmployee()//人员
this.getDepartment()
this.getCompany()
}, },
methods: { methods: {
...@@ -338,7 +339,7 @@ ...@@ -338,7 +339,7 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.PeroidsList = res.data.data; this.PeroidsList = res.data.data;
if(!this.$route.query.PeriodId){ if(!this.$route.query.PeriodId){
this.msg.PeriodsId = this.PeroidsList[0].Id this.msg.PeriodsId = this.PeroidsList[0].ID
} }
this.getList() this.getList()
} else { } else {
......
...@@ -157,13 +157,9 @@ ...@@ -157,13 +157,9 @@
this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):-1 this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):-1
}else{ }else{
this.disabled = true; this.disabled = true;
// this.msg.UserId = Number(userInfo.EmployeeId)
if(!this.$route.query.UserId){
this.msg.UserId = Number(userInfo.EmployeeId)
}else{
this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId) this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
} }
} this.msg.Type = this.$route.query.Type?this.$route.query.Type:''
this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):0 this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):0
this.getqishilist() this.getqishilist()
this.getCompanyList()//获取公司 this.getCompanyList()//获取公司
......
...@@ -136,9 +136,10 @@ ...@@ -136,9 +136,10 @@
let ActionMenuCode = userInfo.ActionMenuCode; let ActionMenuCode = userInfo.ActionMenuCode;
if (ActionMenuCode.indexOf('home_CommissionSeeAll') != -1) {//是否有看所有人的权限 if (ActionMenuCode.indexOf('home_CommissionSeeAll') != -1) {//是否有看所有人的权限
this.disabled = false; this.disabled = false;
this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):-1
}else{ }else{
this.disabled = true; this.disabled = true;
this.msg.UserId = Number(userInfo.EmployeeId) this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
} }
this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):0 this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):0
this.getList(); this.getList();
......
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
methods: { methods: {
// 设置进度 // 设置进度
setItemProgress(data) { setItemProgress(data) {
if(this.Profit&&this.Profit>=data.StartValue&&this.Profit<=data.EndValue){ if(this.Profit>0&&this.Profit>=data.StartValue&&this.Profit<=data.EndValue){
return data.EndValue<999999?this.Profit/data.StartValue:this.Profit/data.EndValue return data.EndValue<999999?this.Profit/data.StartValue:this.Profit/data.EndValue
}else{ }else{
return 0 return 0
......
...@@ -172,7 +172,8 @@ ...@@ -172,7 +172,8 @@
flex-wrap: nowrap; flex-wrap: nowrap;
} }
.ladder-form-box{ .ladder-form-box{
height: 92px; /* height: 72px; */
padding: 0 0 10px 0;
overflow: auto; overflow: auto;
display: flex; display: flex;
flex-wrap: nowrap; flex-wrap: nowrap;
...@@ -271,8 +272,9 @@ ...@@ -271,8 +272,9 @@
</div> </div>
<div style="display: flex;align-items: center; justify-content: space-between;padding: 20px 20px 0 20px;"> <div style="display: flex;align-items: center; justify-content: space-between;padding: 20px 20px 0 20px;">
<div class="headerTitle"> <div class="headerTitle">
<p><span>总订单数:</span> <span></span></p> <!-- <p><span>总团队数:</span> <span>{{groupNum}}</span></p> -->
<p><span>总人头数:</span><span></span></p> <p><span>总订单数:</span> <span>{{OrderNum}}</span></p>
<p><span>总人头数:</span><span>{{EopleNum}}</span></p>
<p><span>总预期奖金:</span><span>{{CommissionJJ}}</span></p> <p><span>总预期奖金:</span><span>{{CommissionJJ}}</span></p>
<p><span>总预期提成:</span><span>{{CommissionTC}}</span></p> <p><span>总预期提成:</span><span>{{CommissionTC}}</span></p>
</div> </div>
...@@ -296,6 +298,9 @@ ...@@ -296,6 +298,9 @@
<span> <span>
当月团数:<span>{{s.TravelNum}}</span> 当月团数:<span>{{s.TravelNum}}</span>
</span> </span>
<span>
单项订单数:<span>{{s.SingleOrderNum}}</span>
</span>
<span> <span>
预期利润:<span>{{s.Profit}}</span> 预期利润:<span>{{s.Profit}}</span>
</span> </span>
...@@ -339,7 +344,7 @@ ...@@ -339,7 +344,7 @@
<span class="ProjectTitle">单项签证</span> <span class="ProjectTitle">单项签证</span>
</div> </div>
<div class="groupTourOrder"> <div class="groupTourOrder">
<span>报名单数:<span>{{item.SingleVisa.OrderNum}}</span></span> <span>单数:<span>{{item.SingleVisa.OrderNum}}</span></span>
<span>预期利润:<span>{{item.SingleVisa.Profit}}</span></span> <span>预期利润:<span>{{item.SingleVisa.Profit}}</span></span>
<span>提成比例:<span>{{item.SingleVisa.Rate}}{{item.SingleVisa.Way==1?'元/人':'%'}}</span></span> <span>提成比例:<span>{{item.SingleVisa.Rate}}{{item.SingleVisa.Way==1?'元/人':'%'}}</span></span>
<span>预期提成:<span>{{item.SingleVisa.Commission}}</span></span> <span>预期提成:<span>{{item.SingleVisa.Commission}}</span></span>
...@@ -361,13 +366,13 @@ ...@@ -361,13 +366,13 @@
<span>公司所有国内出发线路(单团.散拚)</span></span> <span>公司所有国内出发线路(单团.散拚)</span></span>
</div> </div>
<div class="groupTourOrder"> <div class="groupTourOrder">
<span>订单数:<span>{{item.PeopleAward.TravelNum}}</span></span> <span>团队数:<span>{{item.PeopleAward.TravelNum}}</span></span>
<span>人头数:<span>{{item.PeopleAward.PeopelNum}}</span></span> <span>人头数:<span>{{item.PeopleAward.PeopelNum}}</span></span>
<span>提成方式:<span>{{item.PeopleAward.Rate}}{{item.PeopleAward.Way==1?'元/人':'%'}}</span></span> <span>提成方式:<span>{{item.PeopleAward.Rate}}{{item.PeopleAward.Way==1?'元/人':'%'}}</span></span>
<span>预期提成:<span>{{item.PeopleAward.Commission}}</span></span> <span>预期提成:<span>{{item.PeopleAward.Commission}}</span></span>
</div> </div>
</div> </div>
<div> <div v-if="!index">
<div style="display: flex;"> <div style="display: flex;">
<div> <div>
<div class="commissionProjectZL"> <div class="commissionProjectZL">
...@@ -526,6 +531,11 @@ ...@@ -526,6 +531,11 @@
export default { export default {
data (){ data (){
return{ return{
jianjin: 0,
yuqiticheng: 0,
groupNum: 0,
OrderNum:0,
EopleNum:0,
defaultHeadImg: 'this.src="' + require("../../assets/img/default_head_img.jpg") + '"', defaultHeadImg: 'this.src="' + require("../../assets/img/default_head_img.jpg") + '"',
data:{}, data:{},
loading: true, loading: true,
...@@ -602,18 +612,14 @@ ...@@ -602,18 +612,14 @@
}else if(type==3){//历史单项 }else if(type==3){//历史单项
name = 'ServiceCommissionUser' name = 'ServiceCommissionUser'
} }
if(type!=5&&name){
this.$router.push({ this.$router.push({
name: name, name: name,
query: { query: {
UserId: Number(userInfo.EmployeeId), UserId: Number(userInfo.EmployeeId),
Type: 2, Type: 2,
isSale: 1,
blank: 'y' blank: 'y'
} }
}); });
}
}, },
goMore(){ goMore(){
...@@ -621,9 +627,6 @@ ...@@ -621,9 +627,6 @@
name: 'TravelControlList', name: 'TravelControlList',
query: { query: {
blank: 'y', blank: 'y',
// Q_IsCollect: "2",
// DepartSTime: this.commissionMsg.DepartSTime,
// DepartETime: this.commissionMsg.DepartETime
} }
}); });
}, },
...@@ -635,16 +638,41 @@ ...@@ -635,16 +638,41 @@
this.msg.Month = this.Year+'-'+(this.LastMonthTime>10?this.LastMonthTime:'0'+this.LastMonthTime) this.msg.Month = this.Year+'-'+(this.LastMonthTime>10?this.LastMonthTime:'0'+this.LastMonthTime)
} }
this.getList() this.getList()
this.GetGNSaleExpectCommission()
}, },
// 获取规则列表数据 // 获取规则列表数据
getList() { getList() {
this.loading = true this.loading = true
this.apipost("opcommission_GetOPExpectCommission", this.msg, res => { this.apipost("opcommission_GetOPExpectCommission", this.msg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.OrderNum = 0
this.groupNum = 0
this.EopleNum = 0
this.jianjin = 0
this.yuqiticheng = 0
this.dataRlueList = res.data.data.RlueList this.dataRlueList = res.data.data.RlueList
this.dataRlueList.forEach(item=>{
this.groupNum += item.TravelAward.TravelNum
this.groupNum += item.PeopleAward.TravelNum
this.OrderNum += item.SingleVisa.OrderNum
this.jianjin += (item.TravelAward.AwardMoney*100)
this.yuqiticheng += (item.SingleVisa.Commission*100)
this.yuqiticheng += (item.TravelVisa.Commission*100)
this.yuqiticheng += (item.PeopleAward.Commission*100)
item.BranchList.forEach(s=>{
this.groupNum += s.TravelNum
this.OrderNum += s.SingleOrderNum
this.yuqiticheng += (s.Commission*100)
})
this.EopleNum += item.PeopleAward.PeopelNum
})
this.ZLOPAward = res.data.data.ZLOPAward this.ZLOPAward = res.data.data.ZLOPAward
// console.log(res.data.data,'---') this.OrderNum += this.ZLOPAward.SinglePeopleNum
this.yuqiticheng += (this.ZLOPAward.TravelCommission*100)
this.yuqiticheng += (this.ZLOPAward.SingleCommission*10)
this.yuqiticheng = this.yuqiticheng/100
this.jianjin = this.jianjin/100
this.GetGNSaleExpectCommission()
}else{ }else{
this.Error(res.data.message) this.Error(res.data.message)
} }
...@@ -657,12 +685,12 @@ ...@@ -657,12 +685,12 @@
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.DomesticLine = res.data.data this.DomesticLine = res.data.data
this.GNOrderNum = 0 // this.GNOrderNum = 0
this.GNEopleNum = 0 // this.GNEopleNum = 0
this.GNCommission = 0 this.GNCommission = 0
this.DomesticLine.Rlist.forEach(item=>{ this.DomesticLine.Rlist.forEach(item=>{
this.GNOrderNum+=Number(item.OrderNum) // this.GNOrderNum+=Number(item.OrderNum)
this.GNEopleNum+=Number(item.PeopleNum) // this.GNEopleNum+=Number(item.PeopleNum)
this.GNCommission+=Number(item.Commission) this.GNCommission+=Number(item.Commission)
}) })
...@@ -673,8 +701,8 @@ ...@@ -673,8 +701,8 @@
this.DomesticLine.Rlist[0], this.DomesticLine.Rlist[0],
this.DomesticLine.Rlist[1]] this.DomesticLine.Rlist[1]]
this.newRlist = [this.DomesticLine.Rlist[2]] this.newRlist = [this.DomesticLine.Rlist[2]]
let arr1 =[this.CommissionInfor.PeopleMoney,this.CommissionInfor.EuropeMoney] let arr1 =[this.jianjin]
let arr2 =[this.CommissionInfor.SalesCommission,this.CommissionInfor.JapanCommission,this.CommissionInfor.EuropeCommission,this.GNCommission] let arr2 =[this.GNCommission,this.yuqiticheng]
this.CommissionJJ = this.CalculatePrice(arr1,0) this.CommissionJJ = this.CalculatePrice(arr1,0)
this.CommissionTC = this.CalculatePrice(arr2,2) this.CommissionTC = this.CalculatePrice(arr2,2)
} }
...@@ -685,7 +713,7 @@ ...@@ -685,7 +713,7 @@
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = res.data.data.pageData let data = res.data.data.pageData
if(data.length>5){ if(data&&data.length>5){
for(let i=0;i<5;i++){ for(let i=0;i<5;i++){
this.OrderList.push(data[i]) this.OrderList.push(data[i])
} }
...@@ -776,7 +804,6 @@ ...@@ -776,7 +804,6 @@
this.iWorkbench() this.iWorkbench()
this.GetOrderPageList() this.GetOrderPageList()
this.getList() this.getList()
this.GetGNSaleExpectCommission()
}, },
} }
......
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