Commit b5697367 authored by 黄奎's avatar 黄奎

页面修改

parent 5146404e
......@@ -2933,8 +2933,12 @@
if (sItem && sItem.id) {
cid = sItem.id;
}
var path = "TravelContractNew";
if (item.lineId == 14) {
//path = "TravelContractNewRB";
}
let routeData = this.$router.resolve({
name: item.lineId!=14?"TravelContractNew":"TravelContractNewRB",
name: path,
query: {
TCID: item.tcid,
guestId: sItem.guestId,
......
......@@ -5578,8 +5578,12 @@
},
//跳转至领取合同
goContract(item, sItem) {
var path = "TravelContractNew";
if (item.lineId == 14) {
//path = "TravelContractNewRB";
}
let routeData = this.$router.resolve({
name: item.lineId!=14?"TravelContractNew":"TravelContractNewRB",
name: path,
query: {
TCID: item.tcid,
guestId: sItem.guestId,
......
......@@ -2276,8 +2276,12 @@
},
//跳转至领取合同
goContract(item, sItem) {
var path = "TravelContractNew";
if (item.lineId == 14) {
//path = "TravelContractNewRB";
}
let routeData = this.$router.resolve({
name: item.lineId!=14?"TravelContractNew":"TravelContractNewRB",
name: path,
query: {
TCID: item.tcid,
guestId: sItem.guestId,
......
......@@ -2699,7 +2699,9 @@
</div>
<template v-if="childItem.OrderUnionFlightList&&childItem.OrderUnionFlightList.length>0">
<template v-for="(uItem,uIndex) in childItem.OrderUnionFlightList">
<div v-if="(uItem.FlightName&&uItem.FlightName.ID)||(uItem.BackFlightName&&uItem.BackFlightName.ID)" :key="uIndex">
<div
v-if="(uItem.FlightName&&uItem.FlightName.ID)||(uItem.BackFlightName&&uItem.BackFlightName.ID)"
:key="uIndex">
联运信息:<span style="color: red">已配联运{{uItem.ConfigNum}}人,{{uItem.AirticketUnionNotes}}
<span v-if="uItem.IsSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span
v-else>【暂定】</span>
......@@ -6350,28 +6352,22 @@
},
//跳转至领取合同
goContract(item, sItem) {
// if (item.ContractNum) {
// let routeData = this.$router.resolve({
// name: 'TravelContractDetail',
// query: {
// TCID: item.TCID,
// orderID: item.OrderId,
// blank: 'y'
// }
// })
// window.open(routeData.href, '_blank')
// } else {
let routeData = this.$router.resolve({
name: item.lineId!=14?"TravelContractNew":"TravelContractNewRB",
query: {
TCID: item.TCID,
guestId: sItem.GuestId,
orderID: item.OrderId,
blank: "y",
},
});
window.open(routeData.href, "_blank");
// }
if (item.ContractNum) {
var path = "TravelContractDetail";
if (item.lineId == 14) {
//path = "TravelContractDetail";
}
let routeData = this.$router.resolve({
name: path,
query: {
TCID: item.TCID,
orderID: item.OrderId,
blank: 'y'
}
})
window.open(routeData.href, '_blank')
}
},
Discount(TCID) {
this.SpecialOffer = true;
......
......@@ -445,7 +445,7 @@
</template>
<template v-else>
<!--v-if="item.isGuestOk == '1' && item.outNotice == 1"-->
<div @click="toTrip(item)">
<div @click="toTrip(item)">
{{ $t("Operation.Op_teamNotice")
}}<span v-if="item.outNotice == 1">(OK)</span><span v-else>({{ $t("visa.v_zanding") }})</span>
</div>
......@@ -640,9 +640,9 @@
</template>
</p>
</div>
<div v-if="item.unionRemark" style="color: red">
<span>联运备注:{{ item.unionRemark }}</span>
</div>
<div v-if="item.unionRemark" style="color: red">
<span>联运备注:{{ item.unionRemark }}</span>
</div>
</div>
<div style="
float: right;
......@@ -2236,8 +2236,12 @@
},
//跳转至领取合同
goContract(item, sItem) {
var path = "TravelContractNew";
if (item.lineId == 14) {
//path = "TravelContractNewRB";
}
let routeData = this.$router.resolve({
name: item.lineId!=14?"TravelContractNew":"TravelContractNewRB",
name: path,
query: {
TCID: item.tcid,
guestId: sItem.guestId,
......@@ -2381,4 +2385,5 @@
this.canEditUnitPrice();
},
}
</script>
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