Skip to content

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

no message

parent 3c7b9713
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 99 deletions
src/components/sale/ExpectedCommission.vue
View file @ e4becfa0
......@@ -164,7 +164,7 @@
</div>
</div>
<div style="display: flex;">
<div class="CommissionLadder Line" style="margin: 0 10px 0 0;">
<div class="CommissionLadder Line" style="margin: 0 0 0 0;">
<div class="title">
<span>日本及其他线小包团、落地团以及单项提成</span>
</div>
......@@ -190,7 +190,7 @@
<progressComm :commissionratioList="JapaneseProfit"></progressComm>
</div>
</div>
<div class="CommissionLadder Line" style="margin: 0 0 0 0;">
<div class="CommissionLadder Line" style="margin: 0 0 0 10px;">
<div class="title">
<span>欧洲小包团、落地团以及单项提成</span>
</div>
......@@ -218,7 +218,7 @@
</div>
</div>
<div style="display: flex;">
<div class="CommissionLadder Line" style="margin: 0 10px 10px 0;">
<div class="CommissionLadder Line" style="margin: 0 0 10px 0;">
<p><span>当月人头奖励/不含门票、包车、国内游以及单团(独立成团)</span><span></span></p>
<div class="CommissionInfor">
<span>
......@@ -232,7 +232,7 @@
<progressComm :commissionratioList="JapaneseLine"></progressComm>
</div>
</div>
<div class="CommissionLadder Line">
<div class="CommissionLadder Line" style="margin: 0 0 10px 10px;">
<p><span>当月人头奖励/不含门票、包车、国内游以及单团(独立成团)</span><span></span></p>
<div class="CommissionInfor">
<span>
......@@ -369,7 +369,7 @@
2.增加境外散拚提成(日本线.欧洲线分别奖励计算)</br>
3.增加人头奖励(日本线与其他.欧洲线2种)</br>
4.所有业绩结算皆以出发日.尾款收齐为基准</br>
5.人头奖励包含归属各线所有产品(散拚.一日游.多日游.签证等)</br>
5.人头奖励包不含门票、包车、国内游以及单团(独立成团)</br>
6.人头奖励每月至少20条方可进行奖励!</br>
7.以上所有核算皆以月为单位.核算基础为出发日或签证收取日算起!</br>
8.直客部门归属直客业务编制.不参与同业部门业务销售!</br>
......@@ -621,13 +621,10 @@
this.GNEopleNum+=Number(item.PeopleNum)
this.GNCommission+=Number(item.Commission)
})
setTimeout(()=>{
let arr1 =[this.CommissionInfor.PeopleMoney,this.CommissionInfor.EuropeMoney]
let arr2 =[this.CommissionInfor.SalesCommission,this.CommissionInfor.JapanCommission,this.CommissionInfor.EuropeCommission,this.GNCommission]
this.CommissionJJ = this.CalculatePrice(arr1,0)
this.CommissionTC = this.CalculatePrice(arr2,2)
},500)
let arr1 =[this.CommissionInfor.PeopleMoney,this.CommissionInfor.EuropeMoney]
let arr2 =[this.CommissionInfor.SalesCommission,this.CommissionInfor.JapanCommission,this.CommissionInfor.EuropeCommission,this.GNCommission]
this.CommissionJJ = this.CalculatePrice(arr1,0)
this.CommissionTC = this.CalculatePrice(arr2,2)
}
})
},
......
src/components/sale/components/progressComm.vue
View file @ e4becfa0
......@@ -200,7 +200,7 @@
}
}else{
return () => {
return `连续${row.StartValue}月`
return `达标${row.StartValue}月`
}
}
......
src/components/scenicSpot/Singleticket/OrderPreview.vue
View file @ e4becfa0
......@@ -257,7 +257,7 @@
/deep/.line-heigh .el-input-number{
line-height: 32px;
}
</style>
<template>
<div class="flexOne">
......@@ -294,7 +294,7 @@
<div class="time-box center">
<span>游玩日期：</span>
<div>
<el-date-picker class="w150" v-model='msg.UseDate' format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date"
<el-date-picker class="w150" v-model='msg.UseDate' format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date"
:picker-options="beforeCheck" laceholder="门票日期" @change="getInfo">
</el-date-picker>
</div>
......@@ -303,7 +303,7 @@
<span>选择票型：</span>
<div style="display: flex;flex-wrap: wrap;">
<template v-for="x in types">
<el-tag class="time-box-width" :type="x.checked?'':'info'" style="margin-right: 10px;margin-bottom: 5px; cursor: pointer;"
<el-tag class="time-box-width" :type="x.checked?'':'info'" style="margin-right: 10px;margin-bottom: 5px; cursor: pointer;"
@click="changeDetailListHandler(x)">
<a>{{ x.TicketName }}</a>
<p style="display: inline-block;margin-left: 5px;">
......@@ -320,7 +320,7 @@
<template v-for="x in types">
<div style="flex-direction: row;" v-if="x.checked">
<el-input-number v-model="x.num" @change="changePeople" :min="1" label="购买数量"
style="margin-bottom: 10px;"></el-input-number>
style="margin-bottom: 10px;"></el-input-number>
<!-- <span> {{x.CurrencyName
}} </span> -->
</div>
......@@ -366,7 +366,7 @@
<el-input v-model="msg.EName" placeholder="请输入英文名"/>
</el-form-item>
</li>
<li>
<el-form-item label="电话" prop="Mobile">
<el-input type="Number" v-model="msg.Mobile" placeholder="请输入电话"/>
......@@ -394,12 +394,12 @@
</div>
</el-form>
<div style="margin-top: 20px;">
<el-input style="width: 100%;" type="textarea" :autosize="{ minRows: 2, maxRows: 4}"
<el-input style="width: 100%;" type="textarea" :autosize="{ minRows: 2, maxRows: 4}"
v-model="msg.Remark" placeholder="订单备注"/>
</div>
</div>
</div>
<div class="notice">
<b>预定须知</b>
<p>{{detailsObj.BookingInfo}}</p>
......@@ -439,10 +439,10 @@
</div>
</div>
<div class="right-Money">
<div>
<span>订单总金额：</span>
<b>{{ msg.Money>msg.MailingMoney?msg.Money.toFixed(2):0.0 }}
<b>{{ msg.Money>msg.MailingMoney?msg.Money.toFixed(2):0.0 }}
<span class="fz12" v-if="types&&types.length>0">
<template v-for="x in types" v-if="checkedTyps==1&&x.checked">
{{x.CurrencyName}}
......@@ -454,8 +454,8 @@
</div>
</div>
<div class="right-Submit">
<button class="hollowFixedBtn" v-loading="loading"
type="primary"
<button class="hollowFixedBtn" v-loading="loading"
type="primary"
:disabled="!isCheck" @click="submit">
提交订单
</button>
......@@ -506,7 +506,7 @@
detailsObj: {},
beforeCheck: {
disabledDate: time => {
let endTime = new Date(this.getBeforeDate(0,new Date().Format("yyyy-MM-dd")));
let endTime = new Date(this.getBeforeDate(1,new Date().Format("yyyy-MM-dd")));
return time && endTime.getTime() >= time.getTime();
}
},
......@@ -587,7 +587,7 @@
}
},
err => {
this.Error(err.message)
this.Error(err.message)
});
},
changePeople(val) {
......@@ -622,7 +622,7 @@
changeDetailListHandler(e) {
e.checked = !e.checked
this.isCheck = this.types.findIndex(x => x.checked) > -1
this.checkedTyps = 0
this.checkedTyps = 0
this.types.forEach(item=>{ if(item.checked==true){ this.checkedTyps++}})
if(this.isCheck){
this.calcMoneyHandler()
......@@ -661,7 +661,7 @@
if(this.types&&this.types.length==0){
this.Error('暂无报价，无法下单')
}
}else{
this.Error(res.data.message)
}
......@@ -701,7 +701,7 @@
err => {}
);
},
},
mounted() {
// crm自动登陆传过来的参数
......@@ -718,6 +718,5 @@
this.getInfo()
}
};
</script>
\ No newline at end of file
src/components/scenicSpot/Singleticket/SingleticketList.vue
View file @ e4becfa0
......@@ -306,7 +306,7 @@ export default {
ViewType: 2,
beforeCheck: {
disabledDate: time => {
let endTime = new Date(this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")));
let endTime = new Date(this.getBeforeDate(1, new Date().Format("yyyy-MM-dd")));
return time && endTime.getTime() >= time.getTime();
}
},
......
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