Skip to content

S
SuperMan
Commit 7733a71b authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents a68ab417 4cfa3967
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 56 deletions
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 7733a71b
......@@ -75,6 +75,9 @@
margin-right: 10px;
position: relative;
}
.TC_Content .avatar-uploader-icon{
height: auto;
}
</style>
<template>
<div class="TC_Content">
......
src/components/newTravelmanager/TravelBasic/BasicComponent/TravelFlightList.vue
View file @ 7733a71b
......@@ -328,7 +328,6 @@
res.data.data.forEach(x => {
this.priceFlightList.push(x);
});
console.log(res, 'flight');
this.headCallBack();
}
} else {
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue
View file @ 7733a71b
......@@ -546,41 +546,6 @@
</el-select>
</div>
<div class="TPright clearfix">
<!--<el-popover popper-class="_TravelPriceDetails" trigger="click">-->
<!--<div>-->
<!--&lt;!&ndash;<table width="100%" border="0" cellspacing="0" cellpadding="0">&ndash;&gt;-->
<!--&lt;!&ndash;<tr>&ndash;&gt;-->
<!--&lt;!&ndash;<td class="_color_666">选择</td>&ndash;&gt;-->
<!--&lt;!&ndash;<td class="_color_666">航班号</td>&ndash;&gt;-->
<!--&lt;!&ndash;<td class="_color_666">航空公司</td>&ndash;&gt;-->
<!--&lt;!&ndash;<td class="_color_666">航段</td>&ndash;&gt;-->
<!--&lt;!&ndash;<td class="_color_666">时间</td>&ndash;&gt;-->
<!--&lt;!&ndash;<td class="_color_666">PNR</td>&ndash;&gt;-->
<!--&lt;!&ndash;<td class="_color_666">使用数量/剩余数量</td>&ndash;&gt;-->
<!--&lt;!&ndash;<td class="_color_666">绑定机位数</td>&ndash;&gt;-->
<!--&lt;!&ndash;</tr>&ndash;&gt;-->
<!--&lt;!&ndash;<tr v-for="fitem in selectFilghtList">&ndash;&gt;-->
<!--&lt;!&ndash;<td>&ndash;&gt;-->
<!--&lt;!&ndash;<el-checkbox v-model="fitem.IsSelected===true" @change="getSelect(fitem)"></el-checkbox>&ndash;&gt;-->
<!--&lt;!&ndash;</td>&ndash;&gt;-->
<!--&lt;!&ndash;<td>{{fitem.FlightNumber}}</td>&ndash;&gt;-->
<!--&lt;!&ndash;<td>{{fitem.AlName}}</td>&ndash;&gt;-->
<!--&lt;!&ndash;<td>{{fitem.DepartureName}}-{{fitem.ArrivalCityName}}</td>&ndash;&gt;-->
<!--&lt;!&ndash;<td>{{fitem.FlightDate}} {{fitem.Departure_time}}</td>&ndash;&gt;-->
<!--&lt;!&ndash;<td>{{fitem.PNR}}</td>&ndash;&gt;-->
<!--&lt;!&ndash;<td>{{fitem.UseAmount}} / {{fitem.RemainNum}}</td>&ndash;&gt;-->
<!--&lt;!&ndash;<td>&ndash;&gt;-->
<!--&lt;!&ndash;<el-input class="w80" placeholder="机位数" @keyup.native="getFlightBindNum(fitem)"&ndash;&gt;-->
<!--&lt;!&ndash;v-model="fitem.BindNum"></el-input>&ndash;&gt;-->
<!--&lt;!&ndash;</td>&ndash;&gt;-->
<!--&lt;!&ndash;</tr>&ndash;&gt;-->
<!--&lt;!&ndash;</table>&ndash;&gt;-->
<!--</div>-->
<!--<div slot="reference" class="SimulateDrop-box">-->
<!--<span class="SD_flight" v-for="item in FinfoList">{{item.name}} {{item.date}}</span>-->
<!--<i class="iconfont icon-arrow-down SimulaDrop"></i>-->
<!--</div>-->
<!--</el-popover>-->
<el-form-item prop="ClearOrderHour" v-if="!flagWangYue">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.ClearOrderHour"
@keyup.native="checkInteger(priceData,'ClearOrderHour')"
......@@ -912,9 +877,6 @@
)
};
}
// if (this.modifyTcid > 0) {
// this.returnPriceList = [];
// }
this.returnPriceList.push(objItem);
this.initDatePickerCheched();
this.returnPriceList.sort(
......@@ -998,19 +960,19 @@
if(TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic[0].ArrivalType!==1) return;
if(TrafficList.TrafficList[0].SubTraffic[0].ArrivalCityId===0) return;
if(TrafficList.TrafficList[0].SubTraffic[0].StartCityId===0) return;
msg.FstartcityId = TrafficList.TrafficList[0].SubTraffic[0].ArrivalCityId;
msg.FendcityId = TrafficList.TrafficList[0].SubTraffic[0].StartCityId;
msg.FstartcityId = TrafficList.TrafficList[0].SubTraffic[0].StartCityId;
msg.FendcityId = TrafficList.TrafficList[0].SubTraffic[0].ArrivalCityId;
if(TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic.length>=2){
let list = TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic[TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic.length-1];
if(list.ArrivalCityId===0) return;
if(list.StartCityId===0) return;
msg.EstartcityId = list.ArrivalCityId;
msg.EendcityId = list.StartCityId;
msg.EstartcityId = list.StartCityId;
msg.EendcityId = list.ArrivalCityId;
}else {
if(TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic[0].ArrivalCityId===0) return;
if(TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic[0].StartCityId===0) return;
msg.EstartcityId = TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic[0].ArrivalCityId;
msg.EendcityId = TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic[0].StartCityId;
msg.EstartcityId = TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic[0].StartCityId;
msg.EendcityId = TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic[0].ArrivalCityId;
}
let storageMsg = localStorage.queryFlightAirMsg?JSON.parse(localStorage.queryFlightAirMsg):null;
......@@ -1031,10 +993,6 @@
},
// 获取飞机票2
queryFlightAirList(msg) {
// msg.FstartcityId = 944;
// msg.FendcityId = 316;
// msg.EstartcityId = 944;
// msg.EendcityId = 316;
this.apipost("AirTicket_get_GetTicketList",msg,res=>{
if(res.data.resultCode===1){
this.queryFlightAirListData = res.data.data;
......
src/components/newTravelmanager/TravelGroupControl/TravelPriceFlightList.vue
View file @ 7733a71b
......@@ -275,7 +275,6 @@
res => {
if (res.data.resultCode == 1) {
if (res.data.data != null) {
console.log('res.data.data', res.data.data)
res.data.data.forEach(x => {
x['IsShowTime'] = false
this.priceFlightList.push(x)
......@@ -338,10 +337,8 @@
departureTime: item.DepartureTime,
arriveTime: item.ArrivalTime,
}
console.log('msg', msg)
this.apipost('travel_post_ModifyAirticketFlightTimeById', msg, res => {
if (res.data.resultCode == 1) {
} else {
this.Warning(res.data.message)
}
......
src/components/newTravelmanager/travelLineTrip/travelDaysTrip.vue
View file @ 7733a71b
......@@ -542,15 +542,11 @@
this.dayObj.ScenicArray.forEach(x=>{
// x.ScenicJson = (typeof(x.ScenicJsonStr) === 'string' ? x.ScenicJsonStr : { x:0, y:0 })
let obj = JSON.parse(x.ScenicJsonStr)
if (obj) {
console.log("obj1",obj.y)
x.ScenicJson = obj
} else {
console.log("obj2",obj)
x.ScenicJson = { x:0, y:0 }
}
console.log('222', x.ScenicJson)
})
this.initScenicData();
},
......
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