Commit b5697367 authored by 黄奎's avatar 黄奎

页面修改

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