Commit 68734119 authored by 黄奎's avatar 黄奎

页面修改

parent 40fd5224
...@@ -324,17 +324,11 @@ ...@@ -324,17 +324,11 @@
<span style="display: flex;align-items: center;flex-wrap: wrap;"> <span style="display: flex;align-items: center;flex-wrap: wrap;">
<el-select class="w180 multiple_input" v-model="queryMsg.QSendCommissionState"> <el-select class="w180 multiple_input" v-model="queryMsg.QSendCommissionState">
<el-option v-for="item in QSendCommissionStateList" :label="item.Name" :value="item.ID" <el-option v-for="item in QSendCommissionStateList" :label="item.Name" :value="item.ID"
:key="item.LineID"></el-option> :key="item.LineID"></el-option>
</el-select> </el-select>
<a style="margin-left: 5px;margin-right: 5px;">只看审核驳回</a> <a style="margin-left: 5px;margin-right: 5px;">只看审核驳回</a>
<el-switch <el-switch v-model="queryMsg.QOutGroupAuditReject" active-text="" inactive-text=""
v-model="queryMsg.QOutGroupAuditReject" active-color="#409eff" inactive-color="#dcdfe6" active-value="1" inactive-value="0" />
active-text=""
inactive-text=""
active-color="#409eff"
inactive-color="#dcdfe6"
active-value="1"
inactive-value="0"/>
<div style="margin-top: 10px;margin-left: 10px;font-size: 11px;" v-if="isCommissionDetails"> <div style="margin-top: 10px;margin-left: 10px;font-size: 11px;" v-if="isCommissionDetails">
<span style="color:#000000;background-color: #ff99cc;padding:0px 2px;border-radius:5px">单项</span> <span style="color:#000000;background-color: #ff99cc;padding:0px 2px;border-radius:5px">单项</span>
<span style="color:#000000;background-color: #bcd6ee;padding:0px 4px;border-radius:5px">国内</span> <span style="color:#000000;background-color: #bcd6ee;padding:0px 4px;border-radius:5px">国内</span>
...@@ -467,15 +461,16 @@ ...@@ -467,15 +461,16 @@
<span class="TC_xiajia" v-if="item.TCState==2">{{$t('visa.v_yxiajia')}}</span> <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> <span class="TC_xiajia quxiao" v-if="item.TCState==4">{{$t('hotel.hotel_HasBeenCancelled')}}</span>
</div> </div>
<div class="TC_TravelSalePlat clearfix" <div class="TC_TravelSalePlat clearfix" v-if="item.Royalty"
v-if="item.Royalty" style="display: flex;flex-wrap: wrap;align-items: baseline;"> style="display: flex;flex-wrap: wrap;align-items: baseline;">
<span class="TC_neibu" style="color: red;font-size: 11px;line-height: 25px;">{{item.Royalty?item.Royalty.Periods:''}} 期</span> <span class="TC_neibu"
<span style="cursor: pointer;" v-for="x in item.Royalty.List" style="color: red;font-size: 11px;line-height: 25px;">{{item.Royalty?item.Royalty.Periods:''}}
@click="goRoyaltyUrl(item,item.Royalty,x)" </span>
class="TC_neibu" <span style="cursor: pointer;" v-for="x in item.Royalty.List"
@click="goRoyaltyUrl(item,item.Royalty,x)" class="TC_neibu"
:style="{'background-color':item.Royalty.Type==1?'#ff99cc':item.Royalty.Type==2?'#bcd6ee':'#DDDDDD','color':'#000000','margin-top':'3px'}"> :style="{'background-color':item.Royalty.Type==1?'#ff99cc':item.Royalty.Type==2?'#bcd6ee':'#DDDDDD','color':'#000000','margin-top':'3px'}">
{{x.UserName}}<span>¥{{x.CommissionMoney}}</span> {{x.UserName}}<span>¥{{x.CommissionMoney}}</span>
</span> </span>
</div> </div>
<div class="TC_TravelSalePlat clearfix"> <div class="TC_TravelSalePlat clearfix">
<div class="TC_CarNum" v-if="item.IsUseCompanyBus==1&&item.BusPriceId">车牌号 <div class="TC_CarNum" v-if="item.IsUseCompanyBus==1&&item.BusPriceId">车牌号
...@@ -483,7 +478,8 @@ ...@@ -483,7 +478,8 @@
style="display:inline-block;margin:0 5px;position:relative;top:-3px;">.</span>{{item.BusNumber}} style="display:inline-block;margin:0 5px;position:relative;top:-3px;">.</span>{{item.BusNumber}}
</div> </div>
</div> </div>
<div v-if="item.CustomerName&&item.CustomerName!=''" class="TC_TravelSalePlat clearfix" style="font-size: 11px;font-weight:bold;color:red"> <div v-if="item.CustomerName&&item.CustomerName!=''" class="TC_TravelSalePlat clearfix"
style="font-size: 11px;font-weight:bold;color:red">
<span v-if="item.CustomerName">客户名称:{{item.CustomerName}} <span v-if="item.CustomerName">客户名称:{{item.CustomerName}}
</span> </span>
<span v-if="item.OfferPayTypeStr">({{item.OfferPayTypeStr}}) <span v-if="item.OfferPayTypeStr">({{item.OfferPayTypeStr}})
...@@ -590,8 +586,13 @@ ...@@ -590,8 +586,13 @@
<p class="travelnowrap" v-if="item.PriceOfferUrl"> <p class="travelnowrap" v-if="item.PriceOfferUrl">
<span>报价单</span> <span>报价单</span>
<span class="go_date"> <span class="go_date">
<a style="margin-left:20px;color:blue;" :href="item.PriceOfferUrl" v-if="item.PriceOfferUrl" <template v-for="(subItem,subIndex) in item.OfferUrlExtArray">
target="_blank">下载报价单</a> <a :key="subIndex" style="margin-left:20px;color:blue;cursor:pointer" :href="subItem.Url"
v-if="subItem.Url" target="_blank" :download="subItem.Name">{{subItem.Name}}</a>
<template v-if="item.OfferUrlExtArray.length>1 && subIndex<item.OfferUrlExtArray.length">
<br :key="subIndex+1000" />
</template>
</template>
</span> </span>
</p> </p>
<p class="travelnowrap"> <p class="travelnowrap">
...@@ -601,8 +602,8 @@ ...@@ -601,8 +602,8 @@
<p class="travelnowrap"> <p class="travelnowrap">
<span>{{$t('scen.sc_cp')}}</span> <span>{{$t('scen.sc_cp')}}</span>
{{item.OutBranchName}} {{item.OutBranchName}}
<span class="TC_neibu" style="float: inherit;margin-left: 5px;color: #ffffff;" v-if="item.StandardCurrencyName" <span class="TC_neibu" style="float: inherit;margin-left: 5px;color: #ffffff;"
:class="{'TCneibu':item.StandardCurrencyName=='人民币','TCb2b':item.StandardCurrencyName=='日元', v-if="item.StandardCurrencyName" :class="{'TCneibu':item.StandardCurrencyName=='人民币','TCb2b':item.StandardCurrencyName=='日元',
'TCb2c':item.StandardCurrencyName=='新台币','AppPlat':item.StandardCurrencyName=='', 'TCb2c':item.StandardCurrencyName=='新台币','AppPlat':item.StandardCurrencyName=='',
'otherPlat':item.StandardCurrencyName=='',}">{{item.StandardCurrencyName}}结算</span> 'otherPlat':item.StandardCurrencyName=='',}">{{item.StandardCurrencyName}}结算</span>
</p> </p>
...@@ -1082,10 +1083,11 @@ ...@@ -1082,10 +1083,11 @@
</div> </div>
</div> </div>
</div> </div>
<div class="TC_remarkContent" v-if="item.OPRemark||item.OPInnerRemark||item.DmcRemarkLast||item.OutGroupAuditRemark"> <div class="TC_remarkContent"
v-if="item.OPRemark||item.OPInnerRemark||item.DmcRemarkLast||item.OutGroupAuditRemark">
<div class="clearfix TCL-redType" v-if="item.OutGroupAuditState==3&&item.OutGroupAuditRemark"> <div class="clearfix TCL-redType" v-if="item.OutGroupAuditState==3&&item.OutGroupAuditRemark">
<div class="TCL_remarkTitle">驳回缘由:</div> <div class="TCL_remarkTitle">驳回缘由:</div>
<div class="TCL_Content">{{item.OutGroupAuditRemark}} {{item.OutGroupAuditDate}}</div> <div class="TCL_Content">{{item.OutGroupAuditRemark}} {{item.OutGroupAuditDate}}</div>
</div> </div>
<div class="clearfix TCL-redType" v-if="item.OPRemark"> <div class="clearfix TCL-redType" v-if="item.OPRemark">
<div class="TCL_remarkTitle">{{$t('Operation.Op_duiwaiRemark')}}:</div> <div class="TCL_remarkTitle">{{$t('Operation.Op_duiwaiRemark')}}:</div>
...@@ -1202,11 +1204,19 @@ ...@@ -1202,11 +1204,19 @@
}, },
data() { data() {
return { return {
isCommissionDetails: false,//团控提成详情权限 isCommissionDetails: false, //团控提成详情权限
QSendCommissionStateList:[ QSendCommissionStateList: [{
{Name:'不限',ID: 0}, Name: '不限',
{Name:'已发放',ID: 1}, ID: 0
{Name:'未发放',ID: 2}, },
{
Name: '已发放',
ID: 1
},
{
Name: '未发放',
ID: 2
},
], ],
TeamShouZhi: false, //团队收支明细权限 TeamShouZhi: false, //团队收支明细权限
OutHotel: false, //酒店下架权限 OutHotel: false, //酒店下架权限
...@@ -1287,8 +1297,8 @@ ...@@ -1287,8 +1297,8 @@
}, },
//查询参数 //查询参数
queryMsg: { queryMsg: {
QOutGroupAuditReject: 0,//只查看审核驳回 1 QOutGroupAuditReject: 0, //只查看审核驳回 1
QSendCommissionState: 0,//提成状态 0不限, 1已发放, 2未发放 QSendCommissionState: 0, //提成状态 0不限, 1已发放, 2未发放
//出团公司集合 //出团公司集合
OutBranchIds: [], OutBranchIds: [],
pageIndex: 1, pageIndex: 1,
...@@ -1450,21 +1460,21 @@ ...@@ -1450,21 +1460,21 @@
}, },
methods: { methods: {
// 查看团详情 // 查看团详情
goRoyaltyUrl(row,Royalty,item){ goRoyaltyUrl(row, Royalty, item) {
let name let name
let obj = { let obj = {
isSearch: true, isSearch: true,
blank: "y" blank: "y"
} }
if(Royalty.Type==3){ if (Royalty.Type == 3) {
name = 'OpComPersonDetails' name = 'OpComPersonDetails'
obj.EmployeeId = item.UserId obj.EmployeeId = item.UserId
obj.TCNUM = row.TCNUM obj.TCNUM = row.TCNUM
}else if(Royalty.Type==2){ } else if (Royalty.Type == 2) {
name = 'OPsalesCommissiondetails' name = 'OPsalesCommissiondetails'
obj.UserId = item.UserId obj.UserId = item.UserId
obj.TCNUM = row.TCNUM obj.TCNUM = row.TCNUM
}else{ } else {
name = 'ServiceCommissiondetails' name = 'ServiceCommissiondetails'
obj.UserId = item.UserId obj.UserId = item.UserId
obj.TCNUM = row.TCNUM obj.TCNUM = row.TCNUM
...@@ -1586,8 +1596,8 @@ ...@@ -1586,8 +1596,8 @@
let reg = /^http(s)?:\/\/(.*?)\//; let reg = /^http(s)?:\/\/(.*?)\//;
this.downloadFileRename(item.FullUrl.replace(reg, ""), item.Name); this.downloadFileRename(item.FullUrl.replace(reg, ""), item.Name);
}, },
goOPCommissionInfo(tcid,item) { goOPCommissionInfo(tcid, item) {
if(item.TravelEndAudit==1){ if (item.TravelEndAudit == 1) {
this.$router.push({ this.$router.push({
path: "OPsalesCommissiondetails", path: "OPsalesCommissiondetails",
query: { query: {
...@@ -1595,7 +1605,7 @@ ...@@ -1595,7 +1605,7 @@
blank: "y" blank: "y"
} }
}); });
}else{ } else {
this.$router.push({ this.$router.push({
path: "OpComPersonDetails", path: "OpComPersonDetails",
query: { query: {
...@@ -1604,7 +1614,7 @@ ...@@ -1604,7 +1614,7 @@
} }
}); });
} }
}, },
//翻页 //翻页
handleCurrentChange(val) { handleCurrentChange(val) {
...@@ -1744,28 +1754,29 @@ ...@@ -1744,28 +1754,29 @@
}); });
} }
}); });
if(!this.isCommissionDetails) return if (!this.isCommissionDetails) return
this.getDetailsOfRoyalty() this.getDetailsOfRoyalty()
} }
}, },
err => {} err => {}
); );
}, },
getDetailsOfRoyalty(){ getDetailsOfRoyalty() {
let Ids = this.queryCommonData.dataList.map(x=> {return x.TCID}) let Ids = this.queryCommonData.dataList.map(x => {
return x.TCID
})
let msg = [...new Set(Ids)] let msg = [...new Set(Ids)]
this.apipost( this.apipost(
"commission_get_GetTravelOPCommissionList", "commission_get_GetTravelOPCommissionList", {
{
TCIDStr: msg.join(',') TCIDStr: msg.join(',')
}, },
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let RoyaltyList = [] let RoyaltyList = []
RoyaltyList = res.data.data RoyaltyList = res.data.data
this.queryCommonData.dataList.forEach(x=>{ this.queryCommonData.dataList.forEach(x => {
RoyaltyList.forEach(y=>{ RoyaltyList.forEach(y => {
if(x.TCID==y.TCID){ if (x.TCID == y.TCID) {
x.Royalty = y x.Royalty = y
} }
}) })
...@@ -2597,7 +2608,7 @@ ...@@ -2597,7 +2608,7 @@
}, },
created() { created() {
let userinfo = this.getLocalStorage(); let userinfo = this.getLocalStorage();
//默认显示联运 //默认显示联运
this.queryMsg.IsShowUnion = -1; this.queryMsg.IsShowUnion = -1;
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
......
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