Skip to content

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

Merge branch 'master' into month

parents 80910db7 7a900e43
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 41 deletions
src/components/FinancialModule/OPExtraReward/CommissionRule.vue
View file @ fbb0f855
......@@ -26,6 +26,10 @@
<th width="100" style="min-width: 100px;max-width: 100px;">方案名称</th>
<th width="200" class="left-text-indent">线路</th>
<th width="100">提成方式</th>
<th width="100">单签提成比</th>
<th width="100">团签奖励</th>
<th width="100">团签助奖</th>
<th width="100">单/落助人头奖</th>
<th width="150" style="min-width: 150px;max-width: 150px;">修改时间</th>
<th width="150" style="min-width: 150px;max-width: 150px;">操作</th>
</tr>
......@@ -39,6 +43,16 @@
<td style="padding: 0 10px;">
{{item.SingleVisaWay==1?'人头奖励':item.SingleVisaWay==2?'利润比':'-'}}
</td>
<td>
<span v-if="item.FSingleVisaMoney">总公司：</span>{{item.SingleVisaRate}}{{item.SingleVisaWay==1?'/人':item.SingleVisaWay==2?'%':'-'}}
<div v-if="item.FSingleVisaMoney">分公司：{{item.FSingleVisaMoney}}/人</div>
</td>
<td>
<span v-if="item.FTravelVisaMoney">总公司：</span> {{item.TravelVisaMoney}}/人
<div v-if="item.FTravelVisaMoney">分公司：{{item.FTravelVisaMoney}}/人</div>
</td>
<td>{{item.TravelVisaZLMoney}}/人</td>
<td>{{item.SingleZLMoney}}/人</td>
<td style="padding: 0 10px;">
<p>{{item.UpdateBy}}</p>
<span>
......@@ -128,7 +142,7 @@
style="width: 100%;border:1px solid #E6E6E6;display: flex;align-items: center;justify-content: center;height: 60px;margin-top: 30px;"
>暂无数据</div>
<el-dialog :title="titleName" :visible.sync="ruleVisible" width="750px" @close="resetForm('form')">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<div class="titleOP">总公司OP提成</div>
<div class="ImpressionTicketing-msgbox bottom0">
<el-row>
......@@ -179,6 +193,14 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="单/落助人头奖" prop="SingleZLMoney">
<div class="Impression-ratio-box">
<el-input type="Number" v-model="form.SingleZLMoney" clearable></el-input>
<span class="Impression-ratio-right">/人</span>
</div>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="线路" prop="LineIdList">
<el-select class="multiple_input" filterable multiple collapse-tags
......@@ -293,7 +315,7 @@
<div class="titleOP">分公司OP提成</div>
<div class="ImpressionTicketing-msgbox bottom0">
<el-row>
<el-col :span="8" v-if="form.SingleVisaWay">
<el-col :span="8">
<el-form-item label="单签人头奖" prop="FSingleVisaMoney"
:rules="form.SingleVisaWay==1?rules.SingleVisaRate2:rules.SingleVisaRate">
<div class="Impression-ratio-box">
......@@ -490,6 +512,11 @@
message: '请输入分公司团签奖励',
trigger: 'blur'
}],
SingleZLMoney: [{
required: true,
message: '请输入单项/落地散助理人头奖励',
trigger: 'blur'
}],
},
ProfitList:
{
......@@ -555,7 +582,8 @@
],
IsEnableFBranch: 0,
FSingleVisaMoney: 0,
FTravelVisaMoney: 0
FTravelVisaMoney: 0,
SingleZLMoney: 0,
},
ruleLoading: false,
ruleVisible:false,
......@@ -641,7 +669,8 @@
FProfitList: item.FProfitList&&item.FProfitList.length>0?item.FProfitList:item.IsEnableFBranch>0?[this.FProfitList]:[],
FExtraList: item.FExtraList&&item.FExtraList.length>0?item.FExtraList:[this.FExtraList],
FSingleVisaMoney: item.FSingleVisaMoney,
FTravelVisaMoney: item.FTravelVisaMoney
FTravelVisaMoney: item.FTravelVisaMoney,
SingleZLMoney: item.SingleZLMoney,
}
},
Delete(item){//删除
......
src/components/SalesModule/MyCustomer.vue
View file @ fbb0f855
......@@ -637,7 +637,7 @@
<el-col :span="6">
<el-form-item label="签约资料" prop="SigningFile">
<el-upload v-if="!saveMsg || !saveMsg.length" class="upload-demo" :disabled="!addMsg.SigningType"
style="display:inline-block;position:relative;top:-1px;left:3px;" :http-request="uploadFileBtn"
:show-file-list="false" action="">
......@@ -1499,7 +1499,7 @@
}
}, err => {})
},
saveVisa() { //
saveVisa() { //
this.addMsg.SigningType = this.addMsg.SigningType ? 1 : 0
console.log('save', this.addMsg, this.updateMsg)
if(!this.addMsg.contactNumber){
......@@ -1518,7 +1518,11 @@
this.$message.error('请上传签约材料')
return
} else {
this.addMsg.SigningFile = this.saveMsg[0].Path
if(this.saveMsg&&this.saveMsg.length>0)
{
this.addMsg.SigningFile = this.saveMsg[0].Path
}
}
// if(!this.addMsg.UniqueCode){
// this.$message.error('请输入统一编码')
......
src/components/SalesModule/groupTourOrder.vue
View file @ fbb0f855
......@@ -1701,7 +1701,7 @@
</p>
<p>{{ $t("restaurant.res_oderTime") }}：{{ item.createDate }}</p>
<p v-if="item.tradeWay == 1">{{ item.platformOrder }}</p>
<p v-if="item.commissionMoney" style="color: red">
<p v-if="item.commissionMoney" style="color: red;cursor: pointer;">
<span style="float: left;">{{ $t("salesModule.Commission") }}：</span>
<commissionDialog :type="pagesTitle" :objNew="item"></commissionDialog>{{item.commissionCurrency}}
<!-- {{ item.commissionMoney }} {{item.commissionCurrency}} -->
......@@ -4117,7 +4117,7 @@
}
});
},
cancelSubmit() {
this.isShowLayer = false;
this.$refs["addMsg"].resetFields();
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ fbb0f855
......@@ -829,11 +829,11 @@
</tr>
<template v-for="item in DataList.FinicePayList">
<!-- <tr v-if='item.OrderSource===4 || isExists(item.CostTypeList,'国际段机票')'> -->
<tr v-if="(isExists(item.CostTypeList,'国际段机票')
|| item.OrderSource===4
|| isExists(item.CostTypeList,'机票退税')
|| isExists(item.CostTypeList,'机票罚金')
|| isExists(item.CostTypeList,'机票税金'))
<tr v-if="(isExists(item.CostTypeList,'国际段机票')
|| item.OrderSource===4
|| isExists(item.CostTypeList,'机票退税')
|| isExists(item.CostTypeList,'机票罚金')
|| isExists(item.CostTypeList,'机票税金'))
|| isExists(item.CostTypeList,'国内联运段机票')">
<td>
<el-checkbox v-model="item.checked"></el-checkbox>
......@@ -1102,7 +1102,8 @@
</tr>
<template v-for="item in DataList.FinicePayList">
<tr
v-if="isExists(item.CostTypeList,'保险费') || isExists(item.CostTypeList,'旅游责任险') || isExists(item.CostTypeList,'团队保险')">
v-if="isExists(item.CostTypeList,'保险费') || isExists(item.CostTypeList,'旅游责任险')
|| isExists(item.CostTypeList,'团队保险')">
<td>
<el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
......@@ -1211,24 +1212,24 @@
<tr v-if="NotExists(item.CostTypeList,'领队奖励金')
&&NotExists(item.CostTypeList,'机票折让费')
&&NotExists(item.CostTypeList,'签证费')
&&NotExists(item.CostTypeList,'签证佣金')
&& NotExists(item.CostTypeList,'地接费（领取）')
&& NotExists(item.CostTypeList,'地接费（结算）')
&& NotExists(item.CostTypeList,'提成')
&&NotExists(item.CostTypeList,'签证佣金')
&& NotExists(item.CostTypeList,'地接费（领取）')
&& NotExists(item.CostTypeList,'地接费（结算）')
&& NotExists(item.CostTypeList,'提成')
&& NotExists(item.CostTypeList,'国内联运')
&& NotExists(item.CostTypeList,'车资')
&& NotExists(item.CostTypeList,'邀请函费用')
&& NotExists(item.CostTypeList,'名单表费')
&& NotExists(item.CostTypeList,'领队佣金')
&& NotExists(item.CostTypeList,'导游佣金')
&&item.OrderSource!==4
&& NotExists(item.CostTypeList,'国际段机票')
&& NotExists(item.CostTypeList,'机票退税')
&& NotExists(item.CostTypeList,'机票罚金')
&& NotExists(item.CostTypeList,'机票税金')
&& item.OrderSource!==11
&& NotExists(item.CostTypeList,'赔偿')
&& NotExists(item.CostTypeList,'保险费')
&& NotExists(item.CostTypeList,'车资')
&& NotExists(item.CostTypeList,'邀请函费用')
&& NotExists(item.CostTypeList,'名单表费')
&& NotExists(item.CostTypeList,'领队佣金')
&& NotExists(item.CostTypeList,'导游佣金')
&&item.OrderSource!==4
&& NotExists(item.CostTypeList,'国际段机票')
&& NotExists(item.CostTypeList,'机票退税')
&& NotExists(item.CostTypeList,'机票罚金')
&& NotExists(item.CostTypeList,'机票税金')
&& item.OrderSource!==11
&& NotExists(item.CostTypeList,'赔偿')
&& NotExists(item.CostTypeList,'保险费')
&& NotExists(item.CostTypeList,'旅游责任险')
&& NotExists(item.CostTypeList,'团队保险')">
<td>
......@@ -2026,7 +2027,8 @@
},
zhaunBox: function () {
let flag = false
this.DataList.FinicePayList.forEach(x => {
// FinicePayList 未排除重复数据
this.DataList.newFinicePayList2.forEach(x => {
if (x.checked) {
flag = true
this.zhuanMsg.FrIds += x.FrID + ','
......@@ -2130,7 +2132,12 @@
data.FiniceReciveList.forEach(x => {
x.checked = false;
})
let objData2 = function (obj) {
obj.forEach(x=>{
x.checked = false
})
}
objData2(data.newFinicePayList2)
this.DataList = data;
data.FinicePayList.forEach(item => {
if ((that.isExists(item.CostTypeList, '国际段机票') ||
......@@ -2256,7 +2263,7 @@
this.moneyAll.peichangsf += item.PayMoney;
}
// 保险费
if (that.isExists(item.CostTypeList, '保险费') || that.isExists(item.CostTypeList, '旅游责任险')) {
if (that.isExists(item.CostTypeList, '保险费') || that.isExists(item.CostTypeList, '旅游责任险') || that.isExists(item.CostTypeList, '团队保险')) {
this.moneyAll.baoxianyf += item.Money;
this.moneyAll.baoxiansf += item.PayMoney;
}
......@@ -2276,7 +2283,7 @@
.CostTypeList, '国际段机票') && that.NotExists(item.CostTypeList, '机票退税') && that.NotExists(item
.CostTypeList, '机票罚金') && that.NotExists(item.CostTypeList, '机票税金') && item.OrderSource !==
11 && that.NotExists(item.CostTypeList, '赔偿') && that.NotExists(item.CostTypeList, '保险费') &&
that.NotExists(item.CostTypeList, '旅游责任险') && that.NotExists(item.CostTypeList, '机票折让费')) {
that.NotExists(item.CostTypeList, '旅游责任险')&& that.NotExists(item.CostTypeList, '团队保险') && that.NotExists(item.CostTypeList, '机票折让费')) {
this.moneyAll.otheryf += item.Money;
this.moneyAll.othersf += item.PayMoney;
}
......@@ -2294,18 +2301,18 @@
})
// if(this.moneyAll.dijieys>0 || this.moneyAll.dijiess>0){
// }
// }
// if(this.moneyAll.zifeiys>0 || this.moneyAll.zifeiss>0){
// this.moneyAll.otheryTotalyf+=this.moneyAll.zifeiys;
// this.moneyAll.otheryTotalsf+=this.moneyAll.zifeiss;
// }
// }
// if(this.moneyAll.xiaofeiys>0 || this.moneyAll.xiaofeiss>0){
// this.moneyAll.otheryTotalyf+=this.moneyAll.xiaofeiys;
// this.moneyAll.otheryTotalsf+=this.moneyAll.xiaofeiss;
// } if(this.moneyAll.yongjinys>0 || this.moneyAll.yongjinss>0){
// this.moneyAll.otheryTotalyf+=this.moneyAll.yongjinys;
// this.moneyAll.otheryTotalsf+=this.moneyAll.yongjinss;
// }
// }
}
});
},
......
src/components/sale/ExpectedCommission.vue
View file @ fbb0f855
......@@ -219,7 +219,7 @@
</div>
<div style="display: flex;">
<div class="CommissionLadder Line" style="margin: 0 10px 10px 0;">
<p><span>当月人头奖励(不含门票、包车、国内游)</span><span>单团(独立成团)</span></p>
<p><span>当月人头奖励/不含门票、包车、国内游以及单团(独立成团)</span><span></span></p>
<div class="CommissionInfor">
<span>
人头数量：<span>{{CommissionInfor.PeopleNum}}</span>
......@@ -233,7 +233,7 @@
</div>
</div>
<div class="CommissionLadder Line">
<p><span>当月人头奖励(不含门票、包车、国内游)</span><span>单团(独立成团)</span></p>
<p><span>当月人头奖励/不含门票、包车、国内游以及单团(独立成团)</span><span></span></p>
<div class="CommissionInfor">
<span>
人头数量：<span>{{CommissionInfor.EuropePNum}}</span>
......
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