Skip to content

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

单据 提成详情跳转优化

parent d852e1d4
Hide whitespace changes
Inline Side-by-side
Showing with 143 additions and 189 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ aa750e66
...@@ -420,8 +420,8 @@ ...@@ -420,8 +420,8 @@
<p class="illustrate-left">附加说明：<span class="fr" v-if="GetDetail.ComplainID > 0" <p class="illustrate-left">附加说明：<span class="fr" v-if="GetDetail.ComplainID > 0"
@click="goUrl('ComplaintsDetail', GetDetail.ComplainID,GetDetail.OrderID)"> <span style="color:#000">投诉单号：</span> @click="goUrl('ComplaintsDetail', GetDetail.ComplainID,GetDetail.OrderID)"> <span style="color:#000">投诉单号：</span>
<span class="cursorpointer text-decoration">{{GetDetail.ComplainID}}</span></span> <span class="cursorpointer text-decoration">{{GetDetail.ComplainID}}</span></span>
<!-- (GetDetail.TemplateId==28 || GetDetail.TemplateId==30) && GetDetail.OtherType!=63 && <!--
GetDetail.OtherType!=64 --> GetDetail.OtherType!=64
<span v-if="GetDetail.OtherType==48" <span v-if="GetDetail.OtherType==48"
@click="GoOPurl('OPsalesCommissiondetails',GetDetail)" style="cursor: pointer;float: right;color: #000;font-size: 14px; @click="GoOPurl('OPsalesCommissiondetails',GetDetail)" style="cursor: pointer;float: right;color: #000;font-size: 14px;
text-decoration: underline;"> text-decoration: underline;">
...@@ -430,7 +430,6 @@ ...@@ -430,7 +430,6 @@
v-if="GetDetail.OtherType==43" v-if="GetDetail.OtherType==43"
@click="GoOPurl('domesticCommissiondetails',GetDetail)" @click="GoOPurl('domesticCommissiondetails',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.TemplateId==29 || GetDetail.TemplateId==31) && OPState && GetDetail.OtherType!=63 && GetDetail.OtherType!=64 -->
<span v-if="GetDetail.OtherType==73" <span v-if="GetDetail.OtherType==73"
@click="GoOPurl('OpComPersonDetails',GetDetail)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;"> @click="GoOPurl('OpComPersonDetails',GetDetail)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">
出境提成详情</span> 出境提成详情</span>
...@@ -438,6 +437,18 @@ ...@@ -438,6 +437,18 @@
v-if="GetDetail.OtherType==72" v-if="GetDetail.OtherType==72"
@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>
<span v-if="GetDetail.OtherType==70"
@click="GoOPurl(GetDetail.ReFinanceId2 == 1?'domesticCommissiondetailsTW':'domesticCommissionUserTW',GetDetail)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">
台湾提成详情</span>
-->
<!-- 排除机票单号、票务提成、单项订单 -->
<span v-if="GetDetail.OtherType!=55 && GetDetail.OtherType!=56 && GetDetail.OtherType!=57
&& GetDetail.OtherType!=61 && GetDetail.OtherType!=62 && GetDetail.OtherType!=66
&& GetDetail.OtherType!=67 && GetDetail.OtherType!=68"
@click="GoRoyaltyUrl(GetDetail)"
style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">
提成详情
</span>
<span v-if="CostTypeState" @click="GourlCostType('VisitRecord',1)" style="margin:0 10px;cursor: pointer;float: right; <span v-if="CostTypeState" @click="GourlCostType('VisitRecord',1)" style="margin:0 10px;cursor: pointer;float: right;
color: #000;font-size: 14px;text-decoration: underline;"> color: #000;font-size: 14px;text-decoration: underline;">
拜访记录</span> 拜访记录</span>
...@@ -454,12 +465,11 @@ ...@@ -454,12 +465,11 @@
</p> </p>
<div class="illustrate-right" v-if="GetDetail.OtherType=='55'" <div class="illustrate-right" v-if="GetDetail.OtherType=='55'"
@click="clickAirTicketOrder"> @click="clickAirTicketOrder">机票单号：{{GetDetail.ReFinanceId}}</div>
机票单号：{{GetDetail.ReFinanceId}}
</div>
<div v-if="GetDetail.OtherType==56||GetDetail.OtherType==57" <div v-if="GetDetail.OtherType==56||GetDetail.OtherType==57"
class="illustrate-right fygsbumen-box-right" class="illustrate-right fygsbumen-box-right"
@click="ImpressionTicketDetails('ImpressionTicketUserDetails')">{{GetDetail.OtherType==56?'票务提成详情':'票务工资详情'}}</div> @click="ImpressionTicketDetails('ImpressionTicketUserDetails')">
{{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('singleProductHotelOrderOP')">{{'单项酒店订单:'+GetDetail.ReFinanceId}}</div> @click="ImpressionSingleDetails('singleProductHotelOrderOP')">{{'单项酒店订单:'+GetDetail.ReFinanceId}}</div>
...@@ -468,10 +478,10 @@ ...@@ -468,10 +478,10 @@
<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('CharterOrderListOP')">{{'单项车订单:'+GetDetail.ReFinanceId}}</div> @click="ImpressionSingleDetails('CharterOrderListOP')">{{'单项车订单:'+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"
@click="ImpressionSingleCommissionDetails('ServiceCommissiondetails',2)">{{'单项OP提成详情'}}</div> @click="ImpressionSingleCommissionDetails('ServiceCommissiondetails',2)">{{'单项OP提成详情'}}</div> -->
</div> </div>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-if="GetDetail.TCIDAndTCNUMList.length>0"> <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-if="GetDetail.TCIDAndTCNUMList.length>0">
<tr v-for="(o,ox) in GetDetail.TCIDAndTCNUMList" class="_fujiashuoming_tr"> <tr v-for="(o,ox) in GetDetail.TCIDAndTCNUMList" class="_fujiashuoming_tr">
...@@ -2001,106 +2011,70 @@ export default { ...@@ -2001,106 +2011,70 @@ export default {
this.$router.push({ this.$router.push({
name: path, name: path,
query: obj query: obj
}); });;
// this.$router.push({ },
// name: 'OpComPersonDetails', // 提成明细详情
// query: { GoRoyaltyUrl(GetDetail) {
// EmployeeId:GetDetail.AccountEmployeeId, let obj = {
// PeriodsId:GetDetail.OPPeriodsId, PeriodId: GetDetail.ReFinanceId,
// RB_Branch_Id:GetDetail.RB_Branch_Id, RB_Branch_Id: null,
OutBranchId: String(GetDetail.RB_Branch_Id),
// blank: "y", blank: "y",
// tab: "op提成明细" tab: "",
// } Type: null,
// }); }
}, let path = ''
Gourl(GetDetail){ if (GetDetail.OtherType == 43) { //9月9号新增 如果是43 就跳转到国内的详情 反之按之前的来用
if(GetDetail.OtherType==43){//9月9号新增 如果是43 就跳转到国内的详情 反之按之前的来用 obj.tab = "国内提成详情"
this.$router.push({ path = 'domesticCommissiondetails'
name: 'domesticCommissiondetails', }else if(GetDetail.OtherType==48){
query: { obj.tab = "国内OP提成详情"
PeriodId:GetDetail.ReFinanceId, path = 'OPsalesCommissiondetails'
blank: "y", } else if (GetDetail.OtherType == 63 || GetDetail.OtherType == 64) {//单项提成详情
tab: "国内销售提成详情" obj.tab = GetDetail.OtherType == 63?"单项提成详情":"单项OP提成详情"
} path = 'ServiceCommissiondetails'
}); obj.Type = GetDetail.OtherType == 63?1:2
}else if(GetDetail.OtherType==69){//跳转台湾提成的三级详情 }else if (GetDetail.OtherType == 69) { //跳转台湾提成的三级详情 老版本
this.$router.push({ obj.tab = "台湾提成详情"
name: 'domesticCommissiondetailsTW', path = 'domesticCommissiondetailsTW'
query: { }else if (GetDetail.OtherType == 70) { //跳转台湾提成的三级详情 新版本
PeriodId:GetDetail.ReFinanceId, obj.tab = "台湾销售提成详情"
OutBranchId: GetDetail.RB_Branch_Id, path = 'domesticCommissiondetailsTW'
blank: "y", // if (GetDetail.ReFinanceId2 == 1) {
tab: "台湾销售提成详情" // urlName = 'domesticCommissiondetailsTW'
} // }
}); // if (GetDetail.ReFinanceId2 == 2) {
}else if(GetDetail.OtherType==48){ // urlName = 'domesticCommissionUserTW'
this.$router.push({ // }
name: 'OPsalesCommissiondetails', } else if (GetDetail.OtherType == 72) {//出境提成详情
query: { obj.tab = "出境提成详情"
id: id, path = 'TradeTicketDetails'
blank: "y" obj.RB_Branch_Id = String(GetDetail.RB_Branch_Id)
} obj.OutBranchId = null
}); } else if (GetDetail.OtherType == 73) {//OP提成详情
}else if(GetDetail.OtherType==73){ obj.tab = "出境OP提成详情"
this.$router.push({ path = 'OpComPersonDetails'
name: 'OpComPersonDetails', }else {
query: { this.$router.push({
id: id, name: 'CommissionDetail',
blank: "y" query: {
} periods: GetDetail.Periods,
}); companyID: GetDetail.RB_Branch_Id,
}else if(GetDetail.OtherType==70){//跳转台湾提成的三级详情 blank: "y",
let urlName tab: "提成详情"
if(GetDetail.ReFinanceId2==1){
urlName = 'domesticCommissiondetailsTW'
}
if(GetDetail.ReFinanceId2==2){
urlName = 'domesticCommissionUserTW'
}
this.$router.push({
name: urlName,
query: {
PeriodId:GetDetail.ReFinanceId,
OutBranchId: GetDetail.RB_Branch_Id,
blank: "y",
tab: "台湾销售提成详情"
}
});
} else if (GetDetail.OtherType == 72) {//同业提成详情
this.$router.push({
name: 'TradeTicketDetails',
query: {
PeriodId: GetDetail.ReFinanceId,
RB_Branch_Id: GetDetail.RB_Branch_Id,
blank: "y",
tab: "同业提成详情"
}
});
} else if (GetDetail.OtherType == 73) {//OP提成详情
this.$router.push({
name: 'OpComPersonDetails',
query: {
PeriodId: GetDetail.ReFinanceId,
OutBranchId: GetDetail.RB_Branch_Id,
blank: "y",
tab: "同业提成明细"
}
});
} else{
this.$router.push({
name: 'CommissionDetail',
query: {
periods:GetDetail.Periods,
companyID:GetDetail.RB_Branch_Id,
blank: "y",
tab: "提成详情"
}
});
} }
});
}
if(path){
this.$router.push({
name: path,
query: obj
});
}
},
// 单选计算 },
// 单选计算
checkdIteam(item){ checkdIteam(item){
if (item.checked) { if (item.checked) {
if (item.HangingAccountsTypeStr === '收') { if (item.HangingAccountsTypeStr === '收') {
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ aa750e66
...@@ -844,8 +844,8 @@ ...@@ -844,8 +844,8 @@
@click="goassets(GetDetail.ReFinanceId,GetDetail.OtherType)"> 电商出库单:{{GetDetail.ReFinanceId}}</span> @click="goassets(GetDetail.ReFinanceId,GetDetail.OtherType)"> 电商出库单:{{GetDetail.ReFinanceId}}</span>
<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>
<!-- (GetDetail.TemplateId==28 || GetDetail.TemplateId==30) && GetDetail.OtherType!=63 && GetDetail.OtherType!=64 -->
<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>
...@@ -853,7 +853,6 @@ ...@@ -853,7 +853,6 @@
v-if="GetDetail.OtherType==43" v-if="GetDetail.OtherType==43"
@click="GoOPurl('domesticCommissiondetails',GetDetail)" @click="GoOPurl('domesticCommissiondetails',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.TemplateId==29 || GetDetail.TemplateId==31) && OPState && GetDetail.OtherType!=63 && GetDetail.OtherType!=64 -->
<span <span
v-if="GetDetail.OtherType==73" v-if="GetDetail.OtherType==73"
@click="GoOPurl('OpComPersonDetails',GetDetail)" @click="GoOPurl('OpComPersonDetails',GetDetail)"
...@@ -862,7 +861,16 @@ ...@@ -862,7 +861,16 @@
v-if="GetDetail.OtherType==72" v-if="GetDetail.OtherType==72"
@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>
<span v-if="CostTypeState" @click="GourlCostType('VisitRecord',1)" -->
<!-- 排除机票订单、票务提成、单项订单 -->
<span v-if="GetDetail.OtherType!=55 && GetDetail.OtherType!=56 && GetDetail.OtherType!=57
&& GetDetail.OtherType!=61 && GetDetail.OtherType!=62 && GetDetail.OtherType!=66
&& GetDetail.OtherType!=67 && GetDetail.OtherType!=68"
@click="GoRoyaltyUrl(GetDetail)"
style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">
提成详情
</span>
<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>
...@@ -896,10 +904,11 @@ ...@@ -896,10 +904,11 @@
<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('CharterOrderListOP')">{{'单项车订单:'+GetDetail.ReFinanceId}}</div> @click="ImpressionSingleDetails('CharterOrderListOP')">{{'单项车订单:'+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"
@click="ImpressionSingleCommissionDetails('ServiceCommissiondetails',2)">{{'单项OP提成详情'}}</div> @click="ImpressionSingleCommissionDetails('ServiceCommissiondetails',2)">{{'单项OP提成详情'}}</div> -->
</div> </div>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%"
...@@ -1792,83 +1801,48 @@ ...@@ -1792,83 +1801,48 @@
query: obj query: obj
}); });
}, },
Gourl(GetDetail) { // 提成明细详情
if (GetDetail.OtherType == 43) { //9月9号新增 如果是43 就跳转到国内的详情 反之按之前的来用 GoRoyaltyUrl(GetDetail) {
this.$router.push({ let obj = {
name: 'domesticCommissiondetails', PeriodId: GetDetail.ReFinanceId,
query: { RB_Branch_Id: null,
PeriodId: GetDetail.ReFinanceId, OutBranchId: String(GetDetail.RB_Branch_Id),
blank: "y", blank: "y",
tab: "国内销售提成详情" tab: "",
} Type: null,
}); }
} else if (GetDetail.OtherType == 69) { //跳转台湾提成的三级详情 let path = ''
this.$router.push({ if (GetDetail.OtherType == 43) { //9月9号新增 如果是43 就跳转到国内的详情 反之按之前的来用
name: 'domesticCommissiondetailsTW', obj.tab = "国内提成详情"
query: { path = 'domesticCommissiondetails'
PeriodId: GetDetail.ReFinanceId, }else if(GetDetail.OtherType==48){
OutBranchId: GetDetail.RB_Branch_Id, obj.tab = "国内OP提成详情"
blank: "y", path = 'OPsalesCommissiondetails'
tab: "台湾销售提成详情" } else if (GetDetail.OtherType == 63 || GetDetail.OtherType == 64) {//单项提成详情
} obj.tab = GetDetail.OtherType == 63?"单项提成详情":"单项OP提成详情"
}); path = 'ServiceCommissiondetails'
}else if(GetDetail.OtherType==48){ obj.Type = GetDetail.OtherType == 63?1:2
this.$router.push({ }else if (GetDetail.OtherType == 69) { //跳转台湾提成的三级详情 老版本
name: 'OPsalesCommissiondetails', obj.tab = "台湾提成详情"
query: { path = 'domesticCommissiondetailsTW'
PeriodId: GetDetail.ReFinanceId, }else if (GetDetail.OtherType == 70) { //跳转台湾提成的三级详情 新版本
OutBranchId: GetDetail.RB_Branch_Id, obj.tab = "台湾销售提成详情"
blank: "y" path = 'domesticCommissiondetailsTW'
} // if (GetDetail.ReFinanceId2 == 1) {
}); // urlName = 'domesticCommissiondetailsTW'
}else if(GetDetail.OtherType==73){ // }
this.$router.push({ // if (GetDetail.ReFinanceId2 == 2) {
name: 'OpComPersonDetails', // urlName = 'domesticCommissionUserTW'
query: { // }
PeriodId: GetDetail.ReFinanceId, } else if (GetDetail.OtherType == 72) {//出境提成详情
OutBranchId: GetDetail.RB_Branch_Id, obj.tab = "出境提成详情"
blank: "y" path = 'TradeTicketDetails'
} obj.RB_Branch_Id = String(GetDetail.RB_Branch_Id)
}); obj.OutBranchId = null
} else if (GetDetail.OtherType == 70) { //跳转台湾提成的三级详情
let urlName
if (GetDetail.ReFinanceId2 == 1) {
urlName = 'domesticCommissiondetailsTW'
}
if (GetDetail.ReFinanceId2 == 2) {
urlName = 'domesticCommissionUserTW'
}
this.$router.push({
name: urlName,
query: {
PeriodId: GetDetail.ReFinanceId,
OutBranchId: GetDetail.RB_Branch_Id,
blank: "y",
tab: "台湾销售提成详情"
}
});
} else if (GetDetail.OtherType == 72) {//同业提成详情
this.$router.push({
name: 'TradeTicketDetails',
query: {
PeriodId: GetDetail.ReFinanceId,
// OutBranchId: GetDetail.RB_Branch_Id,
RB_Branch_Id: GetDetail.RB_Branch_Id,
blank: "y",
tab: "同业提成详情"
}
});
} else if (GetDetail.OtherType == 73) {//OP提成详情 } else if (GetDetail.OtherType == 73) {//OP提成详情
this.$router.push({ obj.tab = "出境OP提成详情"
name: 'OpComPersonDetails', path = 'OpComPersonDetails'
query: { }else {
PeriodId: GetDetail.ReFinanceId,
OutBranchId: GetDetail.RB_Branch_Id,
blank: "y",
tab: "同业提成明细"
}
});
} else {
this.$router.push({ this.$router.push({
name: 'CommissionDetail', name: 'CommissionDetail',
query: { query: {
...@@ -1879,6 +1853,12 @@ ...@@ -1879,6 +1853,12 @@
} }
}); });
} }
if(path){
this.$router.push({
name: path,
query: obj
});
}
}, },
......
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