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
Show 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 @@
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;">
<tr>
<th>账户分类 收支冲抵</th>
<th>账户分类</th>
<th>付款方式</th>
<th>账户</th>
<!-- <th width="100px">账户余额</th> -->
......
src/components/Hotel/roomReservations.vue
View file @ 64f5b097
......@@ -117,7 +117,7 @@
<th>备注</th>
</tr>
<tr v-if="list.length==0">
<td colspan="10">暂无数据</td>
<td colspan="11">暂无数据</td>
</tr>
<tbody v-for="(outItem,outindex) in list" :class="{roomReservationsSplitTrCss:outindex%2!=0}">
<template v-for="(item,index) in outItem.StaticsReportList">
......
src/components/Hotel/roomReservationsDetails.vue
View file @ 64f5b097
......@@ -5,6 +5,12 @@
margin: 5px auto;
font-size: 12px;
}
.rq_importNote {
color: red;
}
.rq_disImNote {
color: #ea6d6d;
}
</style>
......@@ -294,7 +300,9 @@
<tr v-if="subItem.SupplierToDmcRemarks">
<td width="70" style="text-align:right;">供应商对地接备注：</td>
<td>
<span :class="{'rq_disImNote':subItem.SupplierToDmcHotelStatus==1&&DateMinus(subItem.SupplierToDmcHotelStatusTime)<=5,'rq_importNote':subItem.SupplierToDmcHotelStatus==2&&DateMinus(subItem.SupplierToDmcHotelStatusTime)<=5}">
{{subItem.SupplierToDmcRemarks}}
</span>
</td>
</tr>
</table>
......@@ -330,6 +338,7 @@
</div>
</template>
<script>
import moment from 'moment'
import comCheckHotel from "../commonPage/comCheckHotel.vue";
export default {
data() {
......@@ -388,6 +397,14 @@
let str = `comCheckHotel${index}${subIndex}`
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) {
this.checkedIndex = index
this.checkedsubIndex = subIndex
......@@ -528,6 +545,7 @@
})
});
this.list = list;
console.log(this.list,'listttt');
this.$forceUpdate();
}
} else {
......
src/components/Supplier/roomQuery2.vue
View file @ 64f5b097
......@@ -65,8 +65,42 @@
{{item.LeaderName}} <template v-if="item.LeaderTel">(电话: {{item.LeaderTel}})</template>
</td>
<td>
<el-tooltip class="item" effect="dark" content="酒店信息" placement="top-start">
<el-popover placement="bottom" width="800" trigger="click" popper-class="rq_HotelDetails">
<a class="hotelLink" slot="reference" @click="getHotelList(item.TCID,item.NewCombinationNum),hotelUseDetail=true">酒店使用情况</a>
<a class="hotelLink" slot="reference" @click="getClickItem(item),dijieDialog=true">备注</a>
</td>
</tr>
<tr>
<td colspan="8" style="text-align:left;padding-left:5px;">
<div class="rq_remark" v-if="item.IsBookTeam==2&&item.Numbers>=0">
<span class="rq_reSpan">取消团体提醒</span>
<span class="rQ_HtList">
<span v-for="subItem in item.Numbers"></span>
</span>
</div>
<div class="rq_remark" v-if="item.SupplierHotelStatus==1||item.SupplierHotelStatus==2&&item.Numbers>=0">
<span class="rq_reSpan">酒店提醒</span>
<span class="rQ_HTremark">
<span v-for="subItem in item.Numbers"></span>
</span>
</div>
<div><span class="rq_reSpan">注意事项</span> {{item.SupplierRemarks}}</div>
</td>
</tr>
<tr>
<td colspan="8" style="text-align:left;padding-left:5px;">
对地接备注： {{item.SupplierToDmcRemarks}}
</td>
</tr>
</tbody>
</table>
</div>
<transition name="el-zoom-in-top">
<div class="page-component-up" v-show="top>100" @click="goTop">
<i class="el-icon-arrow-up"></i>
</div>
</transition>
<el-dialog custom-class='w800' title="酒店信息" :visible.sync="hotelUseDetail" center>
<table class="rq_HotelTable" v-loading="hotelLoading">
<tr>
<th width="120">
......@@ -151,21 +185,14 @@
</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">
<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">
......@@ -176,47 +203,13 @@
</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>
</tr>
<tr>
<td colspan="8" style="text-align:left;padding-left:5px;">
<div class="rq_remark" v-if="item.IsBookTeam==2&&item.Numbers>=0">
<span class="rq_reSpan">取消团体提醒</span>
<span class="rQ_HtList">
<span v-for="subItem in item.Numbers"></span>
</span>
</div>
<div class="rq_remark" v-if="item.SupplierHotelStatus==1||item.SupplierHotelStatus==2&&item.Numbers>=0">
<span class="rq_reSpan">酒店提醒</span>
<span class="rQ_HTremark">
<span v-for="subItem in item.Numbers"></span>
</span>
</div>
<div><span class="rq_reSpan">注意事项</span> {{item.SupplierRemarks}}</div>
</td>
</tr>
<tr>
<td colspan="8" style="text-align:left;padding-left:5px;">
对地接备注： {{item.SupplierToDmcRemarks}}
</td>
</tr>
</tbody>
</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>
<transition name="el-zoom-in-top">
<div class="page-component-up" v-show="top>100" @click="goTop">
<i class="el-icon-arrow-up"></i>
</div>
</transition>
</el-dialog>
</div>
</template>
<script>
......@@ -225,6 +218,8 @@
return {
loading: false,
hotelLoading: false,
hotelUseDetail:false,
dijieDialog:false,
total: 0,
top:0,
msg: {
......@@ -294,6 +289,7 @@
this.hotelLoading = false;
if (res.data.resultCode == 1) {
this.Success(res.data.message)
this.hotelUseDetail=false;
this.getList();
} else {
this.Error(res.data.message)
......@@ -313,7 +309,6 @@
}
})
}
console.log(this.dataList,'data');
} else {
this.Error(res.data.message)
}
......@@ -350,9 +345,12 @@
},
//保存供应商对地接备注
saveSupplierToDmcRemarks() {
this.loading=true
this.ApiPost2('dmcstatistics_post_SetSupplierToDmcRemarksService', this.RemarkObj, res => {
this.hotelLoading = false;
this.loading = false;
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.dijieDialog=false;
this.getList();
} else {
this.Error(res.data.message);
......
src/components/commonPage/fiveday.vue
View file @ 64f5b097
......@@ -18,14 +18,17 @@
<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-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>
<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>-->
......@@ -52,12 +55,13 @@
<div class="item item5">
<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 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'}"
:src='compressImg(item.img, "filt", 663, "")' />
<img v-else :src='compressImg(item.img, "filt", 663, "")' />
</div>
<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">
<span class="playInfo-item" v-if='item.ticketName!=""'>
<!--<i class="iconfont icon-menpiao"></i>-->
......@@ -119,37 +123,42 @@
</div>
</template>
<script>
export default {
export default {
props: {
day:{},
isDirect:{},
title:{},
dayNum:{}
day: {},
isDirect: {},
title: {},
dayNum: {}
},
methods:{
getHotelSuffix(){
let suffix ="";
if(this.day.jiu2.length>1){
if(this.isDirect===1){
methods: {
getHotelSuffix() {
let suffix = "";
if (this.day.jiu2.length > 1) {
if (this.isDirect === 1) {
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 = "或同級"
}
}else{
if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){
if(this.isDirect===1){
}
}
}
return suffix;
},
goUrl(url) {
if(url!=null&&url.length>0){
if(url.indexOf('http://')==-1 || url.indexOf('https://')==-1){
url='http://'+url;
if (url != null && url.length > 0) {
if (url.indexOf('http://') == -1 || url.indexOf('https://') == -1) {
url = 'http://' + url;
}
window.open(url, "_blank");
}
}
}
};
};
</script>
src/components/commonPage/fourday.vue
View file @ 64f5b097
......@@ -137,11 +137,15 @@ export default {
}
}else{
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;
},
goUrl(url) {
......
src/components/commonPage/oneday.vue
View file @ 64f5b097
......@@ -21,19 +21,22 @@
<td>
<div class="item big" style='margin-bottom:20px;'>
<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"
:style="{'top':day.details[0].scenicJson.y+'px'}"
:src='compressImg(day.details[0].img, "filt", 663, "")' />
<img v-else :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'" />
<img v-else-if="day.dayNum==1 && day.details[0].img==''" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/nll.jpg'" />
<img v-else-if="day.islast && day.details[0].img==''" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/nll.jpg'" />
<img v-else-if="day.dayNum==1 && day.details[0].img==''"
:src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/nll.jpg'" />
<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/PictureMaterial/Web/activy.jpg'" />
</div>
<div class="right">
<div class="details">
<h4 v-html="day.details[0].title" @click.stop="goUrl(day.details[0].url)" style="cursor: pointer" ></h4>
<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>
......@@ -91,37 +94,42 @@
</div>
</template>
<script>
export default {
export default {
props: {
day:{},
isDirect:{},
title:{},
dayNum:{}
day: {},
isDirect: {},
title: {},
dayNum: {}
},
methods:{
getHotelSuffix(){
let suffix ="";
if(this.day.jiu2.length>1){
if(this.isDirect===1){
methods: {
getHotelSuffix() {
let suffix = "";
if (this.day.jiu2.length > 1) {
if (this.isDirect === 1) {
suffix = "或同級"
}
}else{
if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){
if(this.isDirect===1){
} 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;
},
goUrl(url) {
if(url!=null&&url.length>0){
if(url.indexOf('http://')==-1 || url.indexOf('https://')==-1){
url='http://'+url;
if (url != null && url.length > 0) {
if (url.indexOf('http://') == -1 || url.indexOf('https://') == -1) {
url = 'http://' + url;
}
window.open(url, "_blank");
}
}
},
};
};
</script>
src/components/commonPage/threeday.vue
View file @ 64f5b097
......@@ -177,11 +177,15 @@ export default {
}
}else{
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;
},
goUrl(url) {
......
src/components/commonPage/twoday.vue
View file @ 64f5b097
......@@ -104,11 +104,15 @@ export default {
}
}else{
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;
},
goUrl(url) {
......
src/components/confirmationOrderDownLoad.vue
View file @ 64f5b097
......@@ -1182,8 +1182,11 @@
}
jin.push(obj)
} else if (y.type == 3 && y.childItem.hotelName != '' && y.childItem.imaArray.length > 0) {
//酒店
let obj = {
title: y.childItem.hotelName,
newTitle: y.childItem.newHotelName,
status: y.childItem.status,
content: y.childItem.description,
img: y.childItem.imaArray[0].url,
ticketName: '',
......@@ -1226,7 +1229,9 @@
if (y.type == 3) {
jiu2.push({
name: y.childItem.hotelName,
url: y.childItem.url
url: y.childItem.url,
newTitle: y.childItem.newHotelName,
status: y.childItem.status,
});
useDinnerTypeBy = y.childItem.useDinnerType
}
......@@ -1345,7 +1350,6 @@
threeday,
fourday,
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