Skip to content

S
SuperMan
Commit 98f76464 authored by liudong1993's avatar liudong1993
Browse files
Options

1

parent b4d5b154
Hide whitespace changes
Inline Side-by-side
Showing with 139 additions and 7 deletions
src/components/FinancialModule/TradeCommission/TicketDetails.vue
View file @ 98f76464
......@@ -179,7 +179,7 @@
<td>{{item.PeopleNum?item.PeopleNum:'-'}}</td>
<td>{{item.TCProfit?item.TCProfit:'-'}}</td><!-- TCGuestNum -->
<td>{{item.Way==1?'销售额':'利润比'}}</td>
<td>{{item.Rate?item.Rate+'%':'-'}}</td>
<td><span class="cursor-p" :style="{'color': '#409EFF'}" @click="openCommissionRate(item.UserId,item.UserName)">{{item.Rate?item.Rate+'%':'-'}}</span></td>
<td>{{item.OrderProfit}}</td>
<td>{{item.CommissionMoney?item.CommissionMoney:'-'}}</td>
<td>{{item.Periods}}</td>
......@@ -193,6 +193,44 @@
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex"
layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
</el-pagination>
<el-dialog width="1000px" :title="DigName+'-提成比例'" :visible.sync="outerVisible" center>
<div>注意：销售提成从11.1日起以出团日期定档，如当月未完结的订单，次月完结后重新定档，如档次变动则补发提成</div>
<div
class="cm_content"
style="width: 100%;margin-bottom: 5px; "
>
<table
class="po_content singeRowTable"
style="border:1px solid #E6E6E6;"
cellspacing="0"
cellpadding="0"
v-loading="loading">
<tr>
<th>月份</th>
<th>线路</th>
<th>未结算订单数</th>
</tr>
<tr v-for="item in rateDataList">
<td>{{item.Month}}</td>
<td>
<span v-for="qitem in item.List">
{{qitem.LineName}} &nbsp;&nbsp; 订单数：{{qitem.OrderNum}} &nbsp;&nbsp; 累计利润：{{qitem.TotalProfit}} &nbsp;&nbsp; 定档比例：{{qitem.Rate}}% </br>
</span>
</td>
<td v-if="item.NoCommissionOrderNum>0">共计：{{item.NoCommissionOrderNum}}单，<span v-for="oitem in item.NoCommissionOrderList">{{oitem}}、</span></td>
<td v-else>无</td>
</tr>
<tr v-if="rateDataList.length==0">
<td style="text-align:center" colspan="3">暂无数据</td>
</tr>
</table>
</div>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="outerVisible = false">取消</button> &nbsp;
</div>
</el-dialog>
</div>
</template>
......@@ -250,6 +288,9 @@
S_CheckBranchOrder:false,
S_CheckAllOrder:false,
disabled:true,
outerVisible:false,//提成比例弹窗
rateDataList: [],
DigName:''
}
},
created(){
......@@ -568,7 +609,28 @@
msg.EmployeeIdUser = userInfo.EmployeeId
var fileName = "同业提成人员表.xls";
this.GetLocalFile("sellcommission_GetTYSaleCommissionSingleDetailsListToExcel", msg, fileName);
}
},
openCommissionRate(userId,name){
this.DigName = name;
this.outerVisible = true;
this.getCommissionRateData(userId);
},
getCommissionRateData(userId){
this.loading = true;
this.apipost(
"sellcommission_GetTYSaleHistoryCommissionRate",
{UserId : userId},
res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.rateDataList = res.data.data;
} else {
this.Error(res.data.message);
}
},
null
);
}
}
}
......
src/components/FinancialModule/TradeCommission/TicketUserDetails.vue
View file @ 98f76464
......@@ -224,7 +224,7 @@
</span>
</td>
<td>{{item.BranchCommission?item.BranchCommission:'-'}}</td>
<td>{{item.Periods}}</td>
<td><span class="cursor-p" @click="openCommissionRate(item.UserId,item.UserName)">{{item.Periods}}</span></td>
<td>
<el-tooltip class="item" effect="dark" content="查看" placement="top">
<el-button type="primary" class="CM_look" @click="goUrl('TradeTicketDetails',item)"
......@@ -243,6 +243,44 @@
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex"
layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
</el-pagination>
<el-dialog width="1000px" :title="DigName+'-提成比例'" :visible.sync="outerVisible" center>
<div>注意：销售提成从11.1日起以出团日期定档，如当月未完结的订单，次月完结后重新定档，如档次变动则补发提成</div>
<div
class="cm_content"
style="width: 100%;margin-bottom: 5px; "
>
<table
class="po_content singeRowTable"
style="border:1px solid #E6E6E6;"
cellspacing="0"
cellpadding="0"
v-loading="loading">
<tr>
<th>月份</th>
<th>线路</th>
<th>未结算订单数</th>
</tr>
<tr v-for="item in rateDataList">
<td>{{item.Month}}</td>
<td>
<span v-for="qitem in item.List">
{{qitem.LineName}} &nbsp;&nbsp; 订单数：{{qitem.OrderNum}} &nbsp;&nbsp; 累计利润：{{qitem.TotalProfit}} &nbsp;&nbsp; 定档比例：{{qitem.Rate}}% </br>
</span>
</td>
<td v-if="item.NoCommissionOrderNum>0">共计：{{item.NoCommissionOrderNum}}单，<span v-for="oitem in item.NoCommissionOrderList">{{oitem}}、</span></td>
<td v-else>无</td>
</tr>
<tr v-if="rateDataList.length==0">
<td style="text-align:center" colspan="3">暂无数据</td>
</tr>
</table>
</div>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="outerVisible = false">取消</button> &nbsp;
</div>
</el-dialog>
</div>
</template>
......@@ -293,7 +331,9 @@
ParentId:'-1',
Tier:'0',
},
disabled:true
disabled:true,
rateDataList: [],
DigName:''
}
},
created(){
......@@ -420,8 +460,28 @@
exportExcel() { //导出
var fileName = "印象票务提成明细表.xls";
this.crmGetLocalFile("/api/Commission/GetCommissionEmpStatisticsToExcel", this.msg, fileName);
},
openCommissionRate(userId,name){
this.DigName = name;
this.outerVisible = true;
this.getCommissionRateData(userId);
},
getCommissionRateData(userId){
this.loading = true;
this.apipost(
"sellcommission_GetTYSaleHistoryCommissionRate",
{UserId : userId},
res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.rateDataList = res.data.data;
} else {
this.Error(res.data.message);
}
},
null
);
}
}
}
</script>
src/components/sale/ExpectedCommission.vue
View file @ 98f76464
......@@ -168,7 +168,7 @@
</div>
</div>
<div style="padding: 5px 0 5px 0;text-align: right;color: red;">
注：5月1日起小包团、落地团 需结团完结后，方参与提成定档；（再次注意，人数奖励是分日本、欧洲、其他线三个模块独立计算）
注：11月1日后结团的小包团、落地团以出团日期为标准定档提成比例，如出团当月无法结团，次月结团后重新定档比例，如已发提成的团则使用最新比例补发提成；（再次注意，人数奖励是分日本、欧洲、其他线三个模块独立计算）
</div>
<div style="display: flex;">
<div class="CommissionLadder Line border-bottom" style="margin: 0 0 0 0;">
......@@ -192,6 +192,9 @@
<span>
预期提成：<span>{{CommissionInfor.JapanCommission}}</span>
</span>
<span v-if="CommissionInfor.JapanReissueCommission && CommissionInfor.JapanReissueCommission!=0">
补发往期提成：<span>{{CommissionInfor.JapanReissueCommission}}</span>
</span>
</div>
<div>
<progressComm :commissionratioList="JapaneseProfit"></progressComm>
......@@ -218,6 +221,9 @@
<span>
预期提成：<span>{{CommissionInfor.EuropeCommission}}</span>
</span>
<span v-if="CommissionInfor.EuropeReissueCommission && CommissionInfor.EuropeReissueCommission!=0">
补发往期提成：<span>{{CommissionInfor.EuropeReissueCommission}}</span>
</span>
</div>
<div>
<progressComm :commissionratioList="EuropeProfit"></progressComm>
......@@ -244,6 +250,9 @@
<span>
预期提成：<span>{{CommissionInfor.OtherCommission}}</span>
</span>
<span v-if="CommissionInfor.OtherReissueCommission && CommissionInfor.OtherReissueCommission!=0">
补发往期提成：<span>{{CommissionInfor.OtherReissueCommission}}</span>
</span>
</div>
<div>
<progressComm :commissionratioList="OtherProfit"></progressComm>
......@@ -422,6 +431,7 @@
<div style="display: flex;justify-content: space-between;">
<div style="padding: 10px 0 0 0;color: #E95252;line-height: 30px;width: 50%;white-space: wrap;">
<p style="font-weight: bold;">出境提成提醒：</p>
<span>注意：从11.1日后结团的小包团/当地游，启用新定档方式，团队以出团日期为标准定档提成比例，如出团当月无法结团，次月结团则次月重新定档比例(实例：如11月出团有A,B两团已完结，则11月定档比例10%，12月又完结11月出团的C团，则12月重新定档比例比如=12%，则C团按12%发放提成，AB团补发2%提成)</span></br>
1.日本线.韩国线.东南亚线.南亚线散拚.与单团提成保持1%提成不变</br>
2.增加境外散拚提成(日本线.欧洲线.其他线分别奖励计算)</br>
3.增加人头奖励(日本线.欧洲线.其他线3种)</br>
......@@ -726,7 +736,7 @@
this.DomesticLine.Rlist[1]]
this.newRlist = [this.DomesticLine.Rlist[2]]
let arr1 =[this.CommissionInfor.OtherMoney,this.CommissionInfor.PeopleMoney,this.CommissionInfor.EuropeMoney]
let arr2 =[this.CommissionInfor.OtherCommission,this.CommissionInfor.SalesCommission,this.CommissionInfor.JapanCommission,this.CommissionInfor.EuropeCommission,this.GNCommission]
let arr2 =[this.CommissionInfor.OtherCommission,this.CommissionInfor.SalesCommission,this.CommissionInfor.JapanCommission,this.CommissionInfor.EuropeCommission,this.GNCommission,this.CommissionInfor.JapanReissueCommission,,this.CommissionInfor.EuropeReissueCommission,,this.CommissionInfor.OtherReissueCommission]
this.CommissionJJ = this.CalculatePrice(arr1,0)
this.CommissionTC = this.CalculatePrice(arr2,2)
}
......
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