Commit 92d74621 authored by 黄奎's avatar 黄奎

页面修改

parent 00790bc3
...@@ -845,7 +845,7 @@ ...@@ -845,7 +845,7 @@
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==17" <span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==17"
@click="lookbreakage(GetDetail.ReFinanceId)"> 报损/报溢单:{{GetDetail.ReFinanceId}}</span> @click="lookbreakage(GetDetail.ReFinanceId)"> 报损/报溢单:{{GetDetail.ReFinanceId}}</span>
<!--<span <!--<span
v-if="GetDetail.OtherType==48" v-if="GetDetail.OtherType==48"
@click="GoOPurl('OPsalesCommissiondetails',GetDetail)" @click="GoOPurl('OPsalesCommissiondetails',GetDetail)"
style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">国内提成详情</span> style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">国内提成详情</span>
...@@ -862,21 +862,22 @@ ...@@ -862,21 +862,22 @@
@click="GoOPurl('TradeTicketDetails',GetDetail)" @click="GoOPurl('TradeTicketDetails',GetDetail)"
style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">出境提成详情</span> style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">出境提成详情</span>
--> -->
<!-- 排除机票单号、票务提成、单项订单、手配费、成本月结 --> <!-- 排除机票单号、票务提成、单项订单、手配费、成本月结 -->
<!-- (GetDetail.OtherType&&GetDetail.OtherType!=55 && GetDetail.OtherType!=56 && GetDetail.OtherType!=57 <!-- (GetDetail.OtherType&&GetDetail.OtherType!=55 && GetDetail.OtherType!=56 && GetDetail.OtherType!=57
&& GetDetail.OtherType!=61 && GetDetail.OtherType!=62 && GetDetail.OtherType!=66 && GetDetail.OtherType!=61 && GetDetail.OtherType!=62 && GetDetail.OtherType!=66
&& GetDetail.OtherType!=67 && GetDetail.OtherType!=68&& GetDetail.OtherType!=71&& GetDetail.OtherType!=74&& GetDetail.OtherType!=75)|| && GetDetail.OtherType!=67 && GetDetail.OtherType!=68&& GetDetail.OtherType!=71&& GetDetail.OtherType!=74&& GetDetail.OtherType!=75)||
((GetDetail.TemplateId==28 || GetDetail.TemplateId==30) && GetDetail.OtherType!=63 && GetDetail.OtherType!=64) --> ((GetDetail.TemplateId==28 || GetDetail.TemplateId==30) && GetDetail.OtherType!=63 && GetDetail.OtherType!=64) -->
<span v-if="(GetDetail.OtherType&&(GetDetail.OtherType==43 || GetDetail.OtherType==48 || GetDetail.OtherType==63 <span
v-if="(GetDetail.OtherType&&(GetDetail.OtherType==43 || GetDetail.OtherType==48 || GetDetail.OtherType==63
|| GetDetail.OtherType==64 || GetDetail.OtherType==69 || GetDetail.OtherType==70 || GetDetail.OtherType==64 || GetDetail.OtherType==69 || GetDetail.OtherType==70
|| GetDetail.OtherType==72 || GetDetail.OtherType==76 || GetDetail.OtherType==73 || GetDetail.OtherType==77 || GetDetail.OtherType==72 || GetDetail.OtherType==76 || GetDetail.OtherType==73 || GetDetail.OtherType==77
|| GetDetail.OtherType==78)) || GetDetail.OtherType==78))
|| ((GetDetail.TemplateId==28 || GetDetail.TemplateId==30) && GetDetail.OtherType!=63 && GetDetail.OtherType!=64)" || ((GetDetail.TemplateId==28 || GetDetail.TemplateId==30) && GetDetail.OtherType!=63 && GetDetail.OtherType!=64)"
@click="GoRoyaltyUrl(GetDetail)" @click="GoRoyaltyUrl(GetDetail)"
style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;"> style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">
提成详情 提成详情
</span> </span>
<span v-if="CostTypeState" @click="GourlCostType('VisitRecord',1)" <span v-if="CostTypeState" @click="GourlCostType('VisitRecord',1)"
style="margin:0 10px;cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">拜访记录</span> style="margin:0 10px;cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">拜访记录</span>
<span v-if="CostTypeState" @click="GourlCostType('yingyanMap',2)" <span v-if="CostTypeState" @click="GourlCostType('yingyanMap',2)"
style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">鹰眼轨迹</span> style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">鹰眼轨迹</span>
...@@ -907,11 +908,14 @@ ...@@ -907,11 +908,14 @@
{{GetDetail.OtherType==56?'票务提成详情':'票务工资详情'}}</div> {{GetDetail.OtherType==56?'票务提成详情':'票务工资详情'}}</div>
<div v-if="GetDetail.OtherType==61||GetDetail.OtherType==62" class="illustrate-right fygsbumen-box-right" <div v-if="GetDetail.OtherType==61||GetDetail.OtherType==62" class="illustrate-right fygsbumen-box-right"
@click="ImpressionSingleDetails(isOrderOP?'singleProductHotelOrderOP':'singleProductHotelOrder')">{{'单项酒店订单:'+GetDetail.ReFinanceId}}</div> @click="ImpressionSingleDetails(isOrderOP?'singleProductHotelOrderOP':'singleProductHotelOrder')">
{{'单项酒店订单:'+GetDetail.ReFinanceId}}</div>
<div v-if="GetDetail.OtherType==66" class="illustrate-right fygsbumen-box-right" <div v-if="GetDetail.OtherType==66" class="illustrate-right fygsbumen-box-right"
@click="ImpressionSingleDetails(isOrderOP?'SingleticketOrderListOP':'SingleticketOrderList')">{{'单项门票订单:'+GetDetail.ReFinanceId}}</div> @click="ImpressionSingleDetails(isOrderOP?'SingleticketOrderListOP':'SingleticketOrderList')">
{{'单项门票订单:'+GetDetail.ReFinanceId}}</div>
<div v-if="GetDetail.OtherType==67||GetDetail.OtherType==68" class="illustrate-right fygsbumen-box-right" <div v-if="GetDetail.OtherType==67||GetDetail.OtherType==68" class="illustrate-right fygsbumen-box-right"
@click="ImpressionSingleDetails(isOrderOP?'CharterOrderListOP':'CharterOrderList')">{{'单项车订单:'+GetDetail.ReFinanceId}}</div> @click="ImpressionSingleDetails(isOrderOP?'CharterOrderListOP':'CharterOrderList')">
{{'单项车订单:'+GetDetail.ReFinanceId}}</div>
<!-- <div v-if="GetDetail.OtherType==63" class="illustrate-right fygsbumen-box-right" <!-- <div v-if="GetDetail.OtherType==63" class="illustrate-right fygsbumen-box-right"
@click="ImpressionSingleCommissionDetails('ServiceCommissiondetails',1)">{{'单项销售提成详情'}}</div> @click="ImpressionSingleCommissionDetails('ServiceCommissiondetails',1)">{{'单项销售提成详情'}}</div>
<div v-if="GetDetail.OtherType==64" class="illustrate-right fygsbumen-box-right" <div v-if="GetDetail.OtherType==64" class="illustrate-right fygsbumen-box-right"
...@@ -939,8 +943,11 @@ ...@@ -939,8 +943,11 @@
<span v-if="GetDetail.IsShowDiJieChargeUrl==1" style="margin-left:10px;cursor:pointer;" <span v-if="GetDetail.IsShowDiJieChargeUrl==1" style="margin-left:10px;cursor:pointer;"
@click="jumpHotelContract('HotelContract',o)">手配费详情</span> @click="jumpHotelContract('HotelContract',o)">手配费详情</span>
</td> </td>
<td @click="getQuotation(o)" v-if="!GetDetail.OrderID&&o.Config_OfferId>0"> <td v-if="!GetDetail.OrderID&&o.Config_OfferId>0">
<span class="_jump_page _font_bold">查看报价单</span> </td> <span class="_jump_page _font_bold" @click="getQuotation(o)">查看报价单</span>
&nbsp;&nbsp;
<a v-if="o.PriceOfferUrl&&o.PriceOfferUrl!=''" :href="o.PriceOfferUrl">附件</a>
</td>
<td @click="gotoTravelList(o)"> <span class="_jump_page _font_bold">查看团队</span> </td> <td @click="gotoTravelList(o)"> <span class="_jump_page _font_bold">查看团队</span> </td>
<td @click="jumpPage('RegistrationList',o.TCID,7)"> <span class="_jump_page _font_bold">查看报名</span> </td> <td @click="jumpPage('RegistrationList',o.TCID,7)"> <span class="_jump_page _font_bold">查看报名</span> </td>
<td v-if="qjGroupId==userInfo.RB_Group_id || TeamShouZhi" <td v-if="qjGroupId==userInfo.RB_Group_id || TeamShouZhi"
...@@ -950,7 +957,8 @@ ...@@ -950,7 +957,8 @@
class="_jump_page _font_bold">国内票务</span> </td> class="_jump_page _font_bold">国内票务</span> </td>
<!-- <td v-else-if="OrderSource==10&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,3)"> <!-- <td v-else-if="OrderSource==10&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,3)">
<span class="_jump_page _font_bold">签证收支</span></td> --> <span class="_jump_page _font_bold">签证收支</span></td> -->
<td v-if="GetDetail.OrderSource==10&&o.TCNUM&&o.TCID" @click="jumpPage('VisaFinancialDocuments',o.TCID,3,o.TCNUM)"> <td v-if="GetDetail.OrderSource==10&&o.TCNUM&&o.TCID"
@click="jumpPage('VisaFinancialDocuments',o.TCID,3,o.TCNUM)">
<span class="_jump_page _font_bold">签证收支</span></td> <span class="_jump_page _font_bold">签证收支</span></td>
<td v-if="GetDetail.OrderID&&OrderSource==10">签证订单:<span <td v-if="GetDetail.OrderID&&OrderSource==10">签证订单:<span
@click="jumpPage(isOrderOP?'VisaProductEditOrderQZ':'VisaProductEditOrder',GetDetail,8,GetDetail.OrderID)" @click="jumpPage(isOrderOP?'VisaProductEditOrderQZ':'VisaProductEditOrder',GetDetail,8,GetDetail.OrderID)"
...@@ -1026,13 +1034,13 @@ ...@@ -1026,13 +1034,13 @@
</el-popover> </el-popover>
</div> </div>
</div> </div>
<!-- 签约客户 --> <!-- 签约客户 -->
<div v-if="GetDetail.SigningCustomerId>0"> <div v-if="GetDetail.SigningCustomerId>0">
<a> <a>
<span style="text-decoration: underline;cursor: pointer;color: #000;font-size: 12px;" <span style="text-decoration: underline;cursor: pointer;color: #000;font-size: 12px;"
@click="goSigningCustomer(GetDetail.SigningCustomerId,GetDetail.SigningCustomerName)"> @click="goSigningCustomer(GetDetail.SigningCustomerId,GetDetail.SigningCustomerName)">
签约客户:{{GetDetail.SigningCustomerName}}</span></a> 签约客户:{{GetDetail.SigningCustomerName}}</span></a>
</div> </div>
</div> </div>
<my-HB-Bill v-if="GetDetail.Is_Merge===1 && ZhiDanRen!==bossID" :ID="FrID" :FrID='FrID' :GetDetail="GetDetail" <my-HB-Bill v-if="GetDetail.Is_Merge===1 && ZhiDanRen!==bossID" :ID="FrID" :FrID='FrID' :GetDetail="GetDetail"
:isPrintPage="false" :width="widthSon" :color="colorSon"></my-HB-Bill> :isPrintPage="false" :width="widthSon" :color="colorSon"></my-HB-Bill>
...@@ -1104,8 +1112,7 @@ ...@@ -1104,8 +1112,7 @@
<div class="shangchuanfujian"><button class="hollowFixedBtn" @click="upLoadFuJian">上传附件</button></div> <div class="shangchuanfujian"><button class="hollowFixedBtn" @click="upLoadFuJian">上传附件</button></div>
</div> </div>
</div> </div>
<div class="_fujian_box" <div class="_fujian_box" v-if="GetDetail.VorcherInos
v-if="GetDetail.VorcherInos
&&GetDetail.VorcherInos.length===0 &&GetDetail.VorcherInos.length===0
&&GetDetail.IsUploadPic===1 &&GetDetail.IsUploadPic===1
&&saveMsg.length===0"> &&saveMsg.length===0">
...@@ -1128,7 +1135,8 @@ ...@@ -1128,7 +1135,8 @@
<!-- 预付款冲抵 电商商品--> <!-- 预付款冲抵 电商商品-->
<czBillModule :FrID='ID' /> <czBillModule :FrID='ID' />
<!-- 预收款抵用 --> <!-- 预收款抵用 -->
<UserCredit v-if="(GetDetail.OtherType==74&&GetDetail.ReFinanceId)||GetDetail.DepositCustomerId" :GetDetail="GetDetail"></UserCredit> <UserCredit v-if="(GetDetail.OtherType==74&&GetDetail.ReFinanceId)||GetDetail.DepositCustomerId"
:GetDetail="GetDetail"></UserCredit>
<!-- 成本月结关联单号 --> <!-- 成本月结关联单号 -->
<CostmonthDetails v-if="GetDetail.OtherType==75||getTemplate(GetDetail)" :GetDetail="GetDetail"> <CostmonthDetails v-if="GetDetail.OtherType==75||getTemplate(GetDetail)" :GetDetail="GetDetail">
</CostmonthDetails> </CostmonthDetails>
...@@ -1487,8 +1495,8 @@ ...@@ -1487,8 +1495,8 @@
export default { export default {
data() { data() {
return { return {
isCostTypeId: false,//地接费(领取)用款计划 isCostTypeId: false, //地接费(领取)用款计划
isOrderOP: false,//是否跳转op订单页面 isOrderOP: false, //是否跳转op订单页面
tableShowHandFee: true, tableShowHandFee: true,
TeamShouZhi: false, TeamShouZhi: false,
F_Disbursement_Schedule: false, F_Disbursement_Schedule: false,
...@@ -1608,16 +1616,16 @@ ...@@ -1608,16 +1616,16 @@
this.huijiShow = true; this.huijiShow = true;
} }
// 判断是否销售 // 判断是否销售
if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1||ActionMenuCode.indexOf('S_CheckAllOrder') != -1) { if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1 || ActionMenuCode.indexOf('S_CheckAllOrder') != -1) {
this.isOrderOP = true this.isOrderOP = true
} }
}, },
methods: { methods: {
getTemplate(GetDetail){ getTemplate(GetDetail) {
let arr = GetDetail.CostMonthTemplate&&GetDetail.CostMonthTemplate.split(',') let arr = GetDetail.CostMonthTemplate && GetDetail.CostMonthTemplate.split(',')
let status = false let status = false
arr&&arr.forEach(x=>{ arr && arr.forEach(x => {
if(x==GetDetail.TemplateId){ if (x == GetDetail.TemplateId) {
status = true status = true
} }
}) })
...@@ -1813,7 +1821,7 @@ ...@@ -1813,7 +1821,7 @@
} }
}); });
}, },
goSigningCustomer(id,name) { goSigningCustomer(id, name) {
this.$router.push({ this.$router.push({
name: 'signedFinanceAll', name: 'signedFinanceAll',
query: { query: {
...@@ -1846,7 +1854,7 @@ ...@@ -1846,7 +1854,7 @@
}, },
GoOPurl(path,GetDetail) { GoOPurl(path, GetDetail) {
let obj = { let obj = {
PeriodId: GetDetail.ReFinanceId, PeriodId: GetDetail.ReFinanceId,
RB_Branch_Id: null, RB_Branch_Id: null,
...@@ -1854,9 +1862,9 @@ ...@@ -1854,9 +1862,9 @@
blank: "y", blank: "y",
tab: "提成明细" tab: "提成明细"
} }
if(GetDetail.OtherType==72){ if (GetDetail.OtherType == 72) {
obj.RB_Branch_Id = String(GetDetail.RB_Branch_Id) obj.RB_Branch_Id = String(GetDetail.RB_Branch_Id)
}else{ } else {
obj.OutBranchId = String(GetDetail.RB_Branch_Id) obj.OutBranchId = String(GetDetail.RB_Branch_Id)
} }
this.$router.push({ this.$router.push({
...@@ -1875,49 +1883,49 @@ ...@@ -1875,49 +1883,49 @@
tab: "", tab: "",
Type: null, Type: null,
} }
let path = '' let path = ''
if (GetDetail.OtherType == 43) { //9月9号新增 如果是43 就跳转到国内的详情 反之按之前的来用 if (GetDetail.OtherType == 43) { //9月9号新增 如果是43 就跳转到国内的详情 反之按之前的来用
obj.tab = "国内提成详情" obj.tab = "国内提成详情"
path = 'domesticCommissiondetails' path = 'domesticCommissiondetails'
}else if(GetDetail.OtherType==48){ } else if (GetDetail.OtherType == 48) {
obj.tab = "国内OP提成详情" obj.tab = "国内OP提成详情"
path = 'OPsalesCommissiondetails' path = 'OPsalesCommissiondetails'
} else if (GetDetail.OtherType == 63 || GetDetail.OtherType == 64) {//单项提成详情 } else if (GetDetail.OtherType == 63 || GetDetail.OtherType == 64) { //单项提成详情
obj.tab = GetDetail.OtherType == 63?"单项提成详情":"单项OP提成详情" obj.tab = GetDetail.OtherType == 63 ? "单项提成详情" : "单项OP提成详情"
path = 'ServiceCommissiondetails' path = 'ServiceCommissiondetails'
obj.Type = GetDetail.OtherType == 63?1:2 obj.Type = GetDetail.OtherType == 63 ? 1 : 2
}else if (GetDetail.OtherType == 69) { //跳转台湾提成的三级详情 老版本 } else if (GetDetail.OtherType == 69) { //跳转台湾提成的三级详情 老版本
obj.tab = "台湾提成详情" obj.tab = "台湾提成详情"
path = 'domesticCommissiondetailsTW'
} else if (GetDetail.OtherType == 70) { //跳转台湾提成的三级详情 新版本
if (GetDetail.ReFinanceId2 == 1) {
obj.tab = "台湾销售提成详情"
path = 'domesticCommissiondetailsTW' path = 'domesticCommissiondetailsTW'
}else if (GetDetail.OtherType == 70) { //跳转台湾提成的三级详情 新版本 } else {
if(GetDetail.ReFinanceId2==1){ obj.tab = "台湾销售地接提成详情"
obj.tab = "台湾销售提成详情" path = 'domesticCommissionUserTW'
path = 'domesticCommissiondetailsTW' }
}else{ // if (GetDetail.ReFinanceId2 == 1) {
obj.tab = "台湾销售地接提成详情" // urlName = 'domesticCommissiondetailsTW'
path = 'domesticCommissionUserTW' // }
} // if (GetDetail.ReFinanceId2 == 2) {
// if (GetDetail.ReFinanceId2 == 1) { // urlName = 'domesticCommissionUserTW'
// urlName = 'domesticCommissiondetailsTW' // }
// } } else if (GetDetail.OtherType == 72 || GetDetail.OtherType == 76) { //出境提成详情
// if (GetDetail.ReFinanceId2 == 2) {
// urlName = 'domesticCommissionUserTW'
// }
} else if (GetDetail.OtherType == 72||GetDetail.OtherType == 76) {//出境提成详情
obj.tab = "出境提成详情" obj.tab = "出境提成详情"
path = GetDetail.OtherType == 72?'TradeTicketDetails':'TradeTicketUserDetails' path = GetDetail.OtherType == 72 ? 'TradeTicketDetails' : 'TradeTicketUserDetails'
obj.RB_Branch_Id = String(GetDetail.RB_Branch_Id) obj.RB_Branch_Id = String(GetDetail.RB_Branch_Id)
obj.OutBranchId = null obj.OutBranchId = null
} else if (GetDetail.OtherType == 73||GetDetail.OtherType == 77) {//OP提成详情 } else if (GetDetail.OtherType == 73 || GetDetail.OtherType == 77) { //OP提成详情
obj.tab = "出境OP提成详情" obj.tab = "出境OP提成详情"
path = GetDetail.OtherType == 73?'OpComPersonDetails':'OPCommissionDetail' path = GetDetail.OtherType == 73 ? 'OpComPersonDetails' : 'OPCommissionDetail'
} else if(GetDetail.OtherType == 78){//票务提成详情 } else if (GetDetail.OtherType == 78) { //票务提成详情
obj.tab = "票务提成详情" obj.tab = "票务提成详情"
obj.Periods = GetDetail.ReFinanceId obj.Periods = GetDetail.ReFinanceId
obj.PeriodId = null, obj.PeriodId = null,
path = 'flightPerformance' path = 'flightPerformance'
} else if((GetDetail.TemplateId==28 || GetDetail.TemplateId==30) } else if ((GetDetail.TemplateId == 28 || GetDetail.TemplateId == 30) &&
&& GetDetail.OtherType!=63 && GetDetail.OtherType!=64){ GetDetail.OtherType != 63 && GetDetail.OtherType != 64) {
this.$router.push({ this.$router.push({
name: 'CommissionDetail', name: 'CommissionDetail',
query: { query: {
...@@ -1928,7 +1936,7 @@ ...@@ -1928,7 +1936,7 @@
} }
}); });
} }
if(path){ if (path) {
this.$router.push({ this.$router.push({
name: path, name: path,
query: obj query: obj
...@@ -2188,14 +2196,14 @@ ...@@ -2188,14 +2196,14 @@
// 查看报价单详情 // 查看报价单详情
getQuotation(item) { getQuotation(item) {
this.$router.push({ this.$router.push({
name: 'QuotationAduit', name: 'QuotationAduit',
query: { query: {
offerid: item.Config_OfferId, offerid: item.Config_OfferId,
Qtype: 1, Qtype: 1,
blank: 'y', blank: 'y',
tab: '报价单查看' tab: '报价单查看'
} }
}) })
}, },
//跳转到团控列表 //跳转到团控列表
gotoTravelList(item) { gotoTravelList(item) {
...@@ -2215,7 +2223,7 @@ ...@@ -2215,7 +2223,7 @@
//包机 //包机
else if (item.TeamType == 4) { else if (item.TeamType == 4) {
path = "/TravelTeam"; path = "/TravelTeam";
}else{ } else {
path = "/TravelControlList"; path = "/TravelControlList";
} }
var params = { var params = {
...@@ -2545,8 +2553,8 @@ ...@@ -2545,8 +2553,8 @@
// if(data.URL){ // if(data.URL){
// this.$router.push({name:}) // this.$router.push({name:})
// } // }
let DetailList = this.GetDetail.DetailList.filter(x=> x.CostTypeId==56) let DetailList = this.GetDetail.DetailList.filter(x => x.CostTypeId == 56)
if(DetailList&&DetailList.length>0){ if (DetailList && DetailList.length > 0) {
this.isCostTypeId = true this.isCostTypeId = true
} }
} }
......
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