Skip to content

S
SuperMan
Commit db7a64b7 authored by 黄奎's avatar 黄奎
Browse files
Options

页面调整

parent 4c782c60
Show whitespace changes
Inline Side-by-side
Showing with 174 additions and 126 deletions
src/components/Hotel/roomReservationsDetails.vue
View file @ db7a64b7
......@@ -1186,9 +1186,6 @@
},
// 获取供应商
initSupplier() {
// supplier_post_GetAllList
// Type: 1,
// Country: 651
this.apipost("travel_get_GetAllHotelList", {
Type: 1,
Country: 651,
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ db7a64b7
......@@ -1901,7 +1901,6 @@
this.msg,
res => {
this.loading = false;
console.log("dmcstatistics_post_GetGroupLeaderUserMoneyPlan", res.data);
if (res.data.resultCode == 1) {
let data = res.data.data
let arrList = function (arr) {
......
src/components/SalesModule/groupTourOrder.vue
View file @ db7a64b7
......@@ -2241,6 +2241,10 @@
<div :key="uIndex+20000">
{{uItem.guestNames}} 航班信息：
<span v-if="uItem.isSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span v-else>【暂定】</span>
<a v-if="uItem.ticketUnionId&&uItem.ticketUnionId>0" @click="toTrip(item,uItem.ticketUnionId)"
style="cursor:pointer;text-decoration:underline;color:green;">
{{ $t("Operation.Op_teamNotice") }}({{ item.outNotice == 1 ? "OK" : "暂定"}})
</a>
<br />
<template v-for="(sfItem,sfIndex) in uItem.guestFlightList">
<span style="color:blue;" :key="sfIndex+30000">
......@@ -2488,6 +2492,7 @@
configId: 0,
cityId: 0,
orderId: 0,
unionfid: 0,//订单旅客联运编号(rb_airticket_union表Id)
},
userId: "",
customerId: "",
......@@ -3145,11 +3150,14 @@
);
}
},
toTrip: function (obj) {
toTrip: function (obj, TicketUnionId) {
this.tripObj.tcid = obj.tcid;
this.tripObj.configId = obj.configId;
this.tripObj.orderId = obj.orderId;
this.tripObj.cityId = obj.startCityId;
if (TicketUnionId) {
this.tripObj.unionfid = TicketUnionId;
}
this.travelControlTripLayerShow = true;
},
hideTripDown() {
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ db7a64b7
......@@ -2445,6 +2445,10 @@
{{uItem.guestNames}} 航班信息：
<span v-if="uItem.isSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span
v-else>【暂定】</span>
<a v-if="uItem.ticketUnionId&&uItem.ticketUnionId>0" @click="toTrip(item,uItem.ticketUnionId)"
style="cursor:pointer;text-decoration:underline;color:green;">
{{ $t("Operation.Op_teamNotice") }}({{ item.outNotice == 1 ? "OK" : "暂定"}})
</a>
<br />
<template v-for="(sfItem,sfIndex) in uItem.guestFlightList">
<span style="color:blue;" :key="sfIndex+180000">
......@@ -3258,6 +3262,7 @@
configId: 0,
cityId: 0,
orderId: 0,
unionfid: 0, //订单旅客联运编号(rb_airticket_union表Id)
},
userId: "",
customerId: "",
......@@ -4037,11 +4042,14 @@
);
}
},
toTrip: function (obj) {
toTrip: function (obj, TicketUnionId) {
this.tripObj.tcid = obj.tcid;
this.tripObj.configId = obj.configId;
this.tripObj.orderId = obj.orderId;
this.tripObj.cityId = obj.startCityId;
if (TicketUnionId) {
this.tripObj.unionfid = TicketUnionId;
}
this.travelControlTripLayerShow = true;
},
hideTripDown() {
......
src/components/TravelContractNewRB.vue
View file @ db7a64b7
......@@ -1082,7 +1082,6 @@
methods: {
//一排上移、下移
MoveTicket(index, type) {
console.log("this.CtObj.ticketList", this.CtObj.ticketList);
if (this.CtObj.ticketList && this.CtObj.ticketList.length > 0) {
var tempData = this.CtObj.ticketList[index];
//上移
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ db7a64b7
......@@ -1988,7 +1988,7 @@
<td class="fz12">
<span :class="{ 'RL-redType': item.statsstr == '候补' }">{{item.statsstr}}</span>
</td>
<td>111</td>
<td></td>
<td class="RL-BTNlist" rowspan="2">
<el-button-group v-if="isShow === true">
<el-tooltip class="item" effect="dark" :content="$t('salesModule.UpRemarks')" placement="top-start">
......@@ -2693,38 +2693,19 @@
childItem.UnionRemark
}}</span>
</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">
联运信息：<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>
</span>
<template v-if="uItem.FlightName&&uItem.FlightName.ID">
<br />
<span style="color:blue;">去程:
{{uItem.FlightName.StartDateStr}} {{uItem.FlightName.Flight_number}}
{{uItem.FlightName.DepartureTime}}-{{uItem.FlightName.ArrivalTime}}
{{uItem.FlightName.DName}}-{{uItem.FlightName.AName}}</span>
</template>
<template v-if="uItem.BackFlightName&&uItem.BackFlightName.ID">
<br />
<span style="color:blue;">回程:
{{uItem.BackFlightName.StartDateStr}} {{uItem.BackFlightName.Flight_number}}
{{uItem.BackFlightName.DepartureTime}}-{{uItem.BackFlightName.ArrivalTime}}
{{uItem.BackFlightName.DName}}-{{uItem.BackFlightName.AName}}</span>
</template>
</div>
</template>
</template> -->
<template v-if="childItem.OrderGuestFlightList&&childItem.OrderGuestFlightList.length>0">
<template v-for="(uItem,uIndex) in childItem.OrderGuestFlightList">
<div :key="uIndex+20000">
{{uItem.GuestNames}} 航班信息：
<span v-if="uItem.IsSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span
v-else>【暂定】</span>
<a v-if="uItem.TicketUnionId&&uItem.TicketUnionId>0"
@click="toTrip(childItem,uItem.TicketUnionId)"
style="cursor:pointer;text-decoration:underline;color:green;">
{{ $t("Operation.Op_teamNotice") }}({{
SetNoticeMsg.OutNotice == 1 ? "OK" : "暂定"
}})
</a>
<br />
<template v-for="(sfItem,sfIndex) in uItem.GuestFlightList">
<span style="color:blue;" :key="sfIndex+30000">
......@@ -4006,6 +3987,7 @@
configId: 0,
cityId: 0,
orderId: 0,
unionfid: 0,//订单旅客联运编号(rb_airticket_union表Id)
isopOperation: true,
},
employeeMsg: {
......@@ -5059,11 +5041,14 @@
},
});
},
toTrip: function (obj) {
toTrip: function (obj, TicketUnionId) {
this.tripObj.tcid = obj.TCID;
this.tripObj.configId = obj.ConfigId;
this.tripObj.orderId = obj.OrderId;
this.tripObj.cityId = obj.DepartureCityId;
if (TicketUnionId) {
this.tripObj.unionfid = TicketUnionId;
}
this.travelControlTripLayerShow = true;
},
hideTripDown() {
......@@ -5986,7 +5971,6 @@
"sellorder_get_GetOrderListByTCID",
msg,
(res) => {
console.log("sellorder_get_GetOrderListByTCID", res.data);
this.loading = false;
if (res.data.resultCode == 1) {
this.OrderDataList = res.data.data;
......
src/components/commonPage/TripDownLoadCommon.vue
View file @ db7a64b7
<style>
.TripDownLoadCommon{ height:350px; text-align: center}
.TripDownLoadCommon> label{cursor: pointer;vertical-align: middle;}
.TripDownLoadCommon> label input{vertical-align: middle;}
.TripDownLoadCommon .TripBtn{ color: #fff; width: 90px; height:30px; background:#E95252; border: 1px solid #E95252; cursor: pointer; border-radius: 15px;}
.TripDownLoadCommon input[type="checkbox"] + label::before {
.TripDownLoadCommon {
height: 350px;
text-align: center
}
.TripDownLoadCommon>label {
cursor: pointer;
vertical-align: middle;
}
.TripDownLoadCommon>label input {
vertical-align: middle;
}
.TripDownLoadCommon .TripBtn {
color: #fff;
width: 90px;
height: 30px;
background: #E95252;
border: 1px solid #E95252;
cursor: pointer;
border-radius: 15px;
}
.TripDownLoadCommon input[type="checkbox"]+label::before {
content: "\A0";
display: inline-block;
width: 15px;
......@@ -16,22 +36,27 @@
color: white;
border: 1px solid #e95252;
}
.TripDownLoadCommon input[type="checkbox"]:checked + label::before {
.TripDownLoadCommon input[type="checkbox"]:checked+label::before {
content: "\2713";
background-color: #e95252;
}
.TripDownLoadCommon input[type="checkbox"]{
.TripDownLoadCommon input[type="checkbox"] {
position: absolute;
clip: rect(0, 0, 0, 0);
}
.TripDownLoadCommon input[type="checkbox"]:focus + label::before {
.TripDownLoadCommon input[type="checkbox"]:focus+label::before {
box-shadow: none;
}
.TripDownLoadCommon input[type="checkbox"]:disabled + label::before {
.TripDownLoadCommon input[type="checkbox"]:disabled+label::before {
background-color: gray;
box-shadow: none;
color: #555;
}
</style>
<template>
<div class="TripDownLoadCommon">
......@@ -43,63 +68,88 @@
</tr>
<tbody v-if="downType==1">
<tr height="36">
<td width="50%"><input id="vshowA" v-model="TripLayer.vshowA" type="checkbox" /><label for="vshowA">{{$t('fnc.jcxinxi')}}</label></td>
<td width="50%"><input id="vshowB" v-model="TripLayer.vshowB" type="checkbox" /><label for="vshowB">{{$t('salesModule.FlighInfo')}}</label></td>
<td width="50%"><input id="vshowA" v-model="TripLayer.vshowA" type="checkbox" /><label
for="vshowA">{{$t('fnc.jcxinxi')}}</label></td>
<td width="50%"><input id="vshowB" v-model="TripLayer.vshowB" type="checkbox" /><label
for="vshowB">{{$t('salesModule.FlighInfo')}}</label></td>
</tr>
<tr height="36">
<td><input id="vshowC" v-model="TripLayer.vshowC" type="checkbox" /><label for="vshowC">{{$t('salesModule.TripSpecial')}}</label></td>
<td><input id="vshowD" v-model="TripLayer.vshowD" type="checkbox" /><label for="vshowD">{{$t('salesModule.TripAP')}}</label></td>
<td><input id="vshowC" v-model="TripLayer.vshowC" type="checkbox" /><label
for="vshowC">{{$t('salesModule.TripSpecial')}}</label></td>
<td><input id="vshowD" v-model="TripLayer.vshowD" type="checkbox" /><label
for="vshowD">{{$t('salesModule.TripAP')}}</label></td>
</tr>
<tr height="36">
<td><input id="vshowE" v-model="TripLayer.vshowE" type="checkbox" /><label for="vshowE">{{$t('fnc.fyshuoming')}}</label></td>
<td><input id="vshowF" v-model="TripLayer.vshowF" type="checkbox" /><label for="vshowF">{{$t('salesModule.ShoppDetail')}}</label></td>
<td><input id="vshowE" v-model="TripLayer.vshowE" type="checkbox" /><label
for="vshowE">{{$t('fnc.fyshuoming')}}</label></td>
<td><input id="vshowF" v-model="TripLayer.vshowF" type="checkbox" /><label
for="vshowF">{{$t('salesModule.ShoppDetail')}}</label></td>
</tr>
<tr height="36">
<td><input id="vshowG" v-model="TripLayer.vshowG" type="checkbox" /><label for="vshowG">{{$t('salesModule.OrderKnow')}}</label></td>
<td><input id="vshowH" v-model="TripLayer.vshowH" type="checkbox" /><label for="vshowH">{{$t('salesModule.VisaInfo')}}</label></td>
<td><input id="vshowG" v-model="TripLayer.vshowG" type="checkbox" /><label
for="vshowG">{{$t('salesModule.OrderKnow')}}</label></td>
<td><input id="vshowH" v-model="TripLayer.vshowH" type="checkbox" /><label
for="vshowH">{{$t('salesModule.VisaInfo')}}</label></td>
</tr>
<tr height="36">
<td><input id="vshowI" v-model="TripLayer.vshowI" type="checkbox" /><label for="vshowI">{{$t('salesModule.THBZ')}}</label></td>
<td><input id="vshowJ" v-model="TripLayer.vshowJ" type="checkbox" /><label for="vshowJ">{{$t('salesModule.YXBS')}}</label></td>
<td><input id="vshowI" v-model="TripLayer.vshowI" type="checkbox" /><label
for="vshowI">{{$t('salesModule.THBZ')}}</label></td>
<td><input id="vshowJ" v-model="TripLayer.vshowJ" type="checkbox" /><label
for="vshowJ">{{$t('salesModule.YXBS')}}</label></td>
</tr>
<tr height="36">
<td><input id="vshowK" v-model="TripLayer.vshowK" type="checkbox" /><label for="vshowK">{{$t('salesModule.JDTP')}}</label></td>
<td><input id="vshowK" v-model="TripLayer.vshowK" type="checkbox" /><label
for="vshowK">{{$t('salesModule.JDTP')}}</label></td>
</tr>
</tbody>
<tbody v-if="downType==2">
<tr height="36">
<td width="50%"><input id="vshowA" v-model="TripLayer.vshowA" type="checkbox" /><label for="vshowA">{{$t('fnc.jcxinxi')}}</label></td>
<td width="50%"><input id="vshowL" v-model="TripLayer.vshowL" type="checkbox" /><label for="vshowL">{{$t('salesModule.JHDD')}}</label></td>
<td width="50%"><input id="vshowA" v-model="TripLayer.vshowA" type="checkbox" /><label
for="vshowA">{{$t('fnc.jcxinxi')}}</label></td>
<td width="50%"><input id="vshowL" v-model="TripLayer.vshowL" type="checkbox" /><label
for="vshowL">{{$t('salesModule.JHDD')}}</label></td>
</tr>
<tr height="36">
<td><input id="vshowM" v-model="TripLayer.vshowM" type="checkbox" /><label for="vshowM">{{$t('salesModule.TravelInfo')}}</label></td>
<td><input id="vshowB" v-model="TripLayer.vshowB" type="checkbox" /><label for="vshowB">{{$t('salesModule.FlighInfo')}}</label></td>
<td><input id="vshowM" v-model="TripLayer.vshowM" type="checkbox" /><label
for="vshowM">{{$t('salesModule.TravelInfo')}}</label></td>
<td><input id="vshowB" v-model="TripLayer.vshowB" type="checkbox" /><label
for="vshowB">{{$t('salesModule.FlighInfo')}}</label></td>
</tr>
<tr height="36">
<td><input id="vshowC" v-model="TripLayer.vshowC" type="checkbox" /><label for="vshowC">{{$t('salesModule.TripSpecial')}}</label></td>
<td><input id="vshowD" v-model="TripLayer.vshowD" type="checkbox" /><label for="vshowD">{{$t('salesModule.TripAP')}}</label></td>
<td><input id="vshowC" v-model="TripLayer.vshowC" type="checkbox" /><label
for="vshowC">{{$t('salesModule.TripSpecial')}}</label></td>
<td><input id="vshowD" v-model="TripLayer.vshowD" type="checkbox" /><label
for="vshowD">{{$t('salesModule.TripAP')}}</label></td>
</tr>
<tr height="36">
<td><input id="vshowE" v-model="TripLayer.vshowE" type="checkbox" /><label for="vshowE">{{$t('fnc.fyshuoming')}}</label></td>
<td><input id="vshowF" v-model="TripLayer.vshowF" type="checkbox" /><label for="vshowF">{{$t('salesModule.ShoppDetail')}}</label></td>
<td><input id="vshowE" v-model="TripLayer.vshowE" type="checkbox" /><label
for="vshowE">{{$t('fnc.fyshuoming')}}</label></td>
<td><input id="vshowF" v-model="TripLayer.vshowF" type="checkbox" /><label
for="vshowF">{{$t('salesModule.ShoppDetail')}}</label></td>
</tr>
<tr height="36">
<td><input id="vshowG" v-model="TripLayer.vshowG" type="checkbox" /><label for="vshowG">{{$t('salesModule.OrderKnow')}}</label></td>
<td><input id="vshowH" v-model="TripLayer.vshowH" type="checkbox" /><label for="vshowH">{{$t('salesModule.VisaInfo')}}</label></td>
<td><input id="vshowG" v-model="TripLayer.vshowG" type="checkbox" /><label
for="vshowG">{{$t('salesModule.OrderKnow')}}</label></td>
<td><input id="vshowH" v-model="TripLayer.vshowH" type="checkbox" /><label
for="vshowH">{{$t('salesModule.VisaInfo')}}</label></td>
</tr>
<tr height="36">
<td><input id="vshowI" v-model="TripLayer.vshowI" type="checkbox" /><label for="vshowI">{{$t('salesModule.THBZ')}}</label></td>
<td><input id="vshowJ" v-model="TripLayer.vshowJ" type="checkbox" /><label for="vshowJ">{{$t('salesModule.YXBS')}}</label></td>
<td><input id="vshowI" v-model="TripLayer.vshowI" type="checkbox" /><label
for="vshowI">{{$t('salesModule.THBZ')}}</label></td>
<td><input id="vshowJ" v-model="TripLayer.vshowJ" type="checkbox" /><label
for="vshowJ">{{$t('salesModule.YXBS')}}</label></td>
</tr>
<tr height="36">
<td><input id="vshowK" v-model="TripLayer.vshowK" type="checkbox" /><label for="vshowK">{{$t('salesModule.JDTP')}}</label></td>
<td><input id="vshowLLR" v-model="TripLayer.vshowLLR" type="checkbox" /><label for="vshowLLR">{{$t('salesModule.EmergencyContact')}}</label></td>
<td><input id="vshowK" v-model="TripLayer.vshowK" type="checkbox" /><label
for="vshowK">{{$t('salesModule.JDTP')}}</label></td>
<td><input id="vshowLLR" v-model="TripLayer.vshowLLR" type="checkbox" /><label
for="vshowLLR">{{$t('salesModule.EmergencyContact')}}</label></td>
</tr>
<tr height="36">
<td style="padding-left:28px;"><input id="vshowO" v-model="TripLayer.vshowO" type="checkbox" /><label for="vshowO">显示视频图片</label></td>
<td style="padding-left:28px;"><input id="vshowO" v-model="TripLayer.vshowO" type="checkbox" /><label
for="vshowO">显示视频图片</label></td>
<td></td>
</tr>
</tbody>
<tr height="66">
<td colspan="2" align="center">
......@@ -108,7 +158,6 @@
</tr>
</table>
</div>
</div>
</template>
<script>
export default {
......@@ -121,13 +170,16 @@
methods: {
goUrlR() {
let obj = this.tripObj;
let routeData = this.$router.resolve({
name: "confirmationOrderDownLoad",
query: {
var unionfid = 0;
if (obj.unionfid) {
unionfid = obj.unionfid;
}
var downMsg = {
configId: obj.configId,
cityId: obj.cityId,
tcid: obj.tcid,
orderId: obj.orderId,
unionfid: unionfid,
vshowA: this.TripLayer.vshowA,
vshowB: this.TripLayer.vshowB,
vshowC: this.TripLayer.vshowC,
......@@ -146,7 +198,10 @@
vshowO: this.TripLayer.vshowO,
vshowTCNUM: true,
isopOperation: obj.isopOperation,
}
};
let routeData = this.$router.resolve({
name: "confirmationOrderDownLoad",
query: downMsg
})
window.open(routeData.href, '_blank');
this.$emit("headCallBack");
......@@ -168,12 +223,11 @@
this.TripLayer.vshowL = true;
this.TripLayer.vshowM = true;
this.TripLayer.vshowLLR = true;
}else{
} else {
this.TripLayer.vshowL = false;
this.TripLayer.vshowM = false;
this.TripLayer.vshowLLR = false;
}
this.TripLayer.vshowO = false;
}
};
......
src/components/orderCommon/edit-orderform.vue
View file @ db7a64b7
......@@ -755,7 +755,6 @@
methods: {
//关闭弹窗
cancelSubmit() {
// console.log("关闭");
this.clearMsg();
//关闭弹窗 调用父页面方法
this.$emit("close");
......
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