Skip to content

S
SuperMan
Commit 64f5b097 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

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

parents 538e8b49 e28cf317
Hide whitespace changes
Inline Side-by-side
Showing with 435 additions and 386 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 64f5b097
...@@ -998,7 +998,7 @@ ...@@ -998,7 +998,7 @@
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;"> <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;">
<tr> <tr>
<th>账户分类 收支冲抵</th> <th>账户分类</th>
<th>付款方式</th> <th>付款方式</th>
<th>账户</th> <th>账户</th>
<!-- <th width="100px">账户余额</th> --> <!-- <th width="100px">账户余额</th> -->
......
src/components/Hotel/roomReservations.vue
View file @ 64f5b097
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
<th>备注</th> <th>备注</th>
</tr> </tr>
<tr v-if="list.length==0"> <tr v-if="list.length==0">
<td colspan="10">暂无数据</td> <td colspan="11">暂无数据</td>
</tr> </tr>
<tbody v-for="(outItem,outindex) in list" :class="{roomReservationsSplitTrCss:outindex%2!=0}"> <tbody v-for="(outItem,outindex) in list" :class="{roomReservationsSplitTrCss:outindex%2!=0}">
<template v-for="(item,index) in outItem.StaticsReportList"> <template v-for="(item,index) in outItem.StaticsReportList">
......
src/components/Hotel/roomReservationsDetails.vue
View file @ 64f5b097
...@@ -5,6 +5,12 @@ ...@@ -5,6 +5,12 @@
margin: 5px auto; margin: 5px auto;
font-size: 12px; font-size: 12px;
} }
.rq_importNote {
color: red;
}
.rq_disImNote {
color: #ea6d6d;
}
</style> </style>
...@@ -294,7 +300,9 @@ ...@@ -294,7 +300,9 @@
<tr v-if="subItem.SupplierToDmcRemarks"> <tr v-if="subItem.SupplierToDmcRemarks">
<td width="70" style="text-align:right;">供应商对地接备注：</td> <td width="70" style="text-align:right;">供应商对地接备注：</td>
<td> <td>
{{subItem.SupplierToDmcRemarks}} <span :class="{'rq_disImNote':subItem.SupplierToDmcHotelStatus==1&&DateMinus(subItem.SupplierToDmcHotelStatusTime)<=5,'rq_importNote':subItem.SupplierToDmcHotelStatus==2&&DateMinus(subItem.SupplierToDmcHotelStatusTime)<=5}">
{{subItem.SupplierToDmcRemarks}}
</span>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -330,6 +338,7 @@ ...@@ -330,6 +338,7 @@
</div> </div>
</template> </template>
<script> <script>
import moment from 'moment'
import comCheckHotel from "../commonPage/comCheckHotel.vue"; import comCheckHotel from "../commonPage/comCheckHotel.vue";
export default { export default {
data() { data() {
...@@ -388,6 +397,14 @@ ...@@ -388,6 +397,14 @@
let str = `comCheckHotel${index}${subIndex}` let str = `comCheckHotel${index}${subIndex}`
this.$refs[str][0].getCheckHotel(); this.$refs[str][0].getCheckHotel();
}, },
DateMinus(sDate) {
var newDate = moment(sDate).format("YYYY-MM-DD");
var sdate = new Date(newDate.replace(/-/g, "/"));
var now = new Date();
var days = now.getTime() - sdate.getTime();
var day = Math.abs(parseInt(days / (1000 * 60 * 60 * 24)));
return day;
},
getItem(index, subIndex) { getItem(index, subIndex) {
this.checkedIndex = index this.checkedIndex = index
this.checkedsubIndex = subIndex this.checkedsubIndex = subIndex
...@@ -528,6 +545,7 @@ ...@@ -528,6 +545,7 @@
}) })
}); });
this.list = list; this.list = list;
console.log(this.list,'listttt');
this.$forceUpdate(); this.$forceUpdate();
} }
} else { } else {
......
src/components/Supplier/roomQuery2.vue
View file @ 64f5b097
...@@ -65,126 +65,8 @@ ...@@ -65,126 +65,8 @@
{{item.LeaderName}} <template v-if="item.LeaderTel">(电话: {{item.LeaderTel}})</template> {{item.LeaderName}} <template v-if="item.LeaderTel">(电话: {{item.LeaderTel}})</template>
</td> </td>
<td> <td>
<el-tooltip class="item" effect="dark" content="酒店信息" placement="top-start"> <a class="hotelLink" slot="reference" @click="getHotelList(item.TCID,item.NewCombinationNum),hotelUseDetail=true">酒店使用情况</a>
<el-popover placement="bottom" width="800" trigger="click" popper-class="rq_HotelDetails"> <a class="hotelLink" slot="reference" @click="getClickItem(item),dijieDialog=true">备注</a>
<table class="rq_HotelTable" v-loading="hotelLoading">
<tr>
<th width="120">
时间
</th>
<th width="150">
酒店
</th>
<th width="250">
价格
</th>
<th width="100">
税入/税别
</th>
<th width="100">提醒</th>
<th width="150">备注</th>
</tr>
<template v-for="(subItem,subIndex) in HotelList">
<tbody>
<template v-for="(childItem,childIndex) in subItem.HotelOrderList">
<tr>
<td style="text-align:center;" :rowspan="2">
第{{subIndex+1}}天 <br />
{{subItem.UseTimeStr}}
</td>
<td>
<template v-if="(childItem.DMCState==1 || childItem.OPState==1) && childItem.SupplierId!=UserInfo.SupplierId">业者自理</template>
<template v-else>
{{childItem.HotelName}}<br/>
<div class="rq_changeName">{{childItem.NewHotelName!=childItem.HotelName?'更换为:'+childItem.NewHotelName:""}}</div>
</template>
</td>
<td>
<template v-if="(childItem.DMCState==1 || childItem.OPState==1) && childItem.SupplierId!=UserInfo.SupplierId"></template>
<template v-else>
<template v-for="(detailsItem,detailsIndex) in childItem.OrderDetailsList"
v-if="detailsItem.HouseTypeCount>0">
<template v-if="detailsItem.HouseType==1">单间</template>
<template v-if="detailsItem.HouseType==2">标准双人间</template>
<template v-if="detailsItem.HouseType==3">大床房</template>
<template v-if="detailsItem.HouseType==4">三人间</template>
<template v-if="detailsItem.HouseType==4">司导间</template>
{{detailsItem.HouseTypeCount}} 间
价格: {{detailsItem.UnitPrice}}
返佣: {{detailsItem.RebateRatio}}
<br />
</template>
</template>
</td>
<td>
<template v-if="(childItem.DMCState==1 || childItem.OPState==1) && childItem.SupplierId!=UserInfo.SupplierId"></template>
<template v-else>
<template v-if="childItem.TaxType==1">税入</template>
<template v-if="childItem.TaxType==2">税别</template>
</template>
</td>
<td>
<template v-if="(childItem.DMCState==1 || childItem.OPState==1) && childItem.SupplierId!=UserInfo.SupplierId"></template>
<template v-else>
<select class="rq_status" v-model='childItem.SupplierToDmcHotelStatus'
:placeholder="$t('pub.pleaseSel')">
<option label='请选择' :value='0'></option>
<option label='一般提醒' :value='1'></option>
<option label='重要提醒' :value='2'></option>
</select>
</template>
</td>
<td>
<template v-if="(childItem.DMCState==1 || childItem.OPState==1) && childItem.SupplierId!=UserInfo.SupplierId"></template>
<template v-else>
<textarea class="w135" cols="25" rows="5" v-model='childItem.SupplierToDmcRemarks'></textarea>
</template>
</td>
</tr>
<tr>
<td colspan="6">
<span style="display:inline-block;width:60px;vertical-align:top;">提示信息：</span>
<span style="display:inline-block;width:87%;"
:class="{'rq_disImNote':childItem.SupplierHotelStatus==1&&DateMinus(subItem.UseTimeStr)<=5,'rq_importNote':childItem.SupplierHotelStatus==2&&DateMinus(subItem.UseTimeStr)<=5}">{{childItem.Remarks}}</span>
</td>
</tr>
</template>
</tbody>
</template>
<tfoot>
<tr>
<td colspan="7">
<input type="button" value="保存" @click="saveSupplierjourneyorder(HotelList)"
class="normalBtn SaveR_Btn" />
</td>
</tr>
</tfoot>
</table>
<a class="hotelLink" slot="reference"
@click="getHotelList(item.TCID,item.NewCombinationNum)">酒店使用情况</a>
</el-popover>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="酒店信息" placement="top-start">
<el-popover placement="bottom" width="400" trigger="click" popper-class="rq_HotelDetails">
<table>
<tr>
<td class="SP_RemarkTitle">
对地接备注：
</td>
<td>
<el-input class='w320 SupplierRemarks' v-model='RemarkObj.SupplierToDmcRemarks' type='textarea'>
</el-input>
</td>
</tr>
<tr>
<td colspan="2">
<input type="button" value="保存" @click="saveSupplierToDmcRemarks" class="normalBtn SaveR_Btn" />
</td>
</tr>
</table>
<a class="hotelLink" slot="reference" @click="getClickItem(item)">备注</a>
</el-popover>
</el-tooltip>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -217,6 +99,117 @@ ...@@ -217,6 +99,117 @@
<i class="el-icon-arrow-up"></i> <i class="el-icon-arrow-up"></i>
</div> </div>
</transition> </transition>
<el-dialog custom-class='w800' title="酒店信息" :visible.sync="hotelUseDetail" center>
<table class="rq_HotelTable" v-loading="hotelLoading">
<tr>
<th width="120">
时间
</th>
<th width="150">
酒店
</th>
<th width="250">
价格
</th>
<th width="100">
税入/税别
</th>
<th width="100">提醒</th>
<th width="150">备注</th>
</tr>
<template v-for="(subItem,subIndex) in HotelList">
<tbody>
<template v-for="(childItem,childIndex) in subItem.HotelOrderList">
<tr>
<td style="text-align:center;" :rowspan="2">
第{{subIndex+1}}天 <br />
{{subItem.UseTimeStr}}
</td>
<td>
<template v-if="(childItem.DMCState==1 || childItem.OPState==1) && childItem.SupplierId!=UserInfo.SupplierId">业者自理</template>
<template v-else>
{{childItem.HotelName}}<br/>
<div class="rq_changeName">{{childItem.NewHotelName!=childItem.HotelName?'更换为:'+childItem.NewHotelName:""}}</div>
</template>
</td>
<td>
<template v-if="(childItem.DMCState==1 || childItem.OPState==1) && childItem.SupplierId!=UserInfo.SupplierId"></template>
<template v-else>
<template v-for="(detailsItem,detailsIndex) in childItem.OrderDetailsList"
v-if="detailsItem.HouseTypeCount>0">
<template v-if="detailsItem.HouseType==1">单间</template>
<template v-if="detailsItem.HouseType==2">标准双人间</template>
<template v-if="detailsItem.HouseType==3">大床房</template>
<template v-if="detailsItem.HouseType==4">三人间</template>
<template v-if="detailsItem.HouseType==4">司导间</template>
{{detailsItem.HouseTypeCount}} 间
价格: {{detailsItem.UnitPrice}}
返佣: {{detailsItem.RebateRatio}}
<br />
</template>
</template>
</td>
<td>
<template v-if="(childItem.DMCState==1 || childItem.OPState==1) && childItem.SupplierId!=UserInfo.SupplierId"></template>
<template v-else>
<template v-if="childItem.TaxType==1">税入</template>
<template v-if="childItem.TaxType==2">税别</template>
</template>
</td>
<td>
<template v-if="(childItem.DMCState==1 || childItem.OPState==1) && childItem.SupplierId!=UserInfo.SupplierId"></template>
<template v-else>
<select class="rq_status" v-model='childItem.SupplierToDmcHotelStatus'
:placeholder="$t('pub.pleaseSel')">
<option label='请选择' :value='0'></option>
<option label='一般提醒' :value='1'></option>
<option label='重要提醒' :value='2'></option>
</select>
</template>
</td>
<td>
<template v-if="(childItem.DMCState==1 || childItem.OPState==1) && childItem.SupplierId!=UserInfo.SupplierId"></template>
<template v-else>
<textarea class="w135" cols="25" rows="5" v-model='childItem.SupplierToDmcRemarks'></textarea>
</template>
</td>
</tr>
<tr>
<td colspan="6">
<span style="display:inline-block;width:60px;vertical-align:top;">提示信息：</span>
<span style="display:inline-block;width:87%;"
:class="{'rq_disImNote':childItem.SupplierHotelStatus==1&&DateMinus(subItem.UseTimeStr)<=5,'rq_importNote':childItem.SupplierHotelStatus==2&&DateMinus(subItem.UseTimeStr)<=5}">{{childItem.Remarks}}</span>
</td>
</tr>
</template>
</tbody>
</template>
</table>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn"
@click="hotelUseDetail = false">{{$t('pub.cancelBtn')}}</button> &nbsp;
<input type="button" value="保存" @click="saveSupplierjourneyorder(HotelList)" class="normalBtn" />
</div>
</el-dialog>
<el-dialog custom-class='w500' title="对地接备注" :visible.sync="dijieDialog" center>
<table>
<tr>
<td class="SP_RemarkTitle">
对地接备注：
</td>
<td>
<el-input class='w320 SupplierRemarks' v-model='RemarkObj.SupplierToDmcRemarks' type='textarea'>
</el-input>
</td>
</tr>
</table>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn"
@click="dijieDialog = false">{{$t('pub.cancelBtn')}}</button> &nbsp;
<input type="button" value="保存" @click="saveSupplierToDmcRemarks" class="normalBtn" />
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
...@@ -225,6 +218,8 @@ ...@@ -225,6 +218,8 @@
return { return {
loading: false, loading: false,
hotelLoading: false, hotelLoading: false,
hotelUseDetail:false,
dijieDialog:false,
total: 0, total: 0,
top:0, top:0,
msg: { msg: {
...@@ -294,6 +289,7 @@ ...@@ -294,6 +289,7 @@
this.hotelLoading = false; this.hotelLoading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(res.data.message) this.Success(res.data.message)
this.hotelUseDetail=false;
this.getList(); this.getList();
} else { } else {
this.Error(res.data.message) this.Error(res.data.message)
...@@ -313,7 +309,6 @@ ...@@ -313,7 +309,6 @@
} }
}) })
} }
console.log(this.dataList,'data');
} else { } else {
this.Error(res.data.message) this.Error(res.data.message)
} }
...@@ -350,9 +345,12 @@ ...@@ -350,9 +345,12 @@
}, },
//保存供应商对地接备注 //保存供应商对地接备注
saveSupplierToDmcRemarks() { saveSupplierToDmcRemarks() {
this.loading=true
this.ApiPost2('dmcstatistics_post_SetSupplierToDmcRemarksService', this.RemarkObj, res => { this.ApiPost2('dmcstatistics_post_SetSupplierToDmcRemarksService', this.RemarkObj, res => {
this.hotelLoading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.dijieDialog=false;
this.getList(); this.getList();
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
......
src/components/commonPage/fiveday.vue
View file @ 64f5b097
<template> <template>
<div class="block-item"> <div class="block-item">
<div class="one-block"> <div class="one-block">
<div> <div>
<table class="trip-title"> <table class="trip-title">
<tr>
<td class="day">
<h3>
第
<span v-if="dayNum<10">0</span>
{{dayNum}}天
</h3>
<p style="margin: 0;">{{day.dateTime}}</p>
</td>
<td class="desc" v-html="title"></td>
</tr>
</table>
<div class="five-box day_table">
<div class="left">
<div class="image">
<img v-if="day.details[0].img!='' && day.details[0].scenicJson"
:style="{'top':day.details[0].scenicJson.y+'px'}"
:src='compressImg(day.details[2].img, "filt", 663, "")' />
<img v-else :src='compressImg(day.details[2].img, "filt", 663, "")' />
</div>
<table class="day_table">
<tr> <tr>
<td class="day"> <td>
<h3> <div class="item">
第 <h4 v-html="day.details[0].title" @click.stop="goUrl(day.details[0].url)" style="cursor: pointer">
<span v-if="dayNum<10">0</span> </h4>
{{dayNum}}天 <div class="playInfo">
</h3> <span class="playInfo-item" v-if='day.details[0].ticketName!=""'>
<p style="margin: 0;">{{day.dateTime}}</p> <!--<i class="iconfont icon-menpiao"></i>-->
<!--{{day.details[0].ticketName}}-->
</span>
<span class="playInfo-item" v-if='day.details[0].playTimeHour || day.details[0].playTimeMinutes'>
<i class="iconfont icon-shijian1"></i>
约
<span v-if="day.details[0].playTimeHour">{{day.details[0].playTimeHour}} 小时</span>
<span v-if="day.details[0].playTimeMinutes">{{day.details[0].playTimeMinutes}} 分钟</span>
</span>
</div>
<div v-html="day.details[0].content" class="pp"></div>
</div>
</td> </td>
<td class="desc" v-html="title"></td>
</tr> </tr>
</table> </table>
<div class="five-box day_table">
<div class="left">
<div class="image">
<img v-if="day.details[0].img!='' && day.details[0].scenicJson" :style="{'top':day.details[0].scenicJson.y+'px'}" :src='compressImg(day.details[2].img, "filt", 663, "")' />
<img v-else :src='compressImg(day.details[2].img, "filt", 663, "")' />
</div>
<table class="day_table">
<tr>
<td>
<div class="item">
<h4 v-html="day.details[0].title" @click.stop="goUrl(day.details[0].url)" style="cursor: pointer" ></h4>
<div class="playInfo">
<span class="playInfo-item" v-if='day.details[0].ticketName!=""'>
<!--<i class="iconfont icon-menpiao"></i>-->
<!--{{day.details[0].ticketName}}-->
</span>
<span class="playInfo-item" v-if='day.details[0].playTimeHour || day.details[0].playTimeMinutes'>
<i class="iconfont icon-shijian1"></i>
约
<span v-if="day.details[0].playTimeHour">{{day.details[0].playTimeHour}} 小时</span>
<span v-if="day.details[0].playTimeMinutes">{{day.details[0].playTimeMinutes}} 分钟</span>
</span>
</div>
<div v-html="day.details[0].content" class="pp"></div>
</div>
</td>
</tr>
</table>
</div> </div>
<div class="right"> <div class="right">
<div class="fiveday"> <div class="fiveday">
<div v-for="(item,i) in day.details" v-if="i>0&&i<5" :key="i"> <div v-for="(item,i) in day.details" v-if="i>0&&i<5" :key="i">
<div class="item item5"> <div class="item item5">
<div class="upFour"> <div class="upFour">
<!-- <img :style="{'top':item.scenicJson.y+'px'}" :src="$commonUtils.replaceHttps(item.img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" /> --> <!-- <img :style="{'top':item.scenicJson.y+'px'}" :src="$commonUtils.replaceHttps(item.img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" /> -->
<img v-if="item.img!=''&& item.scenicJson" :style="{'top':item.scenicJson.y+'px'}" :src='compressImg(item.img, "filt", 663, "")' /> <img v-if="item.img!=''&& item.scenicJson" :style="{'top':item.scenicJson.y+'px'}"
<img v-else :src='compressImg(item.img, "filt", 663, "")' /> :src='compressImg(item.img, "filt", 663, "")' />
<img v-else :src='compressImg(item.img, "filt", 663, "")' />
</div> </div>
<div class="down"> <div class="down">
<h4 v-html="item.title" @click.stop="goUrl(item.url)" style="cursor: pointer" ></h4> <h4 v-html="item.title" @click.stop="goUrl(item.url)" style="cursor: pointer"></h4>
<div class="playInfo"> <div class="playInfo">
<span class="playInfo-item" v-if='item.ticketName!=""'> <span class="playInfo-item" v-if='item.ticketName!=""'>
<!--<i class="iconfont icon-menpiao"></i>--> <!--<i class="iconfont icon-menpiao"></i>-->
<!--{{item.ticketName}}--> <!--{{item.ticketName}}-->
</span> </span>
<span class="playInfo-item" v-if='item.playTimeHour || item.playTimeMinutes'> <span class="playInfo-item" v-if='item.playTimeHour || item.playTimeMinutes'>
<i class="iconfont icon-shijian1"></i> <i class="iconfont icon-shijian1"></i>
约 约
<span v-if="item.playTimeHour">{{item.playTimeHour}}小时 </span> <span v-if="item.playTimeHour">{{item.playTimeHour}}小时 </span>
<span v-if="item.playTimeMinutes">{{item.playTimeMinutes}}分钟</span> <span v-if="item.playTimeMinutes">{{item.playTimeMinutes}}分钟</span>
</span> </span>
</div> </div>
<div v-html="item.content" class="pp" style="height:120px;overflow:hidden;"></div> <div v-html="item.content" class="pp" style="height:120px;overflow:hidden;"></div>
</div> </div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="item day_tips" v-if='day.tips.length>0'>
<h4>温馨提示</h4>
<div>
<div v-for="(t,k) in day.tips" :key="k" v-html="t.content"></div>
</div> </div>
</div>
</div> </div>
<table> </div>
<tr class="restaurant"> </div>
<td width="95" valign="middle" class="key"> </div>
<img crossOrigin="Anonymous" src='../../assets/img/daily_breakfast.png' /> <div class="item day_tips" v-if='day.tips.length>0'>
</td> <h4>温馨提示</h4>
<td width="211" valign="middle" class="val">{{day.can.breakfirst}}</td> <div>
<td width="110" align="center" valign="middle" class="key"> <div v-for="(t,k) in day.tips" :key="k" v-html="t.content"></div>
<img crossOrigin="Anonymous" src='../../assets/img/daily_lunch.png' />
</td>
<td width="211" valign="middle" class="val">{{day.can.lanuch}}</td>
<td width="110" align="center" valign="middle" class="key">
<img crossOrigin="Anonymous" src='../../assets/img/daily_dinner.png' />
</td>
<td valign="middle" class="val">{{day.can.dinner}}</td>
</tr>
<tr class="restaurant">
<td colspan="6" height="15"></td>
</tr>
<tr class="restaurant">
<td valign="top" class="key">
<img crossOrigin="Anonymous" src='../../assets/img/daily_hotel-1.png' />
</td>
<td valign="middle" colspan="5" class="val" v-if='day.jiu2.length>0'>
<span v-for="(t,k) in day.jiu2" @click.stop="goUrl(t.url)" style="cursor: pointer" :key="k">
{{k==day.jiu2.length-1?t.name:t.name+' / '}}
</span>
{{getHotelSuffix()}}
</td>
<td valign="middle" colspan="5" class="val" v-else>本日无酒店安排</td>
</tr>
</table>
</div> </div>
</div>
<table>
<tr class="restaurant">
<td width="95" valign="middle" class="key">
<img crossOrigin="Anonymous" src='../../assets/img/daily_breakfast.png' />
</td>
<td width="211" valign="middle" class="val">{{day.can.breakfirst}}</td>
<td width="110" align="center" valign="middle" class="key">
<img crossOrigin="Anonymous" src='../../assets/img/daily_lunch.png' />
</td>
<td width="211" valign="middle" class="val">{{day.can.lanuch}}</td>
<td width="110" align="center" valign="middle" class="key">
<img crossOrigin="Anonymous" src='../../assets/img/daily_dinner.png' />
</td>
<td valign="middle" class="val">{{day.can.dinner}}</td>
</tr>
<tr class="restaurant">
<td colspan="6" height="15"></td>
</tr>
<tr class="restaurant">
<td valign="top" class="key">
<img crossOrigin="Anonymous" src='../../assets/img/daily_hotel-1.png' />
</td>
<td valign="middle" colspan="5" class="val" v-if='day.jiu2.length>0'>
<span v-for="(t,k) in day.jiu2" @click.stop="goUrl(t.url)" style="cursor: pointer" :key="k">
{{k==day.jiu2.length-1?t.name:t.name+' / '}}
</span>
{{getHotelSuffix()}}
</td>
<td valign="middle" colspan="5" class="val" v-else>本日无酒店安排</td>
</tr>
</table>
</div> </div>
</div>
</template> </template>
<script> <script>
export default { export default {
props: { props: {
day:{}, day: {},
isDirect:{}, isDirect: {},
title:{}, title: {},
dayNum:{} dayNum: {}
}, },
methods:{ methods: {
getHotelSuffix(){ getHotelSuffix() {
let suffix =""; let suffix = "";
if(this.day.jiu2.length>1){ if (this.day.jiu2.length > 1) {
if(this.isDirect===1){ if (this.isDirect === 1) {
suffix = "或同級" suffix = "或同級"
} }
}else{ } else {
if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){ if (this.day.jiu2.length == 1 && this.day.jiu2[0].name != '温馨的家') {
if(this.isDirect===1){ if (this.day.jiu2[0].status == 1) {
suffix = "【保证入住】"
} else {
if (this.isDirect === 1) {
suffix = "或同級"
}
}
} }
} }
} return suffix;
return suffix; },
}, goUrl(url) {
goUrl(url) { if (url != null && url.length > 0) {
if(url!=null&&url.length>0){ if (url.indexOf('http://') == -1 || url.indexOf('https://') == -1) {
if(url.indexOf('http://')==-1 || url.indexOf('https://')==-1){ url = 'http://' + url;
url='http://'+url; }
window.open(url, "_blank");
} }
window.open(url, "_blank");
} }
} }
} };
};
</script> </script>
src/components/commonPage/fourday.vue
View file @ 64f5b097
...@@ -137,9 +137,13 @@ export default { ...@@ -137,9 +137,13 @@ export default {
} }
}else{ }else{
if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){ if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){
if(this.isDirect===1){ if (this.day.jiu2[0].status == 1) {
suffix = "或同級" suffix = "【保证入住】"
} } else {
if (this.isDirect === 1) {
suffix = "或同級"
}
}
} }
} }
return suffix; return suffix;
......
src/components/commonPage/oneday.vue
View file @ 64f5b097
<template> <template>
<div class="block-item"> <div class="block-item">
<div class="one-block"> <div class="one-block">
<div> <div>
<table class="trip-title"> <table class="trip-title">
<tr> <tr>
<td class="day"> <td class="day">
<h3> <h3>
第 第
<span v-if="dayNum<10">0</span> <span v-if="dayNum<10">0</span>
{{dayNum}}天 {{dayNum}}天
</h3> </h3>
<p style="margin: 0;">{{day.dateTime}}</p> <p style="margin: 0;">{{day.dateTime}}</p>
</td> </td>
<td class="desc" v-html="title"></td> <td class="desc" v-html="title"></td>
</tr> </tr>
</table> </table>
<table class="day_table"> <table class="day_table">
<tr> <tr>
<td> <td>
<div class="item big" style='margin-bottom:20px;'> <div class="item big" style='margin-bottom:20px;'>
<div class="left"> <div class="left">
<img v-if="day.details[0].img!='' && day.details[0].scenicJson" :style="{'top':day.details[0].scenicJson.y+'px'}" :src='compressImg(day.details[0].img, "filt", 663, "")'/> <img v-if="day.details[0].img!='' && day.details[0].scenicJson"
<img v-else :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'" /> :style="{'top':day.details[0].scenicJson.y+'px'}"
<img v-else-if="day.dayNum==1 && day.details[0].img==''" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/nll.jpg'" /> :src='compressImg(day.details[0].img, "filt", 663, "")' />
<img v-else-if="day.islast && day.details[0].img==''" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/nll.jpg'" /> <img v-else :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'" />
<img v-else :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/activy.jpg'" /> <img v-else-if="day.dayNum==1 && day.details[0].img==''"
</div> :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/nll.jpg'" />
<div class="right"> <img v-else-if="day.islast && day.details[0].img==''"
<div class="details"> :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/nll.jpg'" />
<h4 v-html="day.details[0].title" @click.stop="goUrl(day.details[0].url)" style="cursor: pointer" ></h4> <img v-else :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/activy.jpg'" />
<div class="playInfo">
<span class="playInfo-item" v-if='day.details[0].ticketName!=""'>
<!--<i class="iconfont icon-menpiao"></i>-->
<!--{{day.details[0].ticketName}}-->
</span>
<span class="playInfo-item" v-if='day.details[0].playTimeHour || day.details[0].playTimeMinutes'>
<i class="iconfont icon-shijian1"></i>
约
<span v-if="day.details[0].playTimeHour">{{day.details[0].playTimeHour}}小时 </span>
<span v-if="day.details[0].playTimeMinutes">{{day.details[0].playTimeMinutes}}分钟 </span>
</span>
</div>
<div v-html="day.details[0].content" class="pp"></div>
</div>
</div>
</div>
</td>
</tr>
</table>
</div>
<div class="item day_tips" v-if='day.tips.length>0'>
<h4>温馨提示</h4>
<div>
<div v-for="(t,k) in day.tips" :key="k" v-html="t.content"></div>
</div> </div>
</div> <div class="right">
<table> <div class="details">
<tr class="restaurant"> <h4 v-html="day.details[0].title" @click.stop="goUrl(day.details[0].url)" style="cursor: pointer">
<td width="95" valign="middle" class="key"> </h4>
<img crossOrigin="Anonymous" src='../../assets/img/daily_breakfast.png' /> <div class="playInfo">
</td> <span class="playInfo-item" v-if='day.details[0].ticketName!=""'>
<td width="211" valign="middle" class="val">{{day.can.breakfirst}}</td> </span>
<td width="110" align="center" valign="middle" class="key"> <span class="playInfo-item" v-if='day.details[0].playTimeHour || day.details[0].playTimeMinutes'>
<img crossOrigin="Anonymous" src='../../assets/img/daily_lunch.png' /> <i class="iconfont icon-shijian1"></i>
</td> 约
<td width="211" valign="middle" class="val">{{day.can.lanuch}}</td> <span v-if="day.details[0].playTimeHour">{{day.details[0].playTimeHour}}小时 </span>
<td width="110" align="center" valign="middle" class="key"> <span v-if="day.details[0].playTimeMinutes">{{day.details[0].playTimeMinutes}}分钟 </span>
<img crossOrigin="Anonymous" src='../../assets/img/daily_dinner.png' /> </span>
</td> </div>
<td valign="middle" class="val">{{day.can.dinner}}</td> <div v-html="day.details[0].content" class="pp"></div>
</tr> </div>
<tr class="restaurant"> </div>
<td colspan="6" height="15"></td> </div>
</tr> </td>
<tr class="restaurant"> </tr>
<td valign="top" class="key"> </table>
<img crossOrigin="Anonymous" src='../../assets/img/daily_hotel-1.png' /> </div>
</td> <div class="item day_tips" v-if='day.tips.length>0'>
<td valign="middle" colspan="5" class="val" v-if='day.jiu2.length>0'> <h4>温馨提示</h4>
<span v-for="(t,k) in day.jiu2" @click.stop="goUrl(t.url)" style="cursor: pointer" :key="k"> <div>
{{k==day.jiu2.length-1?t.name:t.name+' / '}} <div v-for="(t,k) in day.tips" :key="k" v-html="t.content"></div>
</span>
{{getHotelSuffix()}}
</td>
<td valign="middle" colspan="5" class="val" v-else>本日无酒店安排</td>
</tr>
</table>
</div> </div>
</div>
<table>
<tr class="restaurant">
<td width="95" valign="middle" class="key">
<img crossOrigin="Anonymous" src='../../assets/img/daily_breakfast.png' />
</td>
<td width="211" valign="middle" class="val">{{day.can.breakfirst}}</td>
<td width="110" align="center" valign="middle" class="key">
<img crossOrigin="Anonymous" src='../../assets/img/daily_lunch.png' />
</td>
<td width="211" valign="middle" class="val">{{day.can.lanuch}}</td>
<td width="110" align="center" valign="middle" class="key">
<img crossOrigin="Anonymous" src='../../assets/img/daily_dinner.png' />
</td>
<td valign="middle" class="val">{{day.can.dinner}}</td>
</tr>
<tr class="restaurant">
<td colspan="6" height="15"></td>
</tr>
<tr class="restaurant">
<td valign="top" class="key">
<img crossOrigin="Anonymous" src='../../assets/img/daily_hotel-1.png' />
</td>
<td valign="middle" colspan="5" class="val" v-if='day.jiu2.length>0'>
<span v-for="(t,k) in day.jiu2" @click.stop="goUrl(t.url)" style="cursor: pointer" :key="k">
{{k==day.jiu2.length-1?t.name:t.name+' / '}}
</span>
{{getHotelSuffix()}}
</td>
<td valign="middle" colspan="5" class="val" v-else>本日无酒店安排</td>
</tr>
</table>
</div> </div>
</div>
</template> </template>
<script> <script>
export default { export default {
props: { props: {
day:{}, day: {},
isDirect:{}, isDirect: {},
title:{}, title: {},
dayNum:{} dayNum: {}
}, },
methods:{ methods: {
getHotelSuffix(){ getHotelSuffix() {
let suffix =""; let suffix = "";
if(this.day.jiu2.length>1){ if (this.day.jiu2.length > 1) {
if(this.isDirect===1){ if (this.isDirect === 1) {
suffix = "或同級"
}
}else{
if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){
if(this.isDirect===1){
suffix = "或同級" suffix = "或同級"
} }
} else {
if (this.day.jiu2.length == 1 && this.day.jiu2[0].name != '温馨的家') {
if (this.day.jiu2[0].status == 1) {
suffix = "【保证入住】"
} else {
if (this.isDirect === 1) {
suffix = "或同級"
}
}
}
} }
} return suffix;
return suffix; },
}, goUrl(url) {
goUrl(url) { if (url != null && url.length > 0) {
if(url!=null&&url.length>0){ if (url.indexOf('http://') == -1 || url.indexOf('https://') == -1) {
if(url.indexOf('http://')==-1 || url.indexOf('https://')==-1){ url = 'http://' + url;
url='http://'+url; }
window.open(url, "_blank");
} }
window.open(url, "_blank");
} }
} },
}, };
};
</script> </script>
src/components/commonPage/threeday.vue
View file @ 64f5b097
...@@ -177,9 +177,13 @@ export default { ...@@ -177,9 +177,13 @@ export default {
} }
}else{ }else{
if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){ if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){
if(this.isDirect===1){ if (this.day.jiu2[0].status == 1) {
suffix = "或同級" suffix = "【保证入住】"
} } else {
if (this.isDirect === 1) {
suffix = "或同級"
}
}
} }
} }
return suffix; return suffix;
......
src/components/commonPage/twoday.vue
View file @ 64f5b097
...@@ -104,9 +104,13 @@ export default { ...@@ -104,9 +104,13 @@ export default {
} }
}else{ }else{
if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){ if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){
if(this.isDirect===1){ if (this.day.jiu2[0].status == 1) {
suffix = "或同級" suffix = "【保证入住】"
} } else {
if (this.isDirect === 1) {
suffix = "或同級"
}
}
} }
} }
return suffix; return suffix;
......
src/components/confirmationOrderDownLoad.vue
View file @ 64f5b097
...@@ -749,7 +749,7 @@ ...@@ -749,7 +749,7 @@
// }, null) // }, null)
_this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum + _this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum +
'日游', isPc) '日游', isPc)
} else { } else {
this.ToWord(this.orderMsg.startDate + this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游', isPc) this.ToWord(this.orderMsg.startDate + this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游', isPc)
} }
...@@ -1182,8 +1182,11 @@ ...@@ -1182,8 +1182,11 @@
} }
jin.push(obj) jin.push(obj)
} else if (y.type == 3 && y.childItem.hotelName != '' && y.childItem.imaArray.length > 0) { } else if (y.type == 3 && y.childItem.hotelName != '' && y.childItem.imaArray.length > 0) {
//酒店
let obj = { let obj = {
title: y.childItem.hotelName, title: y.childItem.hotelName,
newTitle: y.childItem.newHotelName,
status: y.childItem.status,
content: y.childItem.description, content: y.childItem.description,
img: y.childItem.imaArray[0].url, img: y.childItem.imaArray[0].url,
ticketName: '', ticketName: '',
...@@ -1226,7 +1229,9 @@ ...@@ -1226,7 +1229,9 @@
if (y.type == 3) { if (y.type == 3) {
jiu2.push({ jiu2.push({
name: y.childItem.hotelName, name: y.childItem.hotelName,
url: y.childItem.url url: y.childItem.url,
newTitle: y.childItem.newHotelName,
status: y.childItem.status,
}); });
useDinnerTypeBy = y.childItem.useDinnerType useDinnerTypeBy = y.childItem.useDinnerType
} }
...@@ -1345,7 +1350,6 @@ ...@@ -1345,7 +1350,6 @@
threeday, threeday,
fourday, fourday,
fiveday, fiveday,
}, },
} }
......
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