Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SuperMan
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
罗超
SuperMan
Commits
47f1f3be
Commit
47f1f3be
authored
Mar 18, 2020
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
c204b126
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
289 additions
and
22 deletions
+289
-22
confirmationOrderDownLoad.vue
src/components/confirmationOrderDownLoad.vue
+18
-2
newConfimationOrder.vue
src/components/newConfimationOrder.vue
+271
-20
No files found.
src/components/confirmationOrderDownLoad.vue
View file @
47f1f3be
...
...
@@ -51,7 +51,7 @@
@
click=
"gernalFeature(0)"
/>
<input
type=
"button"
style=
"width: auto !important;"
class=
"travelControlTripBtn"
value=
"下载电脑版WORD"
@
click=
"gernalFeature(1)"
/>
-->
<input
type=
"button"
value=
"新版行程"
class=
"travelControlTripBtn"
style=
"display:none;"
@
click=
"goUrlView()"
/>
<input
type=
"button"
value=
"新版行程"
class=
"travelControlTripBtn"
@
click=
"goUrlView()"
/>
<a
class=
"travelControlTripBtn"
v-if=
"priceList.length>0&& priceList[0].wordPath!=''"
style=
"display:inline-block;text-decoration:none;
width:135px;text-align:center;line-height:30px;font-size:13px;position:relative;top:2px;"
:href=
"domainManager().ViittoFileUrl+priceList[0].wordPath"
>
下载WORD行程
</a>
...
...
@@ -1663,7 +1663,23 @@
cityId
:
this
.
$route
.
query
.
cityId
,
tcid
:
this
.
$route
.
query
.
tcid
,
orderId
:
this
.
$route
.
query
.
orderId
,
isClick
:
1
//不计算点击
isClick
:
1
,
//不计算点击
vshowA
:
this
.
vshowA
,
vshowB
:
this
.
vshowB
,
vshowC
:
this
.
vshowC
,
vshowD
:
this
.
vshowD
,
vshowE
:
this
.
vshowE
,
vshowF
:
this
.
vshowF
,
vshowG
:
this
.
vshowG
,
vshowH
:
this
.
vshowH
,
vshowI
:
this
.
vshowI
,
vshowJ
:
this
.
vshowJ
,
vshowK
:
this
.
vshowK
,
vshowL
:
this
.
vshowL
,
vshowM
:
this
.
vshowM
,
vshowLLR
:
this
.
vshowLLR
,
vshowTCNUM
:
this
.
vshowTCNUM
,
vshowO
:
this
.
vshowO
,
}
});
window
.
open
(
routeData
.
href
,
"_blank"
);
...
...
src/components/newConfimationOrder.vue
View file @
47f1f3be
...
...
@@ -135,6 +135,65 @@
.newTripFeiyongtitle
h2
{
font-size
:
18px
;
}
.newTripflightInfo
{
background-color
:
#f7f7f7
;
padding
:
20px
15px
15px
15px
;
width
:
100%
;
margin-bottom
:
10px
;
-webkit-box-sizing
:
border-box
;
box-sizing
:
border-box
;
}
.newTripflightInfo
.flight_th
{
font-size
:
20px
;
font-weight
:
700
;
width
:
100%
;
color
:
#000000
;
}
._hangban_line
{
height
:
1px
;
background-color
:
#929292
;
margin-top
:
8px
;
margin-bottom
:
13px
;
}
.newTripflight_list
{
width
:
100%
;
}
.newTripflight_list
td
{
font-size
:
15px
;
height
:
34px
;
vertical-align
:
middle
;
background-color
:
#eaeaea
;
}
.newTrip_Main
.newTripcollection
{
margin-bottom
:
40px
;
width
:
100%
;
}
.newTrip_Main
.newTripCollectuion
{
width
:
400px
;
height
:
80px
;
border-bottom
:
1px
solid
#ddd
;
margin-left
:
60px
;
-webkit-box-sizing
:
border-box
;
box-sizing
:
border-box
;
color
:
#666
;
}
.newTrip_Main
.newTripCollectuion
>
div
{
width
:
130px
;
float
:
left
;
padding-top
:
25px
;
}
.newTrip_Main
.newTripCollectuion
span
{
font-size
:
18px
;
color
:
#000
;
width
:
270px
;
display
:
inline-block
;
float
:
left
;
padding-top
:
25px
;
}
.newTrip_Main
.newTripCollectuion
img
{
vertical-align
:
sub
;
margin-right
:
12px
;
}
</
style
>
<
template
>
<div
class=
"newTrip_Main"
>
...
...
@@ -152,6 +211,142 @@
<div><span
class=
"newtripComTitle"
>
返回日期:
</span>
{{
orderMsg
.
endDate
}}
</div>
<div><span
class=
"newtripComTitle"
>
行程天数:
</span>
{{
orderMsg
.
dayNum
}}
</div>
</div>
<div
v-if=
'vshowL'
class=
"newTripFeiyongtitle"
>
<h2>
集合地点
&
联系人
</h2>
<div
class=
"newTripLine"
></div>
<div
class=
"newTripEnglish"
>
Collection place
&
Contacts
</div>
</div>
<table
v-if=
'vshowL'
class=
"newTripcollection"
>
<tr>
<td>
<div
class=
"newTripCollectuion clearfix"
>
<div><img
src=
"../assets/img/TravelControlTripIcon9.png"
/>
本团领队
</div>
<span>
{{
orderTripdiff
!=
null
?
orderTripdiff
.
leaderInfo
:
orderMsg
.
leaderName
+
(
orderMsg
.
leaderMobile
!=
null
?
"/"
+
orderMsg
.
leaderMobile
:
""
)
}}
</span>
</div>
</td>
<td>
<div
class=
"newTripCollectuion clearfix"
>
<div><img
src=
"../assets/img/TravelControlTripIcon10.png"
/>
集合时间
</div>
<span>
{{
orderTripdiff
!=
null
?
orderTripdiff
.
gatheringTime
:
orderMsg
.
gatheringTime
}}
</span>
</div>
</td>
</tr>
<tr>
<td>
<div
class=
"newTripCollectuion clearfix"
>
<div><img
src=
"../assets/img/TravelControlTripIcon11.png"
/>
机场服务
</div>
<span>
{{
orderTripdiff
!=
null
?
orderTripdiff
.
airportService
:
orderMsg
.
airportServicePerson
+
"/"
+
orderMsg
.
airportServicePhone
}}
</span>
</div>
</td>
<td>
<div
class=
"newTripCollectuion clearfix"
>
<div><img
src=
"../assets/img/TravelControlTripIcon12.png"
/>
集合标识
</div>
<span>
{{
orderTripdiff
!=
null
?
orderTripdiff
.
gatherIdent
:
orderMsg
.
bName
}}
</span>
</div>
</td>
</tr>
<tr>
<td>
<div
class=
"newTripCollectuion clearfix"
>
<div><img
src=
"../assets/img/TravelControlTripIcon13.png"
/>
紧急联系人
</div>
<template>
<span
v-if=
'vshowLLR'
>
<template
v-if=
"orderTripdiff!=null&&orderTripdiff.emergencyContact!=''"
>
{{
orderTripdiff
.
emergencyContact
}}
</
template
>
<
template
v-else-if=
"orderMsg.branchManager!=''&&orderMsg.mobilePhone!=''"
>
{{
orderMsg
.
branchManager
+
"/"
+
orderMsg
.
mobilePhone
}}
</
template
>
<
template
v-else-if=
"orderMsg.sellName!=''&&orderMsg.sellTel!=''"
>
{{
orderMsg
.
sellName
+
"/"
+
orderMsg
.
sellTel
}}
</
template
>
</span>
<span
v-else
></span>
</template>
</div>
</td>
<td>
<div
class=
"newTripCollectuion clearfix"
>
<div><img
src=
"../assets/img/TravelControlTripIcon14.png"
/>
集合地点
</div>
<span>
{{orderTripdiff!=null? orderTripdiff.gatheringAddress :
orderMsg.gatheringAddress}}
</span>
</div>
</td>
</tr>
</table>
<div
v-if=
'vshowB'
class=
"newTripFeiyongtitle"
>
<h2>
航班信息
</h2>
<div
class=
"newTripLine"
></div>
<div
class=
"newTripEnglish"
>
Flight situation
</div>
</div>
<div
v-if=
'vshowB'
class=
"newTripflightInfo"
>
<table
border=
"0"
align=
"center"
cellpadding=
"0"
cellspacing=
"0"
class=
"flight_th"
>
<tbody>
<tr>
<td
width=
"140"
>
出发时间
<span>
(当地)
</span></td>
<td
width=
"160"
>
抵达时间
<span>
(当地)
</span></td>
<td
width=
"160"
>
起飞机场
</td>
<td
width=
"18"
class=
"gap"
>
</td>
<td
width=
"160"
>
抵达机场
</td>
<td
width=
"18"
class=
"gap"
>
</td>
<td
width=
"140"
>
航空公司
</td>
<td
width=
"90"
>
航班编号
</td>
<td
width=
"18"
class=
"gap"
>
</td>
<td
width=
"100"
>
经停城市
</td>
</tr>
</tbody>
</table>
<div
class=
"_hangban_line"
></div>
<table
border=
"0"
align=
"center"
cellspacing=
"0"
cellpadding=
"0"
class=
"newTripflight_list"
>
<tbody
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>
<span
class=
"num"
>
{{flight.departureTime}}
</span></td>
<td
width=
"160"
><span
class=
"nth-day"
>
{{flight.arriveDate.substring(5)}}
</span>
<span
class=
"num"
>
{{flight.arrivalTime}}
</span></td>
<td
width=
"160"
>
{{flight.departureAirPortName}}
<span
class=
"citycode"
></span></td>
<td
width=
"18"
class=
"gap"
>
</td>
<td
width=
"160"
>
{{flight.arrivalAirPortName}}
<span
class=
"citycode"
></span></td>
<td
width=
"18"
class=
"gap"
>
</td>
<td
width=
"140"
>
{{flight.alName}}
</td>
<td
width=
"110"
>
{{flight.flightNumber}}({{(flight.flightState==1)?"OK":"暂定"}})
</td>
<td
width=
"18"
class=
"gap"
>
</td>
<td
width=
"100"
>
{{flight.stopoverAirPortName}}
</td>
</tr>
</tbody>
<tbody
v-else-if=
"priceList.length>0&&priceList[0].priceFlight&&priceList[0].priceFlight.length>0"
>
<tr
v-for=
"(flight,ftIndex) in priceList[0].priceFlight"
:key=
"ftIndex"
>
<td
width=
"140"
><span
class=
"nth-day"
>
{{flight.startDate.substring(5)}}
</span>
<span
class=
"num"
>
{{flight.departureTime}}
</span></td>
<td
width=
"160"
><span
class=
"nth-day"
>
{{flight.arriveDate.substring(5)}}
</span>
<span
class=
"num"
>
{{flight.arrivalTime}}
</span></td>
<td
width=
"160"
>
{{flight.departureAirPortName}}
<span
class=
"citycode"
></span></td>
<td
width=
"18"
class=
"gap"
>
</td>
<td
width=
"160"
>
{{flight.arrivalAirPortName}}
<span
class=
"citycode"
></span></td>
<td
width=
"18"
class=
"gap"
>
</td>
<td
width=
"140"
>
{{flight.alName}}
</td>
<td
width=
"110"
>
{{flight.flightNumber}}({{(flight.flightState==1)?"OK":"暂定"}})
</td>
<td
width=
"18"
class=
"gap"
>
</td>
<td
width=
"100"
>
{{flight.stopoverAirPortName}}
</td>
</tr>
</tbody>
<tbody
v-else
>
<tr>
<td>
航班信息未确认
</td>
</tr>
</tbody>
</table>
</div>
<div
class=
"newFeature"
v-html=
"feature.featureHtml"
></div>
<div
class=
"newtripList"
v-for=
"(item,index) in tripList"
:key=
"index"
>
<div
class=
"newTripFly"
>
DAY {{item.dayNum}}
</div>
...
...
@@ -200,13 +395,13 @@
</div>
</div>
<div
class=
"newTripFeiyong"
>
<div>
<div
class=
"newTripFeiyongtitle"
>
<div
id=
"pdf_4"
>
<div
v-if=
'vshowE'
class=
"newTripFeiyongtitle"
>
<h2>
费用
</h2>
<div
class=
"newTripLine"
></div>
<div
class=
"newTripEnglish"
>
Expense
</div>
</div>
<div
class=
"newTripExpense"
>
<div
v-if=
'vshowE'
class=
"newTripExpense"
>
<div
class=
"newTripleft"
>
费用包含
</div>
<div
class=
"newTripRight"
>
<div
v-html=
"feature.feeInclude"
></div>
...
...
@@ -216,12 +411,33 @@
<div
v-html=
"feature.feeNonInclude"
></div>
</div>
</div>
<div
class=
"newTripFeiyongtitle"
>
<div
class=
"newTripExpense"
v-if=
'dataList.selfpayingList && dataList.selfpayingList.length>0&&vshowE'
>
<div
class=
"newTripleft"
>
自理费用
</div>
<div
class=
"newTripRight"
>
<table
class=
"expense-table"
cellspacing=
0
cellpadding=
0
>
<thead>
<th>
城市
</th>
<th>
活动
</th>
<th>
参考价格
</th>
<th>
说明
</th>
</thead>
<tbody>
<tr
v-for=
"(item,i) in dataList.selfpayingList"
:key=
"i"
>
<td>
{{item.cityName}}
</td>
<td>
{{item.itemName}}
</td>
<td>
约{{item.estimatedCost}}
</td>
<td>
{{item.explain}}
</td>
</tr>
</tbody>
</table>
</div>
</div>
<div
v-if=
'vshowF'
class=
"newTripFeiyongtitle"
>
<h2>
购物说明
</h2>
<div
class=
"newTripLine"
></div>
<div
class=
"newTripEnglish"
>
Expense
</div>
</div>
<div
class=
"newTripExpense"
>
<div
v-if=
'vshowF'
class=
"newTripExpense"
>
<div
class=
"newTripleft"
>
<!-- 购物协议 -->
</div>
...
...
@@ -229,55 +445,74 @@
<div
v-html=
"feature.shopRemark"
></div>
</div>
</div>
<div
class=
"expense"
v-if=
"dataList.shopList && dataList.shopList.length>0&&vshowF"
>
<div
class=
"left"
>
购物安排
</div>
<div
class=
"right"
>
<table
class=
"expense-table autowidth"
cellspacing=
0
cellpadding=
0
>
<thead>
<th>
城市
</th>
<th>
购物店名称
</th>
<th>
预计停留时间
</th>
</thead>
<tbody>
<tr
v-for=
"(item,i) in dataList.shopList"
:key=
"i"
>
<td>
{{item.cityName}}
</td>
<td>
{{item.shopName}}
</td>
<td>
{{item.visitTime}}
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
<div>
<div
class=
"newTripFeiyongtitle"
>
<div
id=
"pdf_5"
>
<div
v-if=
'vshowG'
class=
"newTripFeiyongtitle"
>
<h2>
订单须知
</h2>
<div
class=
"newTripLine"
></div>
<div
class=
"newTripEnglish"
>
Tips
</div>
</div>
<div
class=
"newTripExpense"
v-if=
"feature.importantTip!=''"
>
<div
class=
"newTripExpense"
v-if=
"feature.importantTip!=''
&&vshowG
"
>
<div
class=
"newTripleft"
>
重要提示
</div>
<div
class=
"newTripRight"
>
<div
v-html=
"feature.importantTip"
></div>
</div>
</div>
<div
class=
"newTripExpense"
>
<div
v-if=
'vshowG'
class=
"newTripExpense"
>
<div
class=
"newTripleft"
>
温馨提示
</div>
<div
class=
"newTripRight"
>
<div
v-html=
"feature.warmTip"
></div>
</div>
</div>
</div>
<div>
<div
class=
"newTripFeiyongtitle"
>
<div
id=
"pdf_6"
>
<div
v-if=
'vshowH'
class=
"newTripFeiyongtitle"
>
<h2>
签证
</h2>
<div
class=
"newTripLine"
></div>
<div
class=
"newTripEnglish"
>
Visa
</div>
</div>
<div
class=
"newTripExpense"
>
<div
v-if=
'vshowH'
class=
"newTripExpense"
>
<div
class=
"newTripleft"
>
签证须知
</div>
<div
class=
"newTripRight"
>
<div
v-html=
"feature.visaRemark"
></div>
</div>
</div>
<div
class=
"newTripFeiyongtitle"
>
<div
v-if=
'vshowI'
class=
"newTripFeiyongtitle"
>
<h2>
同行备注
</h2>
<div
class=
"newTripLine"
></div>
<div
class=
"newTripEnglish"
>
Remark
</div>
</div>
<div
class=
"newTripExpense"
>
<div
v-if=
'vshowI'
class=
"newTripExpense"
>
<div
class=
"newTripleft"
></div>
<div
class=
"newTripRight"
>
<div
v-html=
"feature.b2BRemark"
></div>
</div>
</div>
<div
class=
"newTripFeiyongtitle"
>
<div
v-if=
'vshowM'
class=
"newTripFeiyongtitle"
>
<h2>
旅客信息
</h2>
<div
class=
"newTripLine"
></div>
<div
class=
"newTripEnglish"
>
Passenger information
</div>
</div>
<table
class=
"Passenger-table"
border=
"0"
cellspacing=
"2"
cellpadding=
"2"
>
<table
v-if=
'vshowM'
class=
"Passenger-table"
border=
"0"
cellspacing=
"2"
cellpadding=
"2"
>
<tr>
<td
width=
"16.6%"
class=
"thClass"
>
姓名
</td>
<td
width=
"16.6%"
class=
"thClass"
>
英文姓名
</td>
...
...
@@ -352,13 +587,29 @@
lineTripFeatureBottomBg
:
''
,
//航空公司下拉
airLineList
:
[],
vshowA
:
this
.
$route
.
query
.
vshowA
===
undefined
?
true
:
this
.
$route
.
query
.
vshowA
===
'true'
,
vshowB
:
this
.
$route
.
query
.
vshowB
===
undefined
?
true
:
this
.
$route
.
query
.
vshowB
===
'true'
,
vshowC
:
this
.
$route
.
query
.
vshowC
===
undefined
?
true
:
this
.
$route
.
query
.
vshowC
===
'true'
,
vshowD
:
this
.
$route
.
query
.
vshowD
===
undefined
?
true
:
this
.
$route
.
query
.
vshowD
===
'true'
,
vshowE
:
this
.
$route
.
query
.
vshowE
===
undefined
?
true
:
this
.
$route
.
query
.
vshowE
===
'true'
,
vshowF
:
this
.
$route
.
query
.
vshowF
===
undefined
?
true
:
this
.
$route
.
query
.
vshowF
===
'true'
,
vshowG
:
this
.
$route
.
query
.
vshowG
===
undefined
?
true
:
this
.
$route
.
query
.
vshowG
===
'true'
,
vshowH
:
this
.
$route
.
query
.
vshowH
===
undefined
?
true
:
this
.
$route
.
query
.
vshowH
===
'true'
,
vshowI
:
this
.
$route
.
query
.
vshowI
===
undefined
?
true
:
this
.
$route
.
query
.
vshowI
===
'true'
,
vshowJ
:
this
.
$route
.
query
.
vshowJ
===
undefined
?
true
:
this
.
$route
.
query
.
vshowJ
===
'true'
,
vshowK
:
this
.
$route
.
query
.
vshowK
===
undefined
?
true
:
this
.
$route
.
query
.
vshowK
===
'true'
,
vshowL
:
this
.
$route
.
query
.
vshowL
===
undefined
?
true
:
this
.
$route
.
query
.
vshowL
===
'true'
,
vshowM
:
this
.
$route
.
query
.
vshowM
===
undefined
?
true
:
this
.
$route
.
query
.
vshowM
===
'true'
,
vshowLLR
:
this
.
$route
.
query
.
vshowLLR
===
undefined
?
true
:
this
.
$route
.
query
.
vshowLLR
===
'true'
,
vshowTCNUM
:
this
.
$route
.
query
.
vshowTCNUM
===
undefined
?
false
:
this
.
$route
.
query
.
vshowTCNUM
===
'true'
,
vshowO
:
this
.
$route
.
query
.
vshowO
===
undefined
?
true
:
this
.
$route
.
query
.
vshowO
===
'true'
,
}
},
mounted
()
{
// this.orderId = this.$route.query.orderId;
// this.isopOperation = this.$route.query.isopOperation;
this
.
orderId
=
0
;
this
.
isopOperation
=
this
.
orderId
=
this
.
$route
.
query
.
orderId
;
this
.
isopOperation
=
this
.
$route
.
query
.
isopOperation
;
// this.getWxCode();
this
.
init
();
this
.
initAirlines
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment