Skip to content

S
SuperMan
Commit 4e25c966 authored by youjie's avatar youjie
Browse files
Options

no message

parent b16e8d50
Hide whitespace changes
Inline Side-by-side
Showing with 211 additions and 202 deletions
src/assets/css/tripIndexNew.css
View file @ 4e25c966
...@@ -430,21 +430,25 @@ html, body{ ...@@ -430,21 +430,25 @@ html, body{
} }
.LeaveGroupDownload-form .expense { .LeaveGroupDownload-form .expense {
padding: 0 20px; padding: 0 30px;
margin-bottom: 20px; margin-bottom: 20px;
} }
.LeaveGroupDownload-form .expense .right { .LeaveGroupDownload-form .expense .right {
margin-bottom: 20px; margin-bottom: 20px;
} }
.LeaveGroupDownload-form .expense .right * { .LeaveGroupDownload-form .expense .right * {
color: #000000 !important; color: #000000 !important;
font-size: 15px !important; font-size: 15px !important;
padding: 0 !important; padding: 0 !important;
margin: 0 !important; margin: 0 !important;
line-height: 160%; line-height: 160%;
} }
.travelControlTrip .LeaveGroupDownload-form .Passenger-table{
width: 100% !important;
margin: 0;
}
.UpgradedVersion-header { .UpgradedVersion-header {
top: 0; top: 0;
......
src/components/LeaveGroupDownload/index.vue
View file @ 4e25c966
...@@ -3,204 +3,208 @@ ...@@ -3,204 +3,208 @@
<div class="UpgradedVersion-box UpgradedVersion-homebj relative" style="height: 1478px;"> <div class="UpgradedVersion-box UpgradedVersion-homebj relative" style="height: 1478px;">
<div class="absolute z-index1 column" style="left: 0;right: 0; top: 0;bottom: 0;"> <div class="absolute z-index1 column" style="left: 0;right: 0; top: 0;bottom: 0;">
<Header :TripColor="dataAll&&dataAll.tripColor" :orderMsg="orderMsg"></Header> <Header :TripColor="dataAll&&dataAll.tripColor" :orderMsg="orderMsg"></Header>
<div class="travelDaysTitlle row-aic">
<div class="travelDaysTitlle-left"> <div class="travelDaysTitlle row-aic">
<div class="travelDaysTitlle-left-text column-ajc"> <div class="travelDaysTitlle-left">
<div class="travelDaysTitlle-left-textOne"> <div class="travelDaysTitlle-left-text column-ajc">
<span></span> <div class="travelDaysTitlle-left-textOne">
<span></span>
</div>
<div class="travelDaysTitlle-left-textTwo">
<span></span>
</div>
</div> </div>
<div class="travelDaysTitlle-left-textTwo"> </div>
<span></span> <div class="travelDaysTitlle-right">
<div class="travelDaysTitlle-right-text row-aic"
:style="{'background': dataAll&&dataAll.tripColor,'font-size': getFontSize(orderMsg.lineteamName+orderMsg.dayNum),'color':textColor}">
{{ orderMsg.lineteamName }}{{ orderMsg.dayNum }}日游
</div> </div>
</div> </div>
</div> </div>
<div class="travelDaysTitlle-right"> <div style="margin: 0 30px;">
<div class="travelDaysTitlle-right-text row-aic" <div class="trip-adviser" style="margin-top: 20px;">
:style="{'background': dataAll&&dataAll.tripColor,'font-size': getFontSize(orderMsg.lineteamName+orderMsg.dayNum),'color':textColor}"> <!-- <h1 class="trip-nav-title">
<span>{{ vshowL ? "出团通知书：" : "" }}</span>
{{ orderMsg.lineteamName }}{{ orderMsg.dayNum }}日游 {{ orderMsg.lineteamName }}{{ orderMsg.dayNum }}日游
</div> </h1> -->
<p>
尊敬的旅客：<br />感谢您选择我们的旅游服务。为了确保各位旅客有更好的旅游体验，请详细阅读《出团通知书》的各项内容。如有任何问题，请拨打通知书内的本团领队电话或机场服务人员电话。
在此，预祝您旅途愉快！希望您在本次旅程中留下此生中最美好的回忆！
</p>
</div> </div>
</div> <table class="baseTable trip-v3-base">
<div class="trip-adviser"> <tbody>
<!-- <h1 class="trip-nav-title"> <tr>
<span>{{ vshowL ? "出团通知书：" : "" }}</span> <td class="essential-item jianju">
{{ orderMsg.lineteamName }}{{ orderMsg.dayNum }}日游 <p class="pkey">线路</p>
</h1> --> <p class="pvalue">{{ orderMsg.lineName }}</p>
<p> </td>
尊敬的旅客：<br />感谢您选择我们的旅游服务。为了确保各位旅客有更好的旅游体验，请详细阅读《出团通知书》的各项内容。如有任何问题，请拨打通知书内的本团领队电话或机场服务人员电话。 <td class="essential-item jianju">
在此，预祝您旅途愉快！希望您在本次旅程中留下此生中最美好的回忆！ <p class="pkey">出发日期</p>
</p> <p class="pvalue">{{ orderMsg.startDate }}</p>
</div> </td>
<table class="baseTable trip-v3-base"> <td class="essential-item jianju">
<tbody> <p class="pkey">返回日期</p>
<tr> <p class="pvalue">{{ orderMsg.endDate }}</p>
<td class="essential-item jianju"> </td>
<p class="pkey">线路</p> <td class="essential-item jianju_b">
<p class="pvalue">{{ orderMsg.lineName }}</p> <p class="pkey">行程天数</p>
</td> <p class="pvalue">{{ orderMsg.dayNum }}</p>
<td class="essential-item jianju"> </td>
<p class="pkey">出发日期</p> <td rowspan="2">
<p class="pvalue">{{ orderMsg.startDate }}</p> <div style="width: 160px; height:160px;margin-left:20px;">
</td> <img style="width: 160px; height:160px;" :src="'data:image/png;base64,' + WeiXinShareImgSrc"
<td class="essential-item jianju"> alt="获取微信小程序分享链接" />
<p class="pkey">返回日期</p> </div>
<p class="pvalue">{{ orderMsg.endDate }}</p> </td>
</td> </tr>
<td class="essential-item jianju_b"> <tr>
<p class="pkey">行程天数</p> <td class="essential-item jianju" colspan="2">
<p class="pvalue">{{ orderMsg.dayNum }}</p> <p class="pkey">系列</p>
</td> <p class="pvalue">{{ orderMsg.lineteamName }}</p>
<td rowspan="2"> </td>
<div style="width: 160px; height:160px;margin-left:20px;"> <td class="essential-item jianju_b" colspan="2">
<img style="width: 160px; height:160px;" :src="'data:image/png;base64,' + WeiXinShareImgSrc" <p class="pkey">团队编号</p>
alt="获取微信小程序分享链接" /> <p class="pvalue">{{ orderMsg.tcnum }}</p>
</div> </td>
</td> </tr>
</tr> </tbody>
<tr> </table>
<td class="essential-item jianju" colspan="2">
<p class="pkey">系列</p>
<p class="pvalue">{{ orderMsg.lineteamName }}</p>
</td>
<td class="essential-item jianju_b" colspan="2">
<p class="pkey">团队编号</p>
<p class="pvalue">{{ orderMsg.tcnum }}</p>
</td>
</tr>
</tbody>
</table>
<div class="trip-v3-title small-margin">
<h2>集合地点&amp;联系人</h2>
</div>
<table class="baseTable trip-v3-base">
<tbody>
<tr>
<td class="essential-item jianju">
<p class="pkey">本团领队</p>
<p class="pvalue">
{{
orderTripdiff != null
? orderTripdiff.leaderInfo
: orderMsg.leaderName +
(orderMsg.leaderMobile != null
? "/" + orderMsg.leaderMobile
: "")
}}
</p>
</td>
<td class="essential-item jianju">
<p class="pkey">集合时间</p>
<p class="pvalue">
{{
orderTripdiff != null
? orderTripdiff.gatheringTime
: orderMsg.gatheringTime
}}
</p>
</td>
<td class="essential-item jianju">
<p class="pkey">机场服务</p>
<p class="pvalue">
<template v-if="
orderMsg &&
orderMsg.airportServicePerson &&
orderMsg.airportServicePerson != ''
">
{{ orderMsg.airportServicePerson }}
</template>
</p>
</td>
<td class="essential-item jianju_b">
<p class="pkey">集合标识</p>
<p class="pvalue">
{{
orderTripdiff != null
? orderTripdiff.gatherIdent
: orderMsg.bName
}}
</p>
</td>
</tr>
<tr>
<td class="essential-item jianju" colspan="2">
<p class="pkey">紧急联系人</p>
<p class="pvalue">
<span v-if="vshowLLR">
<template v-if="orderMsg.emergencyContact != ''">
{{ orderMsg.emergencyContact }}
</template>
</span>
</p>
</td>
<td class="essential-item jianju_b" colspan="2">
<p class="pkey">集合地点</p>
<p class="pvalue">
{{
orderTripdiff != null
? orderTripdiff.gatheringAddress
: orderMsg.gatheringAddress
}}
</p>
</td>
</tr>
</tbody>
</table>
<template v-if='vshowB'>
<div class="trip-v3-title small-margin"> <div class="trip-v3-title small-margin">
参考航班 <h2>集合地点&amp;联系人</h2>
</div> </div>
<div class="hangban-info"> <table class="baseTable trip-v3-base">
<table border="0" align="center" cellspacing="0" cellpadding="0" class="flight_list" <tbody>
:class="{'guoneiLine':lineId==90}"> <tr>
<thead class="flight_header"> <td class="essential-item jianju">
<tr> <p class="pkey">本团领队</p>
<th width="140">出发时间<span>(当地)</span></th> <p class="pvalue">
<th width="160">抵达时间<span>(当地)</span></th> {{
<th width="160"> orderTripdiff != null
<template v-if="lineId==90">起飞机场/出发城市</template> ? orderTripdiff.leaderInfo
<template v-else>起飞机场</template> : orderMsg.leaderName +
</th> (orderMsg.leaderMobile != null
<th width="18" class="gap">&nbsp;</th> ? "/" + orderMsg.leaderMobile
<th width="160"> : "")
<template v-if="lineId==90">抵达机场/到达城市</template> }}
<template v-else>抵达机场</template> </p>
</th> </td>
<th width="18" class="gap">&nbsp;</th> <td class="essential-item jianju">
<th width="140">航空公司</th> <p class="pkey">集合时间</p>
<th width="90">航班编号</th> <p class="pvalue">
<th width="18" class="gap">&nbsp;</th> {{
<th width="100">经停城市</th> orderTripdiff != null
</tr> ? orderTripdiff.gatheringTime
</thead> : orderMsg.gatheringTime
<tbody style="padding-top:12px;" }}
v-if="orderTripdiff&&orderTripdiff.travelOrderFlightList&& orderTripdiff.travelOrderFlightList.length>0"> </p>
<tr v-for="(flight,ftIndex) in orderTripdiff.travelOrderFlightList" :key="ftIndex"> </td>
<td width="140"><span class="nth-day">{{flight.startDate.substring(5)}}</span>&nbsp;<span <td class="essential-item jianju">
class="num">{{flight.departureTime}}</span></td> <p class="pkey">机场服务</p>
<td width="160"><span class="nth-day">{{flight.arriveDate.substring(5)}}</span>&nbsp;<span <p class="pvalue">
class="num">{{flight.arrivalTime}}</span></td> <template v-if="
<td width="160">{{flight.departureAirPortName}}<span class="citycode"></span></td> orderMsg &&
<td width="18" class="gap">&nbsp;</td> orderMsg.airportServicePerson &&
<td width="160">{{flight.arrivalAirPortName}}<span class="citycode"></span></td> orderMsg.airportServicePerson != ''
<td width="18" class="gap">&nbsp;</td> ">
<td width="140">{{flight.alName}}</td> {{ orderMsg.airportServicePerson }}
<td width="110">{{flight.flightNumber}} </template>
<span style="color:green;">{{(flight.flightState==1)?"OK":"暂定"}}</span></td> </p>
<td width="18" class="gap">&nbsp;</td> </td>
<td width="100">{{flight.stopoverAirPortName}}</td> <td class="essential-item jianju_b">
</tr> <p class="pkey">集合标识</p>
</tbody> <p class="pvalue">
<tbody> {{
<tr> orderTripdiff != null
<td colspan="10" align="center" style="color:#333;font-size:14px;"> ? orderTripdiff.gatherIdent
1.本航班表僅提供參考，正確航班請點選您的出發日期。 2. : orderMsg.bName
不同航班，餐食及行程安排皆有所不同，正確行程，請點選您的出發日期。 }}
</td> </p>
</tr> </td>
</tbody> </tr>
</table> <tr>
</div> <td class="essential-item jianju" colspan="2">
</template> <p class="pkey">紧急联系人</p>
<p class="pvalue">
<span v-if="vshowLLR">
<template v-if="orderMsg.emergencyContact != ''">
{{ orderMsg.emergencyContact }}
</template>
</span>
</p>
</td>
<td class="essential-item jianju_b" colspan="2">
<p class="pkey">集合地点</p>
<p class="pvalue">
{{
orderTripdiff != null
? orderTripdiff.gatheringAddress
: orderMsg.gatheringAddress
}}
</p>
</td>
</tr>
</tbody>
</table>
<template v-if='vshowB'>
<div class="trip-v3-title small-margin">
参考航班
</div>
<div class="hangban-info">
<table border="0" align="center" cellspacing="0" cellpadding="0" class="flight_list"
:class="{'guoneiLine':lineId==90}">
<thead class="flight_header">
<tr>
<th width="140">出发时间<span>(当地)</span></th>
<th width="160">抵达时间<span>(当地)</span></th>
<th width="160">
<template v-if="lineId==90">起飞机场/出发城市</template>
<template v-else>起飞机场</template>
</th>
<th width="18" class="gap">&nbsp;</th>
<th width="160">
<template v-if="lineId==90">抵达机场/到达城市</template>
<template v-else>抵达机场</template>
</th>
<th width="18" class="gap">&nbsp;</th>
<th width="140">航空公司</th>
<th width="90">航班编号</th>
<th width="18" class="gap">&nbsp;</th>
<th width="100">经停城市</th>
</tr>
</thead>
<tbody style="padding-top:12px;"
v-if="orderTripdiff&&orderTripdiff.travelOrderFlightList&& orderTripdiff.travelOrderFlightList.length>0">
<tr v-for="(flight,ftIndex) in orderTripdiff.travelOrderFlightList" :key="ftIndex">
<td width="140"><span class="nth-day">{{flight.startDate.substring(5)}}</span>&nbsp;<span
class="num">{{flight.departureTime}}</span></td>
<td width="160"><span class="nth-day">{{flight.arriveDate.substring(5)}}</span>&nbsp;<span
class="num">{{flight.arrivalTime}}</span></td>
<td width="160">{{flight.departureAirPortName}}<span class="citycode"></span></td>
<td width="18" class="gap">&nbsp;</td>
<td width="160">{{flight.arrivalAirPortName}}<span class="citycode"></span></td>
<td width="18" class="gap">&nbsp;</td>
<td width="140">{{flight.alName}}</td>
<td width="110">{{flight.flightNumber}}
<span style="color:green;">{{(flight.flightState==1)?"OK":"暂定"}}</span></td>
<td width="18" class="gap">&nbsp;</td>
<td width="100">{{flight.stopoverAirPortName}}</td>
</tr>
</tbody>
<tbody>
<tr>
<td colspan="10" align="center" style="color:#333;font-size:14px;">
1.本航班表僅提供參考，正確航班請點選您的出發日期。 2.
不同航班，餐食及行程安排皆有所不同，正確行程，請點選您的出發日期。
</td>
</tr>
</tbody>
</table>
</div>
</template>
</div>
<div style="width: 100%;height:40px;"></div> <div style="width: 100%;height:40px;"></div>
</div> </div>
</div> </div>
......
src/components/confirmationOrderDownLoadNew.vue
View file @ 4e25c966
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
</el-col> </el-col>
</el-row> </el-row>
<div id="pdfNode" class="LeaveGroupDownload-form"> <div id="pdfNode" class="LeaveGroupDownload-form">
<div id="pdfDom" style="padding:0 20px;"> <div id="pdfDom">
<!-- 首页 --> <!-- 首页 -->
<LeaveGroupDownload :dataAll="dataAll" :vshowJ="vshowJ" :vshowL="vshowL" :WeiXinShareImgSrc="WeiXinShareImgSrc" <LeaveGroupDownload :dataAll="dataAll" :vshowJ="vshowJ" :vshowL="vshowL" :WeiXinShareImgSrc="WeiXinShareImgSrc"
:orderMsg="orderMsg" :orderTripdiff="orderTripdiff" :vshowLLR="vshowLLR" :vshowB="vshowB" :lineId="lineId"> :orderMsg="orderMsg" :orderTripdiff="orderTripdiff" :vshowLLR="vshowLLR" :vshowB="vshowB" :lineId="lineId">
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/featureControls.vue
View file @ 4e25c966
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
<i class="el-icon-plus"></i> <i class="el-icon-plus"></i>
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="删除页面" placement="top"> <el-tooltip class="item" effect="dark" content="删除页面" placement="top">
<div @click="toDeletePages" v-if="isDeletePage"> <div @click="toDeletePages" v-if="isDeletePage">
<i class="el-icon-delete"></i> <i class="el-icon-delete"></i>
......
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