Skip to content

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

no message

parent 2373c2f6
Show whitespace changes
Inline Side-by-side
Showing with 87 additions and 85 deletions
src/components/temp/components/progressComm.vue
View file @ bc6e4562
...@@ -52,8 +52,8 @@ ...@@ -52,8 +52,8 @@
border-radius: 0 !important; border-radius: 0 !important;
} }
/deep/.relative-position .el-progress-bar__inner{ /deep/.relative-position .el-progress-bar__inner{
text-align: left; text-align: center;
text-indent: 10px; /* text-indent: 10px; */
border-radius: 0 !important; border-radius: 0 !important;
} }
/deep/.relative-position:first-child .el-progress{ /deep/.relative-position:first-child .el-progress{
......
src/components/temp/operation.vue
View file @ bc6e4562
...@@ -77,15 +77,15 @@ ...@@ -77,15 +77,15 @@
.CommissionLadder .title{ .CommissionLadder .title{
font-size: 19px; font-size: 19px;
font-weight: bold; font-weight: bold;
padding: 0 0 5px 0;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }
.CommissionLadder p { .CommissionLadder p {
padding: 5px 0 0px 0; padding: 5px 0 5px 0;
font-size: 15px; font-size: 15px;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
color: #333333;
} }
.CommissionLadder p span:last-child{ .CommissionLadder p span:last-child{
color: red; color: red;
...@@ -117,17 +117,19 @@ ...@@ -117,17 +117,19 @@
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding: 10px 0 5px 0; padding: 0 0 5px 0;
} }
.commissionProjectZL{ .commissionProjectZL{
display: flex;align-items: center;justify-content: space-between; display: flex;align-items: center;justify-content: space-between;
padding: 0 0 5px 0; /* padding: 0 0 5px 0; */
} }
.commissionProject>div>div{ .commissionProject>div>div{
} }
.ProjectTitle{ .ProjectTitle{
font-size: 16px;font-weight: bold; color: black;
font-size: 16px;
font-weight: bold;
} }
.ProjectTitle>span{ .ProjectTitle>span{
margin-left: 5px; font-size: 15px;font-weight: 100; margin-left: 5px; font-size: 15px;font-weight: 100;
...@@ -166,32 +168,33 @@ ...@@ -166,32 +168,33 @@
} }
.ladder-form{ .ladder-form{
width: 100%; width: 100%;
max-width: 1526px;
overflow-x: auto;
display: flex; display: flex;
flex-wrap: nowrap; flex-wrap: wrap;
overflow: hidden;
} }
.ladder-form-box{ .ladder-form-box{
/* height: 72px; */ /* height: 72px; */
padding: 0 0 10px 0; padding: 0 0 10px 0;
overflow: auto; flex: 1;
display: flex; display: flex;
flex-wrap: nowrap; flex-wrap: wrap;
} }
.ladder-list{ .ladder-list{
flex: 1; flex: 1;
min-width: 450px; min-width: 450px;
/* max-width: 450px; */
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin-right: 40px; margin-right: 40px;
margin-bottom: 10px;
} }
.ladder-list:last-child{ .ladder-list:last-child{
margin-right: 0; margin-right: 0;
} }
.ladder-title{ .ladder-title{
width: 100%; width: 100%;
font-size: 13px; font-size: 15px;
padding: 0 0 5px 0; padding: 5px 0 0 0;
color: black; color: black;
font-weight: bold; font-weight: bold;
} }
...@@ -285,34 +288,33 @@ ...@@ -285,34 +288,33 @@
</div> </div>
<template v-for="(item,index) in dataRlueList"> <template v-for="(item,index) in dataRlueList">
<div class="CommissionLadder-form" style="flex-direction: column;"> <div class="CommissionLadder-form" style="flex-direction: column;">
<div class="CommissionLadder Line" :style="{'margin': index>0?'10px 0 0 0':'0 0 0 0'}"> <div class="CommissionLadder Line" :style="{'margin': index>0?'10px 0 0 0':'0 0 0 0'}">
<div class="title"> <div class="title">
<span>{{item.RuleName}}</span> <span>{{item.RuleName}}线</span>
<div> <div>
<!-- <detailsButtom :type="1" :obj="commissionMsg" :Month="Month"/> --> <!-- <detailsButtom :type="1" :obj="commissionMsg" :Month="Month"/> -->
</div> </div>
</div> </div>
<template v-if="data.postName.indexOf('签证')==-1"> <template v-if="isVisa">
<p style="font-size: 16px;font-weight: bold;">小包团、落地团以及单项提成</p> <div class="commissionProject" style="display: flex;flex-wrap: wrap;padding: 0 0 10px 0;">
<div>
<div style="padding: 0 0 5px 0;">
<span class="ProjectTitle">公司所有国内出发线路(单团.散拚)
<span></span></span>
</div>
<div class="groupTourOrder">
<span>团队数：<span>{{item.PeopleAward.TravelNum}}</span></span>
<span>人头数：<span>{{item.PeopleAward.PeopelNum}}</span></span>
<span>提成方式：<span>{{item.PeopleAward.Rate}}{{item.PeopleAward.Way==1?'元/人':'%'}}</span></span>
<span>预期提成：<span>{{item.PeopleAward.Commission}}</span></span>
</div>
</div>
</div>
</template>
<template v-if="isVisa">
<p style="font-size: 16px;font-weight: bold;color: black;">小包团{{!isBranchCompany?'、落地团':''}}以及单项提成</p>
<template v-for="(s,indexs) in item.BranchList"> <template v-for="(s,indexs) in item.BranchList">
<!--
<div class="CommissionInfor">
<span>
当月团数：<span>{{s.TravelNum}}</span>
</span>
<span>
单项订单数：<span>{{s.SingleOrderNum}}</span>
</span>
<span>
预期利润：<span>{{s.Profit}}</span>
</span>
<span>
预期比例：<span>{{s.Rate}}{{s.Way==1?'元/人':'%'}}</span>
</span>
<span>
预期提成：<span>{{s.Commission}}</span>
</span>
</div> -->
<div class="ladder-form"> <div class="ladder-form">
<div class="ladder-form-box"> <div class="ladder-form-box">
<div class="ladder-list"> <div class="ladder-list">
...@@ -337,34 +339,32 @@ ...@@ -337,34 +339,32 @@
<progressComm :type="2" :CommissionRateList="s.GradeRuleList" <progressComm :type="2" :CommissionRateList="s.GradeRuleList"
:Profit="s.Profit"></progressComm> :Profit="s.Profit"></progressComm>
</div> </div>
</div> <div class="ladder-list" v-if="(isVisa||!isBranchCompany)&&item.BranchList.length-1==indexs">
</div> <div class="ladder-title">额外奖励 (不含落地团)</div>
</template> <div class="CommissionInfor">
</template>
<div class="commissionProject" style="display: flex;flex-wrap: wrap;">
<template v-if="data.postName.indexOf('签证')==-1">
<div style="width: 450px;">
<div>
<span class="ProjectTitle">额外奖励
<span>
<span> <span>
当月团数：<span style="color: red;">{{item.TravelAward.TravelNum}}</span> 当月团数：<span>{{item.TravelAward.TravelNum}}</span>
</span> </span>
<span style="margin-left: 10px;"> <span>
奖励：<span style="color: red;">{{item.TravelAward.AwardMoney}}</span> 奖励：<span>{{item.TravelAward.AwardMoney}}</span>
</span></span>
</span> </span>
</div> </div>
<div>
<progressComm :type="1" :CommissionRateList="item.TravelAward.GradeRuleList" <progressComm :type="1" :CommissionRateList="item.TravelAward.GradeRuleList"
:Profit="item.TravelAward.TravelNum"></progressComm> :Profit="item.TravelAward.TravelNum"></progressComm>
</div> </div>
</div> </div>
</div>
</template>
</template> </template>
<div class="commissionProject" style="display: flex;flex-wrap: wrap;">
<div> <div>
<div style="display: flex;">
<div> <div>
<span class="ProjectTitle">单项签证</span> <div class="commissionProjectZL">
<span class="ProjectTitle">签证提成</span>
</div> </div>
<p>单项签证</p>
<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>
...@@ -372,36 +372,29 @@ ...@@ -372,36 +372,29 @@
<span>预期提成：<span>{{item.SingleVisa.Commission}}</span></span> <span>预期提成：<span>{{item.SingleVisa.Commission}}</span></span>
</div> </div>
</div> </div>
<div> <div style="margin-left: 40px;">
<div> <div class="commissionProjectZL">
<span class="ProjectTitle">团队签证</span> <span class="ProjectTitle">
<span></span></span>
</div> </div>
<p>团队签证</p>
<div class="groupTourOrder"> <div class="groupTourOrder">
<span>签证人数：<span>{{item.TravelVisa.VisaNum}}</span></span> <span>签证人数：<span>{{item.TravelVisa.VisaNum}}</span></span>
<span>单价：<span>{{item.TravelVisa.Rate}}{{item.TravelVisa.Way==1?'元/人':'%'}}</span></span> <span>单价：<span>{{item.TravelVisa.Rate}}{{item.TravelVisa.Way==1?'元/人':'%'}}</span></span>
<span>预期提成：<span>{{item.TravelVisa.Commission}}</span></span> <span>预期提成：<span>{{item.TravelVisa.Commission}}</span></span>
</div> </div>
</div> </div>
<template v-if="data.postName.indexOf('签证')==-1">
<div>
<div>
<span class="ProjectTitle">人头奖励
<span>公司所有国内出发线路(单团.散拚)</span></span>
</div>
<div class="groupTourOrder">
<span>团队数：<span>{{item.PeopleAward.TravelNum}}</span></span>
<span>人头数：<span>{{item.PeopleAward.PeopelNum}}</span></span>
<span>提成方式：<span>{{item.PeopleAward.Rate}}{{item.PeopleAward.Way==1?'元/人':'%'}}</span></span>
<span>预期提成：<span>{{item.PeopleAward.Commission}}</span></span>
</div> </div>
</div> </div>
<template v-if="isVisa||!isBranchCompany">
<div v-if="!index"> <div v-if="!index">
<div style="display: flex;"> <div style="display: flex;">
<div> <div>
<div class="commissionProjectZL"> <div class="commissionProjectZL">
<span class="ProjectTitle">助理奖励 <span class="ProjectTitle">助理奖励
<span>系列团助理op人头提成</span></span> </span>
</div> </div>
<p>系列团助理op人头提成</p>
<div class="groupTourOrder"> <div class="groupTourOrder">
<span>报名人数：<span>{{ZLOPAward.TravelPeopleNum}}</span></span> <span>报名人数：<span>{{ZLOPAward.TravelPeopleNum}}</span></span>
<span>单价：<span>{{ZLOPAward.TravelUnitPrice}}元/人</span></span> <span>单价：<span>{{ZLOPAward.TravelUnitPrice}}元/人</span></span>
...@@ -410,9 +403,10 @@ ...@@ -410,9 +403,10 @@
</div> </div>
<div style="margin-left: 40px;"> <div style="margin-left: 40px;">
<div class="commissionProjectZL"> <div class="commissionProjectZL">
<span class="ProjectTitle">助理奖励 <span class="ProjectTitle">
<span>落地散、单项人头奖励</span></span> <span></span></span>
</div> </div>
<p>落地散、单项人头奖励</p>
<div class="groupTourOrder"> <div class="groupTourOrder">
<span>报名人数：<span>{{ZLOPAward.SinglePeopleNum}}</span></span> <span>报名人数：<span>{{ZLOPAward.SinglePeopleNum}}</span></span>
<span>单价：<span>{{ZLOPAward.SingleUnitPrice}}元/人</span></span> <span>单价：<span>{{ZLOPAward.SingleUnitPrice}}元/人</span></span>
...@@ -547,6 +541,8 @@ ...@@ -547,6 +541,8 @@
export default { export default {
data (){ data (){
return{ return{
isBranchCompany: false,
isVisa: false,
jianjin: 0, jianjin: 0,
yuqiticheng: 0, yuqiticheng: 0,
groupNum: 0, groupNum: 0,
...@@ -753,6 +749,9 @@ ...@@ -753,6 +749,9 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.data = res.data.data; this.data = res.data.data;
Info = res.data.data Info = res.data.data
if(Info.postName.indexOf('签证')==-1){
this.isVisa = true
}
this.apipost('opcommission_GetLatelyOPCommission', {}, res => { this.apipost('opcommission_GetLatelyOPCommission', {}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.data = res.data.data; this.data = res.data.data;
...@@ -801,6 +800,9 @@ ...@@ -801,6 +800,9 @@
} }
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
if(userInfo.RB_Branch_id>0){
this.isBranchCompany = true
}
// 年终奖权限 销售， 引流， 市场， 票务 ， 票務，总经理，总经理 // 年终奖权限 销售， 引流， 市场， 票务 ， 票務，总经理，总经理
if(userInfo.PostName.indexOf('销售')||userInfo.PostName.indexOf('引流')|| if(userInfo.PostName.indexOf('销售')||userInfo.PostName.indexOf('引流')||
userInfo.PostName.indexOf('市场，')||userInfo.PostName.indexOf('票务')|| userInfo.PostName.indexOf('市场，')||userInfo.PostName.indexOf('票务')||
......
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