Commit 5fb4d896 authored by zhengke's avatar zhengke

修改

parent f4e665ad
......@@ -910,20 +910,20 @@
</tr>
<tr>
<td colspan="5">
旅游线路名称:{{LineName}}&nbsp;&nbsp;&nbsp;&nbsp;行程共计:{{CtObj.dayNum}}{{CtObj.nightNum}}晚(含在途时间)
旅游线路名称:{{CtObj.productName}}&nbsp;&nbsp;&nbsp;&nbsp;行程共计:{{CtObj.dayNum}}{{CtObj.nightNum}}晚(含在途时间)
</td>
</tr>
<tr>
<td colspan="5">
出发时间:{{getDate(CtObj.startDate)}}&nbsp;&nbsp;
出发地点:
&nbsp;&nbsp;目的地:
出发时间:{{getDate(CtObj.startDate)}}&nbsp;&nbsp;&nbsp;&nbsp;
出发地点:{{CtObj.goAirport}}
&nbsp;&nbsp;&nbsp;&nbsp;目的地:{{CtObj.touristDestination}}
</td>
</tr>
<tr>
<td colspan="5">
结束时间:{{getDate(CtObj.returnDate)}}&nbsp;&nbsp;
返回地点:
结束时间:{{getDate(CtObj.returnDate)}}&nbsp;&nbsp;&nbsp;&nbsp;
返回地点:{{CtObj.backAirport}}
</td>
</tr>
<tr>
......@@ -939,7 +939,35 @@
<td>酒店标准</td>
<td>房间标准</td>
</tr>
<tr v-for="(item,index) in tripList">
<tr v-for="(item,index) in tripDays">
<td contenteditable="true">{{getDayAddOne(CtObj.startDate,index)}}</td>
<td contenteditable="true">
<div v-for="subItem in item.dayArray">
<span v-if="subItem.type==2">
{{subItem.childItem.couponsName}}
<span v-if="subItem.childItem.playTimeHour!=null&&subItem.childItem.playTimeHour!=''">{{subItem.childItem.playTimeHour}}小时</span>
<span v-if="subItem.childItem.playTimeMinutes!=null&&subItem.childItem.playTimeMinutes!=''">
<template v-if="subItem.childItem.playTimeHour==null&&subItem.childItem.playTimeHour!=''"></template>
{{subItem.childItem.playTimeMinutes}}分钟)</span>
</span>
<span v-if="subItem.type==7&&(index==0||index==tripDays.length-1)">
{{subItem.childItem.title}}
</span>
</div>
</td>
<td contenteditable="true">
{{item.TrifficType}}
</td>
<td contenteditable="true">
<span v-if="index!=tripList.length-1">旅游酒店</span>
<span v-else></span>
</td>
<td contenteditable="true">
<span v-if="index!=tripList.length-1">双人间</span>
<span v-else></span>
</td>
</tr>
<!-- <tr v-for="(item,index) in tripList">
<td contenteditable="true">{{getDayAddOne(CtObj.startDate,index)}}</td>
<td contenteditable="true">
<div v-for="subItem in item.details">
......@@ -959,7 +987,7 @@
<span v-if="index!=tripList.length-1">双人间</span>
<span v-else>无</span>
</td>
</tr>
</tr> -->
<tr>
<td colspan="5" class="TC_LASTTD" contenteditable="true">
<div>备注:1、在主要景点的游览时间不小于此数的时间,以小时填; 2、交通工具不含景区观光车、索道等; 3、“交通工具”栏中的“标准”按各类别的标准填写。</div>
......@@ -1351,6 +1379,8 @@
LineName:'',
//交通
trifficList:[],
//行程
tripDays:[]
};
},
methods: {
......@@ -1700,6 +1730,7 @@
if (res.data.data.priceList && res.data.data.priceList.length > 0) {
this.startDate = res.data.data.priceList[0].startDate;
}
this.tripDays=res.data.data.dayList;
this.trifficList = res.data.data.trafficList;
this.tripList = res.data.data.dayList;
this.LineName=res.data.data.lineName;
......@@ -2053,36 +2084,24 @@
this.tripList[i].can.breakfirst = "酒店内享用早餐";
}
}
// let str = '';
// this.tripList.forEach((x,index)=>{
// str +=`第${x.dayNum}天 ${x.title}\n`
// x.details.forEach(y=>{
// if(index==this.tripList.length-1){
// str+=`温暖的家\n`
// }else{
// str +=`${y.title}\n`
// }
// })
// str +=`早餐:${x.can.breakfirst}\n午餐:${x.can.lanuch}\n晚餐:${x.can.dinner}\n \r`
// })
// this.CtObj.travelContent = str;
this.trifficList.forEach((x,index)=>{
if(x.airportPickUp==1||x.airportPickUp==2){
if(x.isUseBus==1){
this.tripList[index].TrifficType='飞机+大巴'
this.tripDays[index].TrifficType='飞机+大巴'
}
}
if(x.airportPickUp==0&&x.isUseBus==1){
this.tripList[index].TrifficType='大巴'
this.tripDays[index].TrifficType='大巴'
}
if(x.airportPickUp==1||x.airportPickUp==2){
if(x.isUseBus==0){
this.tripList[index].TrifficType='飞机'
this.tripDays[index].TrifficType='飞机'
}
}
if(x.airportPickUp==0||x.airportPickUp==0){
if(x.isUseBus==0){
this.tripList[index].TrifficType='无'
this.tripDays[index].TrifficType='无'
}
}
})
......
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