Skip to content

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

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

parents 8fe3778c 5fb4d896
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 264 additions and 123 deletions
src/components/TravelContractDetail.vue
View file @ f185f4f6
......@@ -285,6 +285,22 @@
.TD_MainContent .Ec_cha:hover {
color: red;
}
.TD_MainContent .TcTravel_Table td{
border: 1px solid rgb(0, 0, 0);
word-break: break-all;
padding:5px;
line-height: 2;
}
.TD_MainContent .TcTravel_Table{
width: 100%;
border: none;
border-collapse: collapse;
border-spacing: 0;
}
.TD_MainContent .TC_LASTTD div{
margin-bottom:10px;
}
</style>
<template>
......@@ -514,10 +530,11 @@
<p>旅游费用支付时间：<span>{{getDate(dataList.payDate)}}</span>。</p>
<h3>第二十二条 人身意外伤害保险</h3>
<p>1.出境社提示旅游者购买人身意外伤害保险；</p>
<p>2.旅游者可以做以下选择：</p>
<p>
旅游者<span> {{dataList.insuranceOpinion==1?'同意':'不同意'}} </span>（同意或者不同意，打勾无效）委托出境社办理人身意外伤害保险，保险公司名称
<span></span>（投保的相关信息以实际保单为准）；
<p>
2.旅游者<span v-if="dataList.insuranceOpinion==1">委托出境社购买</span>
<span v-if="dataList.insuranceOpinion==2">自行购买</span>
<span v-if="dataList.insuranceOpinion==3">放弃购买</span>人身意外伤害保险
<span v-if="dataList.insuranceOpinion==1">{{dataList.insuranceProduct}},保险产品名称（投保的相关信息以实际保单为准）；</span>
</p>
<h3>第二十三条 成团人数与不成团的约定</h3>
<p>成团的最低人数：<span>{{dataList.minNumber}}</span>人。</p>
......@@ -691,7 +708,10 @@
</tbody>
</table>
<br>
<table class="TDteam_Table">
<div v-html="dataList.travelContent">
</div>
<!-- <table class="TDteam_Table">
<tbody>
<tr>
<td colspan="5">
......@@ -731,7 +751,7 @@
</div>
</td>
<td>
{{item.TrifficType}}
<span>{{item.TrifficType}}</span>
</td>
<td>
<span v-if="index!=tripList.length-1">旅游酒店</span>
......@@ -741,7 +761,7 @@
</td>
</tr>
</tbody>
</table>
</table> -->
</div>
<!-- 自愿购物 -->
<div class="shoppings" :class="{'checkedNav':cked==6}">
......@@ -1365,11 +1385,11 @@
this.trifficList.forEach((x,index)=>{
if(x.airportPickUp==1||x.airportPickUp==2){
if(x.isUseBus==1){
this.tripList[index].TrifficType='飞机+车'
this.tripList[index].TrifficType='飞机+大巴'
}
}
if(x.airportPickUp==0&&x.isUseBus==1){
this.tripList[index].TrifficType='车'
if(x.airportPickUp==0&&x.isUseBus==1){
this.tripList[index].TrifficType='大巴'
}
if(x.airportPickUp==1||x.airportPickUp==2){
if(x.isUseBus==0){
......@@ -1378,11 +1398,11 @@
}
if(x.airportPickUp==0||x.airportPickUp==0){
if(x.isUseBus==0){
this.tripList[index].TrifficType=''
this.tripList[index].TrifficType='无'
}
}
})
},
}
},
mounted() {
this.msg.TCID = this.$route.query.TCID;
......
src/components/TravelContractNew.vue
View file @ f185f4f6
This diff is collapsed.
src/components/administrative/ElectronicAudit.vue
View file @ f185f4f6
......@@ -43,7 +43,7 @@
</el-select>
</span>
</li>
<li>
<li style="display:none;">
<span>
<em>日期</em>
<el-date-picker v-model='msg.startDate' class='w135' value-format="yyyy-MM-dd" type="date"
......
src/components/clientConfirm.vue
View file @ f185f4f6
......@@ -258,6 +258,19 @@
.dic_content .gzqzUl li{
font-size:1.8rem;
}
.dic_content .TcTravel_Table{
width: 100%;
border: none;
border-collapse: collapse;
border-spacing: 0;
font-size: 1.8rem;
}
.dic_content .TcTravel_Table td{
border: 1px solid rgb(0, 0, 0);
word-break: break-all;
padding:5px;
line-height: 1.5;
}
</style>
<template>
......@@ -503,15 +516,21 @@
</p>
<h3><p class="toTopDistance">第二十一条 旅游费用及支付（以人民币为计算单位）</p></h3>
<p>
成人<font>{{dataList.adultPrice}}</font>元/人，小孩<font>{{dataList.childPrice}}</font>元/人；其中，导游服务费
成人<font>{{dataList.adultPrice}}</font>元/人，儿童（不满14岁）<font>{{dataList.childPrice}}</font>元/人；其中，导游服务费
<font>{{dataList.servicePrice}}</font>元/人；旅游费用合计：<font>{{dataList.orderPrice}}</font>元。
</p>
<p>旅游费用支付方式：<font>{{dataList.payType==1?'现金':'转账'}}</font></p>
<p>旅游费用支付方式：
<font v-if="dataList.payType==1">现金</font>
<font v-if="dataList.payType==2">转账</font>
<font v-if="dataList.payType==3">支票</font>
</p>
<p>旅游费用支付时间：<font>{{getDate(dataList.payDate)}}</font></p>
<h3><p class="toTopDistance">第二十二条&nbsp;&nbsp;人身意外伤害保险</p></h3>
<p>
旅游者<font>{{dataList.insuranceOpinion==1?'同意':'不同意'}}</font>（同意或者不同意，打勾无效）委托出境社办理人身意外伤害保险，保险公司名称
<font></font>（投保的相关信息以实际保单为准）；保险金额：<font>{{dataList.insuranceAmount}}</font>元人民币。
2.旅游者<font v-if="dataList.insuranceOpinion==1">委托出境社购买</font>
<font v-if="dataList.insuranceOpinion==2">自行购买</font>
<font v-if="dataList.insuranceOpinion==3">放弃购买</font>人身意外伤害保险
<font v-if="dataList.insuranceOpinion==1">{{dataList.insuranceProduct}},保险产品名称（投保的相关信息以实际保单为准）；</font>
</p>
<p>旅游者<font>{{dataList.clientName}}</font>（姓名）已阅读知悉保险条款，个人旅游人身意外伤害保险赔付标准按相关保险条款规定执行。</p>
<h3><p class="toTopDistance">第二十三条&nbsp;&nbsp;成团人数与不成团的约定</p></h3>
......@@ -716,7 +735,8 @@
</div>
<!-- 团队行程 -->
<div v-show="ActiveTab==5" class="item_content">
<table class="content_table ClientTravelTable" cellpadding="0" cellspacing="0" style="border-collapse:collapse">
<div v-html="dataList.travelContent"></div>
<!-- <table class="content_table ClientTravelTable" cellpadding="0" cellspacing="0" style="border-collapse:collapse">
<tr>
<td width="10%">团号</td>
<td width="36%">{{dataList.tCNum}}</td>
......@@ -781,11 +801,11 @@
<span v-if="index!=tripList.length-1">双人间</span>
</td>
</tr>
</table>
</table> -->
</div>
<!-- 自愿购物活动补充协议 -->
<div v-show="ActiveTab==6" class="item_content">
<table class="content_table ClientTravelTable" cellpadding="0" cellspacing="0" style="border-collapse:collapse">
<table v-if="dataList.shopProtocolList&&dataList.shopProtocolList.length>0" class="content_table ClientTravelTable" cellpadding="0" cellspacing="0" style="border-collapse:collapse">
<tr>
<th>具体时间</th>
<th>地点</th>
......@@ -810,7 +830,7 @@
</div>
<!-- 自愿参加另行付费旅游项目补充协议 -->
<div v-show="ActiveTab==7" class="item_content">
<table class="content_table ClientTravelTable" cellpadding="0" cellspacing="0" style="border-collapse:collapse">
<table v-if="dataList.payProtocolList&&dataList.payProtocolList.length>0" class="content_table ClientTravelTable" cellpadding="0" cellspacing="0" style="border-collapse:collapse">
<tr>
<th>具体时间</th>
<th>地点</th>
......
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