Skip to content

S
SuperMan
Commit e63d9f88 authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents 19fc6a08 7e8e5c05
Hide whitespace changes
Inline Side-by-side
Showing with 153 additions and 23 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ e63d9f88
......@@ -935,7 +935,7 @@
<td v-else-if="OrderSource==4&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,4)"> <span
class="_jump_page _font_bold">机票收支</span> </td>
<td
v-if="GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53|| GetDetail.TemplateId === 56
v-if="isCostTypeId||GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53|| GetDetail.TemplateId === 56
|| GetDetail.TemplateId === 49 || GetDetail.TemplateId === 50 || GetDetail.TemplateId === 51|| GetDetail.TemplateId === 52
|| GetDetail.TemplateId === 54 || GetDetail.TemplateId === 55 || GetDetail.TemplateId === 57|| GetDetail.TemplateId === 58 || GetDetail.TemplateId === 98 || GetDetail.TemplateId === 99
|| GetDetail.IsShowPlanUrl === 1 && (qjGroupId==userInfo.RB_Group_id || F_Disbursement_Schedule)"
......@@ -1995,6 +1995,7 @@
export default {
data() {
return {
isCostTypeId: false,//地接费（领取）用款计划
PaymentMethodList:[
{Name:'银行卡',Id:1},
{Name:'支付宝',Id:2},
......@@ -3667,6 +3668,10 @@
// this.$router.push({name:data.URL+'1',query:{'SourceID':this.SourceID,'Callback':this.Callback,id:this.ID}});
// }
}
let DetailList = this.GetDetail.DetailList.filter(x=> x.CostTypeId==56)
if(DetailList&&DetailList.length>0){
this.isCostTypeId = true
}
}
}, err => {})
},
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ e63d9f88
......@@ -958,9 +958,10 @@
<td v-else-if="OrderSource==4&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,4)">
<span class="_jump_page _font_bold">机票收支</span> </td>
<td
v-if="GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53|| GetDetail.TemplateId === 56
v-if="isCostTypeId||GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53|| GetDetail.TemplateId === 56
|| GetDetail.TemplateId === 49 || GetDetail.TemplateId === 50 || GetDetail.TemplateId === 51|| GetDetail.TemplateId === 52
|| GetDetail.TemplateId === 54 || GetDetail.TemplateId === 55 || GetDetail.TemplateId === 57|| GetDetail.TemplateId === 58 || GetDetail.TemplateId === 98 || GetDetail.TemplateId === 99
|| GetDetail.TemplateId === 54 || GetDetail.TemplateId === 55 || GetDetail.TemplateId === 57|| GetDetail.TemplateId === 58
|| GetDetail.TemplateId === 98 || GetDetail.TemplateId === 99
|| GetDetail.IsShowPlanUrl === 1 && (qjGroupId==userInfo.RB_Group_id || F_Disbursement_Schedule)"
@click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span>
</td>
......@@ -1486,6 +1487,7 @@
export default {
data() {
return {
isCostTypeId: false,//地接费（领取）用款计划
isOrderOP: false,//是否跳转op订单页面
tableShowHandFee: true,
TeamShouZhi: false,
......@@ -2543,6 +2545,10 @@
// if(data.URL){
// this.$router.push({name:})
// }
let DetailList = this.GetDetail.DetailList.filter(x=> x.CostTypeId==56)
if(DetailList&&DetailList.length>0){
this.isCostTypeId = true
}
}
}, err => {})
},
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ e63d9f88
......@@ -2115,7 +2115,7 @@
}
if (this.orderObj && this.orderObj.companyIDList && this.orderObj.companyIDList.length > 0) {
this.msg.RB_Branch_Id = this.orderObj.companyIDList[0];
} else if(this.orderObj && this.orderObj.RB_Branch_Id){
} else if(this.orderObj && (this.orderObj.RB_Branch_Id!=''&&this.orderObj.RB_Branch_Id!=null&&this.orderObj.RB_Branch_Id!=undefined)){
this.msg.RB_Branch_Id = this.orderObj.RB_Branch_Id
} else if (this.$route.query.companyID) {
this.msg.RB_Branch_Id = parseInt(this.$route.query.companyID);
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ e63d9f88
......@@ -2100,9 +2100,13 @@
this.msg.TCIDs = this.$route.query.id;
this.NewCombinationNum = this.$route.query.NewCombinationNum;
this.myLineId = this.$route.query.lineId;
if (this.myLineId == 14) {
if (this.myLineId == 14) {//日本线95%
this.comRate = 0.95;
} else {
}
else if (this.myLineId == 168||this.myLineId == 2) {//欧洲线60% 2023-07-25 add by:W 徐总要求
this.comRate = 0.60;
}
else {
this.comRate = 1;
}
if (this.$route.query.OutBranchId == 1216) {
......
src/components/SalesModule/VisaFinancialDocuments.vue
View file @ e63d9f88
......@@ -180,7 +180,7 @@
<template v-for="(outItem,index) in RollCallList">
<!-- v-if="outItem.CostRelationList.length>0||outItem.InsureRelationList.length>0||outItem.ServiceRelationList.length>0" -->
<tr>
<td style="white-space:nowrap;">{{outItem.guestName}}
<td style="white-space:nowrap;"><p v-if="outItem.Status==1" style="color: red;text-decoration:line-through;">{{outItem.guestName}}</p><p v-else>{{outItem.guestName}}</p>
</td>
<td>{{outItem.SexStr}}
</td>
......@@ -538,9 +538,9 @@
<li v-for="item in checknameList" :key="item.Id">
<input type="checkbox" v-model="checkList" :value="item.Id" @change="checkThis" :id="item.Id">
<label :for="item.Id">
<span v-if="item.VisaStatus===1" class="tickets_red" >{{item.guestName}}</span>
<span v-if="item.VisaStatus===2" class="tickets_blue" >{{item.guestName}}</span>
<span v-if="item.VisaStatus===3" class="tickets_black" >{{item.guestName}}</span>
<span v-if="item.VisaStatus===1" class="tickets_red" ><span v-if="item.Status==0" >{{item.guestName}}</span><span v-else style="text-decoration:line-through;">{{item.guestName}}</span></span>
<span v-if="item.VisaStatus===2" class="tickets_blue" ><span v-if="item.Status==0" >{{item.guestName}}</span><span v-else style="text-decoration:line-through;">{{item.guestName}}</span></span>
<span v-if="item.VisaStatus===3" class="tickets_black" ><span v-if="item.Status==0" >{{item.guestName}}</span><span v-else style="text-decoration:line-through;">{{item.guestName}}</span></span>
</label>
</li>
......
src/components/Ticketing/flightPerformance.vue
View file @ e63d9f88
......@@ -40,6 +40,16 @@
<div class="flexOne flightPerformance">
<div class="query-box">
<ul>
<li>
<em>出团公司</em>
<!-- S_CheckBranchOrder -->
<el-select v-model="msg.OutBranchId" size="mini" @change="getList"
:disabled="false">
<el-option label="不限" :value="-1"></el-option>
<el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName"
:value="item.Id"></el-option>
</el-select>
</li>
<li>
<span>
<em>操作人</em>
......@@ -217,12 +227,14 @@
export default {
data() {
return {
BranchList: [],
msg: {
LineId: 0, //线路编号
OutBranchId: -1, //出团公司
AirLineID: 0, //航空公司编号
CreateBy: 0, //操作人
QMonth: "" //月份
QMonth: "", //月份
OutBranchId: -1,
},
//单机票百分比
singlePercent:0.1,
......@@ -235,10 +247,9 @@ export default {
};
},
mounted() {
this.getCompanyList()
this.getEmployeeList();
if (this.$route.query.UserId) {
this.msg.CreateBy = Number(this.$route.query.UserId);
}
this.msg.CreateBy = this.$route.query.UserId?Number(this.$route.query.UserId):0;
if (this.$route.query.Periods) {
var str = this.$route.query.Periods;
this.msg.QMonth = str.substring(0, 4) + "-" + str.substring(4);
......@@ -251,10 +262,32 @@ export default {
: date.getMonth() + 1;
this.msg.QMonth = y + "-" + m;
}
this.msg.OutBranchId = this.$route.query.OutBranchId?Number(this.$route.query.OutBranchId):-1;
this.initAirlines();
this.getList();
},
methods: {
//初始化公司
getCompanyList() {
let userInfo = this.getLocalStorage();
var RB_Group_id = userInfo.RB_Group_id;
let msg = {
Status: 0,
is_show: 0,
RB_Group_Id: RB_Group_id
};
this.apipost(
"admin_get_BranchGetList",
msg,
res => {
if (res.data.resultCode == 1) {
this.BranchList = res.data.data;
}
},
err => { }
);
},
//单卖机票计算
getSingleCount(list) {
let count = 0;
......
src/components/administrative/AirticketCommission.vue
View file @ e63d9f88
......@@ -10,6 +10,16 @@
<div class="flexOne">
<div class="query-box">
<ul>
<li>
<em>出团公司</em>
<!-- S_CheckBranchOrder -->
<el-select v-model="msg.OutBranchId" size="mini" @change="getList(1)"
:disabled="false">
<el-option label="不限" :value="-1"></el-option>
<el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName"
:value="item.Id"></el-option>
</el-select>
</li>
<li>
<input v-if="IsAuth==1" type="button" class="normalBtn" @click="CreateAirticketCommission()" value="生成提成报表" :disabled="isDisable" />
</li>
......@@ -19,6 +29,8 @@
<tr>
<th>期数</th>
<th>提成总金额</th>
<th>所属公司提成</th>
<th>财务单据</th>
<th>{{$t('admin.admin_czPerson')}}</th>
<th>日期</th>
<th>{{$t('system.table_operation')}}</th>
......@@ -26,6 +38,21 @@
<tr v-for="(item,index) in dataList" :key="index">
<td>{{item.Periods}}</td>
<td>{{item.SumPrice}}</td>
<td>
<template v-if="item.BranchCommission">
{{item.BranchCommission}}
</template>
</td>
<td>
<template v-if="item.FinanceIdList">
<span v-for="(x,y) in item.FinanceIdList" >
<span style="cursor: pointer;text-decoration: underline;" @click='gofinancialdetail(x)'>
{{x}}
</span>
{{item.FinanceIdList.length == y+1 ?'':'、'}}
</span>
</template>
</td>
<td>{{item.CreateByName}}</td>
<td>{{item.CreateTimeStr}}</td>
<td>
......@@ -34,7 +61,7 @@
icon="iconfont icon-chakan" circle></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="制单" placement="top">
<el-button type="primary" class="CM_look" @click="goUrlZD" icon="iconfont icon-caidan-fill" circle></el-button>
<el-button type="primary" class="CM_look" @click="goUrlZD(item)" icon="iconfont icon-caidan-fill" circle></el-button>
</el-tooltip>
</td>
</tr>
......@@ -50,9 +77,11 @@
export default {
data() {
return {
BranchList: [],
msg: {
PageIndex: 1,
PageSize: 20
PageSize: 20,
OutBranchId: -1
},
loading: false,
//数据源
......@@ -64,17 +93,63 @@
}
},
mounted() {
this.getCompanyList()
this.GetAuth();
this.getList();
},
methods: {
goUrlZD(){
gofinancialdetail(item){
let arr = item.split('-')
this.$router.push({
name: 'FinancialDocumentsDetail',
query: {
id: arr[0],
blank: 'y',
tab: '单据详情'
}
})
},
//初始化公司
getCompanyList() {
let userInfo = this.getLocalStorage();
var RB_Group_id = userInfo.RB_Group_id;
let msg = {
Status: 0,
is_show: 0,
RB_Group_Id: RB_Group_id
};
this.apipost(
"admin_get_BranchGetList",
msg,
res => {
if (res.data.resultCode == 1) {
this.BranchList = res.data.data;
}
},
err => { }
);
},
goUrlZD(item){
let Money = item.BranchCommission
if(this.msg.OutBranchId==-1){
this.Error("请选择出团公司再制单!")
return;
}
if(Money<=0){
this.Error("所属公司提成为0不能制单!")
return;
}
let orderObj = {
isRB_Branch_Id: true,//制单禁止选公司
RB_Branch_Id: this.msg.OutBranchId,
OtherType: 78,
ReFinanceId: item.Periods,
OrderID: 0,
OrderSource: 8,
Obj: {},
SourceID: 0,
CostType:194,
CostType:112,//194
SelectState:true,
}
let id=[29,31];
......@@ -103,7 +178,10 @@
});
},
//获取数据
getList() {
getList(PageIndex) {
if(PageIndex){
this.msg.PageIndex = PageIndex
}
this.loading = true;
this.apipost(
"AirTicketRules_post_GetAirticketCommissionPageList",
......@@ -150,4 +228,4 @@
}
}
}
</script>
\ No newline at end of file
</script>
src/components/leaderPay2.vue
View file @ e63d9f88
......@@ -847,7 +847,8 @@
<td width="80" class="_zhidan">
<input v-if="TimeXiao" type="button" value="制单" class="leader2Btn" @click="goZhiDan(item)">
<input v-else-if="dataList.LeaderApply && dataList.LeaderApply.Status && dataList.LeaderApply.Status==2"
type="button" value="制单" class="leader2Btn" @click="goZhiDan(item)">
type="button" value="制单" style="" class="leader2Btn" @click="goZhiDan(item)">
<span v-else style="color:red">请在APP中提交实际用款详情信息</span>
<input style="margin-top:15px" v-if="item.FinanceIds && item.FinanceIds.length>0" type="button" value="退款制单" class="leader2Btn" @click="gofzZd(item)">
</td>
......
src/components/sale/ExpectedCommission.vue
View file @ e63d9f88
......@@ -431,8 +431,11 @@
7.以上所有核算皆以月为单位.核算基础为出发日或签证收取日算起!</br>
8.直客部门归属直客业务编制.不参与同业部门业务销售!</br>
9.单项服务每月人头数与年终人头奖励接按0.5计算</br>
10.以上制度公司会因市场变动与业务实际情况採取适当因应或调整,敬请注意!!</br>
11.5月1日起小包团、落地团 需结团完结后，方参与提成定档</br>
10.5月1日起小包团、落地团 需结团完结后，方参与提成定档</br>
11.单团或小包团若产生亏损.销售与操作皆无奖励与提成</br>
12.单团或小包团无额外收入奖励.所有收入都计入单团核算.如客人取消增收(机票或团费等).也需与团队共同核算.核算后按公司业绩制度执行/br>
13.以上制度公司会因市场变动与业务实际情况採取适当因应或调整,敬请注意!!</br>
</div>
<div style="padding: 10px 0 0 0;color: #E95252;line-height: 30px;width: 50%;white-space: wrap;">
<p style="font-weight: bold;">关于提成发放流程的补充通知：</p>
......
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