Skip to content

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

no message

parent dc6cee95
Hide whitespace changes
Inline Side-by-side
Showing with 161 additions and 6 deletions
src/components/FinancialModule/OpComPersonDetails.vue
View file @ 480a52a7
......@@ -3,7 +3,7 @@
</style>
<template>
<div class="flexOne currentManage">
<div class="query-box">
<div class="query-box" v-if="!isSearch">
<ul>
<li>
<span>
......@@ -109,6 +109,7 @@
export default {
data() {
return {
isSearch: false,
msg:{
pageIndex:1,
pageSize:14,
......@@ -132,6 +133,8 @@
this.msg.EmployeeId=this.$route.query.EmployeeId?Number(this.$route.query.EmployeeId):this.msg.EmployeeId;
this.msg.RB_Branch_Id=this.$route.query.RB_Branch_Id?Number(this.$route.query.RB_Branch_Id):this.msg.RB_Branch_Id;
this.msg.TrPerIods=this.$route.query.TrPerIods?Number(this.$route.query.TrPerIods):this.msg.TrPerIods;
this.msg.TCNUM = this.$route.query.TCNUM?this.$route.query.TCNUM:true
this.isSearch = this.$route.query.isSearch?this.$route.query.isSearch:false
},
mounted(){
this.getCompany();
......
src/components/FinancialModule/ServiceCommission/ServiceCommissiondetails.vue
View file @ 480a52a7
......@@ -27,7 +27,7 @@
</style>
<template>
<div class="flexOne domesticCommissiondetails">
<div style="min-height: 70px;">
<div style="min-height: 70px;" v-if="!isSearch">
<ul class="opUl">
<li>
<em>期数</em>
......@@ -164,6 +164,7 @@
export default {
data() {
return {
isSearch: false,
Month: moment().format("YYYY-MM"),
msg: {
pageIndex: 1,
......@@ -211,6 +212,9 @@
if (this.$route.query.Type) {
this.msg.Type = this.$route.query.Type
}
this.msg.TCNUM = this.$route.query.TCNUM?this.$route.query.TCNUM:""
this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):-1
this.isSearch = this.$route.query.isSearch?this.$route.query.isSearch:false
}
if (ActionMenuCode.indexOf('home_CommissionSeeAll') != -1) { //是否有看所有人的权限
this.disabled = false;
......
src/components/FinancialModule/domestic/OPsalesCommissiondetails.vue
View file @ 480a52a7
......@@ -27,7 +27,7 @@
</style>
<template>
<div class="flexOne domesticCommissiondetails">
<div style="min-height: 70px;">
<div style="min-height: 70px;" v-if="!isSearch">
<ul class="opUl">
<li>
<em>期数</em>
......@@ -161,6 +161,7 @@
export default {
data() {
return {
isSearch: false,
Month: moment().format("YYYY-MM"),
msg: {
pageIndex: 1,
......@@ -211,6 +212,7 @@
if(this.$route.query.OutBranchId){
this.msg.OutBranchId = Number(this.$route.query.OutBranchId)
}
this.isSearch = this.$route.query.isSearch?this.$route.query.isSearch:false
}
if (ActionMenuCode.indexOf('home_CommissionSeeAll') != -1) { //是否有看所有人的权限
this.disabled = false;
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 480a52a7
......@@ -406,7 +406,11 @@
</li>
</ul>
</div>
<div class="hotelProductManage2_tableBox" style="margin-bottom:20px;" v-if="isCommissionDetails">
<span style="color:#000000;background-color: #ff99cc;padding:2px 4px;border-radius:5px">单项</span>
<span style="color:#000000;background-color: #bcd6ee;padding:2px 4px;border-radius:5px">国内</span>
<span style="color:#000000;background-color: #DDDDDD;padding:2px 4px;border-radius:5px">出境</span>
</div>
<div class="TravelTclList" v-loading="queryCommonData.loading">
<ul>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
......@@ -464,6 +468,16 @@
<span class="TC_xiajia" v-if="item.TCState==2">{{$t('visa.v_yxiajia')}}</span>
<span class="TC_xiajia quxiao" v-if="item.TCState==4">{{$t('hotel.hotel_HasBeenCancelled')}}</span>
</div>
<div class="TC_TravelSalePlat clearfix" style="cursor: pointer;"
v-if="item.Royalty">
<div style="color: red;">{{item.Royalty?item.Royalty.Periods:''}} 期</div>
<span v-for="x in item.Royalty.List"
@click="goRoyaltyUrl(item,item.Royalty,x)"
class="TC_neibu"
:style="{'background-color':x.Type==1?'#ff99cc':x.Type==2?'#bcd6ee':'#DDDDDD','color':'#000000','margin-top':'3px'}">
{{x.UserName}}<span>¥{{x.CommissionMoney}}</span>
</span>
</div>
<div class="TC_TravelSalePlat clearfix">
<div class="TC_CarNum" v-if="item.IsUseCompanyBus==1&&item.BusPriceId">车牌号
<span
......@@ -1183,6 +1197,7 @@
},
data() {
return {
isCommissionDetails: false,//团控提成详情权限
QSendCommissionStateList:[
{Name:'不限',ID: 0},
{Name:'已发放',ID: 1},
......@@ -1429,6 +1444,31 @@
},
},
methods: {
// 查看团详情
goRoyaltyUrl(row,Royalty,item){
let name
let obj = {
isSearch: true,
}
if(Royalty.Type==3){
name = 'OpComPersonDetails'
obj.EmployeeId = item.UserId
obj.TCNUM = row.TCNUM
}else if(Royalty.Type==2){
name = 'OPsalesCommissiondetails'
obj.UserId = item.UserId
obj.TCNUM = row.TCNUM
}else{
name = 'ServiceCommissiondetails'
obj.UserId = item.UserId
obj.TCNUM = row.TCNUM
obj.Type = 1
}
this.$router.push({
name: name,
query: obj
})
},
//获取团队类型
getTeamList() {
this.apipost("travel_get_GetTravelPriceTeamTypeList", {}, res => {
......@@ -1698,11 +1738,38 @@
});
}
});
if(!this.isCommissionDetails) return
this.getDetailsOfRoyalty()
}
},
err => {}
);
},
getDetailsOfRoyalty(){
let Ids = this.queryCommonData.dataList.map(x=> {return x.TCID})
let msg = [...new Set(Ids)]
this.apipost(
"commission_get_GetTravelOPCommissionList",
{
TCIDStr: msg.join(',')
},
res => {
if (res.data.resultCode == 1) {
let RoyaltyList = []
RoyaltyList = res.data.data
this.queryCommonData.dataList.forEach(x=>{
RoyaltyList.forEach(y=>{
if(x.TCID==y.TCID){
x.Royalty = y
}
})
})
this.$forceUpdate()
console.log( this.queryCommonData.dataList[0].Royalty,'------')
}
}
)
},
//验证大小
checkTeamNum(queryMsg) {
var TeamMinNum = parseInt(queryMsg.TeamMinNum);
......@@ -2524,9 +2591,17 @@
}
},
created() {
let userinfo = this.getLocalStorage();
//默认显示联运
this.queryMsg.IsShowUnion = -1;
let userInfo = this.getLocalStorage();
// 团提成权限
let ActionMenuCode = userinfo.ActionMenuCode;
if (ActionMenuCode.indexOf("isCommissionDetails") != -1) {
this.isCommissionDetails = true;
}
this.CurrentUserInfo = userInfo;
if (this.$route.query.TCID) {
this.queryMsg.TCID = this.$route.query.TCID;
......
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ 480a52a7
......@@ -368,7 +368,11 @@
</li>
</ul>
</div>
<div class="hotelProductManage2_tableBox" style="margin-bottom:20px;" v-if="isCommissionDetails">
<span style="color:#000000;background-color: #ff99cc;padding:2px 4px;border-radius:5px">单项</span>
<span style="color:#000000;background-color: #bcd6ee;padding:2px 4px;border-radius:5px">国内</span>
<span style="color:#000000;background-color: #DDDDDD;padding:2px 4px;border-radius:5px">出境</span>
</div>
<div class="TravelTclList" v-loading="queryCommonData.loading">
<ul>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
......@@ -415,6 +419,16 @@
<span class="TC_xiajia" v-if="item.TCState==2">{{$t('visa.v_yxiajia')}}</span>
<span class="TC_xiajia quxiao" v-if="item.TCState==4">{{$t('hotel.hotel_HasBeenCancelled')}}</span>
</div>
<div class="TC_TravelSalePlat clearfix" style="cursor: pointer;"
v-if="item.Royalty">
<div style="color: red;">{{item.Royalty?item.Royalty.Periods:''}} 期</div>
<span v-for="x in item.Royalty.List"
@click="goRoyaltyUrl(item,item.Royalty,x)"
class="TC_neibu"
:style="{'background-color':x.Type==1?'#ff99cc':x.Type==2?'#bcd6ee':'#DDDDDD','color':'#000000','margin-top':'3px'}">
{{x.UserName}}<span>¥{{x.CommissionMoney}}</span>
</span>
</div>
</div>
</div>
<div class="el-col" style="width:220px;">
......@@ -761,6 +775,7 @@
export default {
data() {
return {
isCommissionDetails: false,//团控提成详情权限
QSendCommissionStateList:[
{Name:'不限',ID: 0},
{Name:'已发放',ID: 1},
......@@ -921,6 +936,31 @@
}
},
methods: {
// 查看团详情
goRoyaltyUrl(row,Royalty,item){
let name
let obj = {
isSearch: true,
}
if(Royalty.Type==3){
name = 'OpComPersonDetails'
obj.EmployeeId = item.UserId
obj.TCNUM = row.TCNUM
}else if(Royalty.Type==2){
name = 'OPsalesCommissiondetails'
obj.UserId = item.UserId
obj.TCNUM = row.TCNUM
}else{
name = 'ServiceCommissiondetails'
obj.UserId = item.UserId
obj.TCNUM = row.TCNUM
obj.Type = 1
}
this.$router.push({
name: name,
query: obj
})
},
downloadFile: function (item) {
let reg = /^http(s)?:\/\/(.*?)\//
this.downloadFileRename(item.FullUrl.replace(reg, ''), item.Name)
......@@ -1056,12 +1096,38 @@
})
}
})
if(!this.isCommissionDetails) return
this.getDetailsOfRoyalty()
}
},
err => {}
)
},
getDetailsOfRoyalty(){
let Ids = this.queryCommonData.dataList.map(x=> {return x.TCID})
let msg = [...new Set(Ids)]
this.apipost(
"commission_get_GetTravelOPCommissionList",
{
TCIDStr: msg.join(',')
},
res => {
if (res.data.resultCode == 1) {
let RoyaltyList = []
RoyaltyList = res.data.data
this.queryCommonData.dataList.forEach(x=>{
RoyaltyList.forEach(y=>{
if(x.TCID==y.TCID){
x.Royalty = y
}
})
})
this.$forceUpdate()
}
}
)
},
//验证大小
checkTeamNum(queryMsg) {
var TeamMinNum = parseInt(queryMsg.TeamMinNum)
......@@ -1631,6 +1697,11 @@
//默认显示联运
this.queryMsg.IsShowUnion = 0;
let userInfo = this.getLocalStorage()
// 团提成权限
let ActionMenuCode = userInfo.ActionMenuCode;
if (ActionMenuCode.indexOf("isCommissionDetails") != -1) {
this.isCommissionDetails = true;
}
this.CurrentUserInfo = userInfo
this.$route.query.tcmun = this.$route.query.tcmun
......
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