Skip to content

S
SuperMan
Commit 80c698dc authored by 沈良进's avatar 沈良进
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 57ebb252 7cc76a7d
Show whitespace changes
Inline Side-by-side
Showing with 141 additions and 43 deletions
src/components/sale/ExpectedCommission.vue
View file @ 80c698dc
......@@ -40,6 +40,8 @@
font-size: 16px;
font-weight: bold;
padding: 0 0 5px 0;
display: flex;
justify-content: space-between;
}
.CommissionLadder p {
padding: 5px 0 0px 0;
......@@ -79,15 +81,31 @@
color: #999999;
font-size: 14px;
}
.headerTitle{
display: flex;
}
.headerTitle p{
font-weight: bold;
}
.headerTitle span{
font-weight: 100;
color: red;
margin-right: 20px;
}
</style>
<template>
<div style="height: 92vh;overflow-y: scroll;">
<div style="display: flex;align-items: center; justify-content: space-between;background: #fff;
height: 40px;padding: 0 20px;">
<span>
<!-- 总提成：<span>{{CommissionInfor.TotalCMoney}}</span> -->
</span>
<div class="headerTitle">
<template v-if="CommissionInfor">
<p>总提成：<span>{{CommissionInfor.TotalCMoney}}</span></p>
<p>总订单数：<span>{{CommissionInfor.SalesOrderNum+CommissionInfor.JapanOrderNum+CommissionInfor.EuropeOrderNum+GNOrderNum}}</span></p>
<p>总人头数：<span>{{CommissionInfor.PeopleNum+CommissionInfor.EuropePNum+CommissionInfor.SalesPeopleNum+CommissionInfor.JapanPeopleNum+CommissionInfor.EuropePeopleNum+GNEopleNum}}</span></p>
<p>总预期奖金：<span>{{CommissionInfor.PeopleMoney+CommissionInfor.EuropeMoney}}</span></p>
<p>总预期提成：<span>{{CommissionInfor.SalesCommission+CommissionInfor.JapanCommission+CommissionInfor.EuropeCommission+GNCommission}}</span></p>
</template>
</div>
<div style="display: flex;align-items: center;">
<!-- <i class="el-icon-chat-dot-square"
style="cursor: pointer;color: #33B3FF;font-size: 31px;margin-right: 10px;"
......@@ -105,20 +123,31 @@
<div style="display: flex;justify-content: space-between; width: 100%;">
<div style="display: flex;flex-direction: column;flex-grow: 2;">
<div class="CommissionLadder-form" style="margin: 20px 0 10px 0;">
<div class="CommissionLadder" style="padding: 10px 20px 10px 0;">
<p style="padding: 0;flex-shrink: 0;padding: 0 20px 10px 20px;">公司所有国内出发线路(单团.散拚)</p>
<div class="CommissionLadder Line" style="padding: 15px 20px 20px 0;">
<div style="display: flex;align-items: center;justify-content: space-between; padding: 0 0 10px 20px;
">
<span style="font-size: 16px;font-weight: bold;">公司所有国内出发线路(单团.散拚)</span>
<div>
<detailsButtom :type="1" :obj="detailsInfor"/>
</div>
</div>
<div class="groupTourOrder">
<span>销售额：<span>{{CommissionInfor.SalesMoney}}</span></span>
<span>订单数：<span>{{CommissionInfor.SalesOrderNum}}</span></span>
<span>人头数：<span>{{CommissionInfor.SalesPeopleNum}}</span></span>
<span>提成比例：<span>{{CommissionInfor.SalesRate}}</span></span>
<span>提成比例：<span>{{CommissionInfor.SalesRate}}%</span></span>
<span>预期提成：<span>{{CommissionInfor.SalesCommission}}</span></span>
</div>
</div>
</div>
<div style="display: flex;">
<div class="CommissionLadder Line" style="margin: 0 10px 0 0;">
<div class="title">日本小包团、落地团以及单项提成</div>
<div class="title">
<span>日本小包团、落地团以及单项提成</span>
<div>
<detailsButtom :type="2" :obj="detailsInfor"/>
</div>
</div>
<p>当月个人毛利润</p>
<div class="CommissionInfor">
<span>
......@@ -142,7 +171,12 @@
</div>
</div>
<div class="CommissionLadder Line" style="margin: 0 0 0 0;">
<div class="title">欧洲小包团、落地团以及单项提成</div>
<div class="title">
<span>欧洲小包团、落地团以及单项提成</span>
<div>
<detailsButtom :type="3" :obj="detailsInfor"/>
</div>
</div>
<p>当月个人毛利润</p>
<div class="CommissionInfor">
<span>
......@@ -168,7 +202,7 @@
</div>
<div style="display: flex;">
<div class="CommissionLadder Line" style="margin: 0 10px 10px 0;">
<p>当月人头奖励(不含门票、包车)</p>
<p>当月人头奖励(不含门票、包车、国内游)</p>
<div class="CommissionInfor">
<span>
人头数量：<span>{{CommissionInfor.PeopleNum}}</span>
......@@ -182,7 +216,7 @@
</div>
</div>
<div class="CommissionLadder Line">
<p>当月人头奖励(不含门票、包车)</p>
<p>当月人头奖励(不含门票、包车、国内游)</p>
<div class="CommissionInfor">
<span>
人头数量：<span>{{CommissionInfor.EuropePNum}}</span>
......@@ -198,10 +232,13 @@
</div>
<div style="display: flex;">
<div class="CommissionLadder Line" style="margin: 0;">
<p style="display: flex;justify-content: space-between;padding: 0 0 10px 0;">
<span>年终奖</span>
<span style="color: red;font-size: 13px;">注:年终奖励从每年3月起始</span>
</p>
<div style="display: flex;justify-content: space-between;">
<span>年终奖(不含门票、包车、国内游)</span>
<div>
<detailsButtom :type="4" :obj="detailsInfor"/>
</div>
</div>
<p style="padding: 0 0 10px 0;text-align: left;"><span style="font-size: 13px;color: red;">注:年终奖励从每年3月起始</span></p>
<div class="CommissionInfor">
<span>连续达标 <span style="margin-left: 10px;">{{CommissionInfor.BonusNum}}</span>月</span>
<span><span>每月人数35人以上</span></span>
......@@ -214,7 +251,13 @@
</div>
</div>
<div class="CommissionLadder Line" style="margin: 20px 0 0 10px;">
<p style="padding: 0 0 10px 0;">国内提成</p>
<div style="display: flex;justify-content: space-between;">
<span style="font-weight: bold;font-size: 16px;">国内提成</span>
<div>
<detailsButtom :type="5" :obj="detailsInfor"/>
</div>
</div>
<p style="padding: 0 0 10px 0;text-align: left;"><span style="font-size: 13px;color: red;">注:国内提成需结团后方可发放提成，以实际结团为准，此外只提供参考</span></p>
<div>
<el-table border ref="multipleTable" :data="DomesticLine.Rlist">
<el-table-column width="80" prop="RuleName"
......@@ -244,16 +287,15 @@
<template v-if="scope.row.Way==2">
{{scope.row.ProfitRate+'%'}}
</template>
<p v-if="scope.row.Way == 2" style="font-size: 12px;color: #999999;white-space: wrap;">
<!-- <p v-if="scope.row.Way == 2" style="font-size: 12px;color: #999999;white-space: wrap;">
利润比{{scope.row.ProfitRate}}%
利润<=0时 {{scope.row.Money}}元/人</p>
利润<=0时 {{scope.row.Money}}元/人</p> -->
</template>
</el-table-column>
<el-table-column prop="Profit"
label="预期利润" show-overflow-tooltip>
<template slot-scope="scope">
<template v-if="scope.row.Profit<=0">10/人</template>
<template v-else>{{scope.row.Way==2&&scope.row.Profit?scope.row.Profit:'-'}}</template>
{{scope.row.Way==2&&scope.row.Profit?scope.row.Profit:'-'}}
</template>
</el-table-column>
<el-table-column prop="Commission"
......@@ -262,10 +304,6 @@
</div>
</div>
</div>
</div>
<div class="CommissionLadder-form">
</div>
<div class="ExpectedCommission-form">
<!-- 未平账单 -->
......@@ -316,6 +354,7 @@
<script>
import notification from './components/notification'
import OrderList from './components/OrderList'
import detailsButtom from './components/details'
// import OrderList from '../myOrdersAllType/components/OrderList'
import progressComm from './components/progressComm'
export default {
......@@ -323,18 +362,17 @@
notification,
OrderList,
progressComm,
detailsButtom
},
data() {
return {
DomesticLine:{
type:4,
AvgLureNum:0,
AvfOrderNum:0,
CommissionRate:0,
Commission: 0,
CommissionProfit: 0,
CommissionRateList:[]
detailsInfor:{
type:0
},
GNOrderNum:0,
GNEopleNum:0,
GNCommission:0,
DomesticLine:{},
AnnualBonus:{
type:3,
AvgLureNum:0,
......@@ -434,9 +472,11 @@
this.MonthList[0].Name = this.MonthList[0].Name+'('+this.LastMonthTime+'月)'
this.MonthList[1].Name = this.MonthList[1].Name+'('+this.MonthTime+'月)'
this.commissionMsg.DepartSTime = this.Year+'-'+(this.MonthTime>10?this.MonthTime:'0'+this.MonthTime)+'-01'//出发开始
var MonthDayNum = new Date(this.Year, this.msg.Month, 0).getDate(); //计算当月的天数
this.commissionMsg.DepartETime = this.Year+'-'+(this.MonthTime>10?this.MonthTime:'0'+this.MonthTime)+(MonthDayNum>10?MonthDayNum:'0'+MonthDayNum)//出发结束
//this.Year+'-'+(this.MonthTime>10?this.MonthTime:'0'+this.MonthTime)+'-01'//出发开始
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(); //计算当月的天数
this.commissionMsg.DepartETime = this.Year+'-'+(this.MonthTime>10?this.MonthTime:'0'+this.MonthTime)+'-'+(MonthDayNum>10?MonthDayNum:'0'+MonthDayNum)//出发结束
this.GetOrderPageList()
},
methods: {
goMore(){
......@@ -503,7 +543,7 @@
// 年终奖
this.AnnualBonus.AvfOrderNum = this.CommissionInfor.BonusNum?this.CommissionInfor.BonusNum:0
this.AnnualBonus.Commission = this.CommissionInfor.BonusPeriods?this.CommissionInfor.BonusPeriods:0
console.log(this.CommissionInfor,'----')
// console.log(this.CommissionInfor,'----')
}else {
this.Error(res.data.message);
}
......@@ -515,8 +555,18 @@
res => {
if (res.data.resultCode == 1) {
this.DomesticLine = res.data.data
this.GNOrderNum = 0
this.GNEopleNum = 0
this.GNCommission = 0
this.DomesticLine.Rlist.forEach(item=>{
this.GNOrderNum+=Number(item.OrderNum)
this.GNEopleNum+=Number(item.PeopleNum)
this.GNCommission+=Number(item.Commission)
})
}
})
},
GetOrderPageList(){
this.commissionMsg.IsMyOrder = '1'
this.apipost('CarSingle_post_GetGuestOrderStatisticsPageList', this.commissionMsg,
res => {
......@@ -536,6 +586,7 @@
},
err => {this.loading = false}
)
}
}
......
src/components/sale/components/details.vue 0 → 100644
View file @ 80c698dc
<style scoped>
</style>
<template>
<el-tooltip class="item" effect="dark" content="预期提成详情" placement="top">
<img src="../../../assets/img/xiaosouYQ.png" @click="goDetails"
style="width: 12px;height: auto; cursor: pointer;color: #33B3FF;"></img>
</el-tooltip>
</template>
<script>
export default {
props:['type','obj'],
data() {
return {
};
},
watch: {
obj:{
handler(val, oldVal){
this.obj = val
},
deep: true,
immediate: true
}
},
mounted() {
},
created() {
},
methods: {
goDetails(){
let userInfo = this.getLocalStorage();
console.log(this.type,'======')
return
let name
this.$router.push({
name: name,
query: {
UserId: Number(userInfo.EmployeeId),
isSale: 1,
blank: 'y'
}
});
}
}
};
</script>
src/components/sale/components/progressComm.vue
View file @ 80c698dc
......@@ -69,13 +69,8 @@
<template>
<div>
<div class="progress-box">
<!-- {{commissionratioList.AvgLureNum}}-{{commissionratioList.AvfOrderNum}}-
{{commissionratioList.CommissionRate}}-
{{commissionratioList.Commission}}-
{{commissionratioList.CommissionProfit}} -->
<div v-for="(item,index) in commissionratioList.CommissionRateList" :key="index"
class="relative-position">
<!-- :color="commissionratioList.CommissionRate>=item.Rate?colorlists[Math.floor(Math.random()*10)]:colors[Math.floor(Math.random()*10)]" -->
<el-progress :text-inside="true" :stroke-width="20"
:percentage="setItemProgress(item)"
:status="setItemStatus(item)"
......@@ -171,7 +166,7 @@
if(this.commissionratioList.type==2){
this.formatProgress(row)
return () => {
return row.StartValue2 + ' - ' + row.EndValue2+`${row.StartValue>=10000||row.EndValue>=10000?'w':''}`
return row.StartValue2 + ' - ' + `${row.EndValue2>9999?'9999':row.EndValue2}`+`${row.StartValue>=10000||row.EndValue>=10000?'w':''}`
}
}else if(this.commissionratioList.type==1){
return () => {
......@@ -193,7 +188,7 @@
formatProgress(data){
let obj = JSON.parse(JSON.stringify(data))
if(obj.StartValue>=10000) {
data.StartValue2 = obj.StartValue/10000
data.StartValue2 = Math.floor(obj.StartValue/10000)
}else{
data.StartValue2 = obj.StartValue
}
......
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