Commit 40896afa authored by 黄奎's avatar 黄奎

页面修改

parent 5331126a
...@@ -7,9 +7,13 @@ ...@@ -7,9 +7,13 @@
.travelControlTrip .hangban-info tr th { .travelControlTrip .hangban-info tr th {
padding-left: 0 !important; padding-left: 0 !important;
} }
.travelControlTrip .WeiXinShare{
width:118px;position:relative;top:55px; .travelControlTrip .WeiXinShare {
width: 118px;
position: relative;
top: 55px;
} }
.travelControlTrip .el-dropdown { .travelControlTrip .el-dropdown {
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
...@@ -20,14 +24,17 @@ ...@@ -20,14 +24,17 @@
text-align: center; text-align: center;
border-radius: 4px; border-radius: 4px;
cursor: pointer; cursor: pointer;
margin-left:20px; margin-left: 20px;
} }
.travelControlDropDown .el-dropdown-menu__item{
width:156px; .travelControlDropDown .el-dropdown-menu__item {
} width: 156px;
.guoneiLine tbody td{ }
font-size:17px;
} .guoneiLine tbody td {
font-size: 17px;
}
</style> </style>
<template> <template>
...@@ -57,7 +64,7 @@ ...@@ -57,7 +64,7 @@
@click="gernalFeature(0)" /> @click="gernalFeature(0)" />
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版WORD" <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版WORD"
@click="gernalFeature(1)" /> --> @click="gernalFeature(1)" /> -->
<input type="button" value="新版行程" class="travelControlTripBtn" @click="goUrlView()"/> <input type="button" value="新版行程" class="travelControlTripBtn" @click="goUrlView()" />
<el-checkbox v-model="isShowTime">显示行程日期</el-checkbox> <el-checkbox v-model="isShowTime">显示行程日期</el-checkbox>
<a class="travelControlTripBtn" v-if="priceList.length>0&& priceList[0].wordPath!=''" style="display:inline-block;text-decoration:none; <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;" width:135px;text-align:center;line-height:30px;font-size:13px;position:relative;top:2px;"
...@@ -75,15 +82,12 @@ ...@@ -75,15 +82,12 @@
<el-option label="日本趣味滑雪乐" :value="-5"></el-option> <el-option label="日本趣味滑雪乐" :value="-5"></el-option>
<el-option label="湄公之畔,悠哉老挝" :value="-6"></el-option> <el-option label="湄公之畔,悠哉老挝" :value="-6"></el-option>
<el-option label="印象日本·严选酒店<舒适体验·品质服务>" :value="-7"></el-option> <el-option label="印象日本·严选酒店<舒适体验·品质服务>" :value="-7"></el-option>
<el-option <el-option v-for="item in titleList" :key="item.subCode" :label="item.title" :value="item.id">
v-for="item in titleList"
:key="item.subCode"
:label="item.title"
:value="item.id">
</el-option> </el-option>
</el-select> </el-select>
<input type="button" style="width: auto !important;background: rgb(0, 198, 255);border:1px solid rgb(0, 198, 255);outline:none" class="travelControlTripBtn" value="预览" <input type="button"
@click="yuLan" /> style="width: auto !important;background: rgb(0, 198, 255);border:1px solid rgb(0, 198, 255);outline:none"
class="travelControlTripBtn" value="预览" @click="yuLan" />
<input type="button" style="width: auto !important;outline:none" class="travelControlTripBtn" value="下载" <input type="button" style="width: auto !important;outline:none" class="travelControlTripBtn" value="下载"
@click="DownloadJuanmSaid" /> @click="DownloadJuanmSaid" />
</el-col> </el-col>
...@@ -175,8 +179,14 @@ ...@@ -175,8 +179,14 @@
<td> <td>
<div class="collection-item clearfix"> <div class="collection-item clearfix">
<div><img src="../assets/img/TravelControlTripIcon11.png" />机场服务</div> <div><img src="../assets/img/TravelControlTripIcon11.png" />机场服务</div>
<span>{{orderTripdiff!=null ? orderTripdiff.airportService : orderMsg.airportServicePerson+"/"+ <span>
orderMsg.airportServicePhone}}</span> <template v-if="orderTripdiff&&orderTripdiff.airportService&&orderTripdiff.airportService!=''">
{{orderTripdiff.airportService}}
</template>
<template v-else-if="orderMsg&&orderMsg.airportServicePerson&&orderMsg.airportServicePerson!=''">
{{orderMsg.airportServicePerson+"/"+ orderMsg.airportServicePhone}}
</template>
</span>
</div> </div>
</td> </td>
<td> <td>
...@@ -193,10 +203,11 @@ ...@@ -193,10 +203,11 @@
<div><img src="../assets/img/TravelControlTripIcon13.png" />紧急联系人</div> <div><img src="../assets/img/TravelControlTripIcon13.png" />紧急联系人</div>
<template> <template>
<span v-if='vshowLLR'> <span v-if='vshowLLR'>
<template v-if="orderTripdiff!=null&&orderTripdiff.emergencyContact!=''"> <template v-if="orderTripdiff&&orderTripdiff.emergencyContact!=''">
{{orderTripdiff.emergencyContact}} {{orderTripdiff.emergencyContact}}
</template> </template>
<template v-else-if="orderMsg.branchManager!=''&&orderMsg.mobilePhone!=''"> <template
v-else-if="orderMsg.branchManager&&orderMsg.branchManager!=''&&orderMsg.mobilePhone&&orderMsg.mobilePhone!=''">
{{orderMsg.branchManager+"/"+orderMsg.mobilePhone}} {{orderMsg.branchManager+"/"+orderMsg.mobilePhone}}
</template> </template>
<template v-else-if="orderMsg.sellName!=''&&orderMsg.sellTel!=''"> <template v-else-if="orderMsg.sellName!=''&&orderMsg.sellTel!=''">
...@@ -222,7 +233,8 @@ ...@@ -222,7 +233,8 @@
<div class="english-title">Flight situation</div> <div class="english-title">Flight situation</div>
</div> </div>
<div v-if='vshowB' class="hangban-info"> <div v-if='vshowB' class="hangban-info">
<table border="0" align="center" cellpadding="0" cellspacing="0" class="flight_th" :class="{'guoneiLine':lineId==90}"> <table border="0" align="center" cellpadding="0" cellspacing="0" class="flight_th"
:class="{'guoneiLine':lineId==90}">
<tbody> <tbody>
<tr> <tr>
<td width="140">出发时间<span>(当地)</span></td> <td width="140">出发时间<span>(当地)</span></td>
...@@ -692,16 +704,16 @@ ...@@ -692,16 +704,16 @@
export default { export default {
data() { data() {
return { return {
isShowTime:true, isShowTime: true,
CurrentUserInfo:{},//当前用户信息 CurrentUserInfo: {}, //当前用户信息
Typevalue:-1, Typevalue: -1,
titleList:[], titleList: [],
listMsg:{ listMsg: {
pageSize:1000, pageSize: 1000,
pageIndex:1, pageIndex: 1,
}, },
//微信分享图片 //微信分享图片
WeiXinShareImgSrc:"", WeiXinShareImgSrc: "",
//下拉框默认值 //下拉框默认值
defaultSelectValue: 0, defaultSelectValue: 0,
//航空公司下拉 //航空公司下拉
...@@ -755,7 +767,7 @@ ...@@ -755,7 +767,7 @@
title: '', title: '',
isDirect: 1, //是否是直采 0:否,1:是 isDirect: 1, //是否是直采 0:否,1:是
isClick: this.$route.query.isClick === undefined ? 0 : 1, //不算统计 isClick: this.$route.query.isClick === undefined ? 0 : 1, //不算统计
lineId:0 lineId: 0
} }
}, },
mounted() { mounted() {
...@@ -771,34 +783,34 @@ ...@@ -771,34 +783,34 @@
this.getDataList(); this.getDataList();
}, },
methods: { methods: {
DownloadJuanmSaid(){ DownloadJuanmSaid() {
let title="行程补充说明:"; let title = "行程补充说明:";
if(this.Typevalue==-1){ if (this.Typevalue == -1) {
title+="日本寻秋意赏枫季" title += "日本寻秋意赏枫季"
} }
if(this.Typevalue==-2){ if (this.Typevalue == -2) {
title+="仲夏花火夜" title += "仲夏花火夜"
} }
if(this.Typevalue==-3){ if (this.Typevalue == -3) {
title+="寻觅日本美食" title += "寻觅日本美食"
} }
if(this.Typevalue==-4){ if (this.Typevalue == -4) {
title+="邂逅北海道的雪" title += "邂逅北海道的雪"
} }
if(this.Typevalue==-5){ if (this.Typevalue == -5) {
title+="日本趣味滑雪乐" title += "日本趣味滑雪乐"
} }
if(this.Typevalue==-6){ if (this.Typevalue == -6) {
title+="湄公之畔,悠哉老挝" title += "湄公之畔,悠哉老挝"
} }
if(this.Typevalue==-7){ if (this.Typevalue == -7) {
title+="印象日本·严选酒店<舒适体验·品质服务>" title += "印象日本·严选酒店<舒适体验·品质服务>"
} }
if(this.Typevalue>0){ if (this.Typevalue > 0) {
this.titleList.forEach(item=>{ this.titleList.forEach(item => {
if(item.id==this.Typevalue){ if (item.id == this.Typevalue) {
title+=item.title; title += item.title;
} }
}) })
} }
...@@ -812,7 +824,9 @@ ...@@ -812,7 +824,9 @@
method: 'post', method: 'post',
url: urlObj.DomainUrl + '/api/file/DownLoadJuanSaid', url: urlObj.DomainUrl + '/api/file/DownLoadJuanSaid',
data: { data: {
"msg": {id:this.Typevalue} "msg": {
id: this.Typevalue
}
} }
}).then(res => { }).then(res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
...@@ -832,42 +846,35 @@ ...@@ -832,42 +846,35 @@
}) })
}, },
yuLan(){ yuLan() {
if(this.Typevalue==-1){ if (this.Typevalue == -1) {
window.open("http://www.oytour.com/#/FoodImg2"); window.open("http://www.oytour.com/#/FoodImg2");
} } else if (this.Typevalue == -2) {
else if(this.Typevalue==-2){
window.open("http://www.oytour.com/#/Fire"); window.open("http://www.oytour.com/#/Fire");
} } else if (this.Typevalue == -3) {
else if(this.Typevalue==-3){
window.open("http://www.oytour.com/#/FoodImg"); window.open("http://www.oytour.com/#/FoodImg");
} } else if (this.Typevalue == -4) {
else if(this.Typevalue==-4){
window.open("http://www.oytour.com/#/FoodImg4"); window.open("http://www.oytour.com/#/FoodImg4");
} } else if (this.Typevalue == -5) {
else if(this.Typevalue==-5){
window.open("http://www.oytour.com/#/Juanski"); window.open("http://www.oytour.com/#/Juanski");
} } else if (this.Typevalue == -6) {
else if(this.Typevalue==-6){
window.open("http://www.oytour.com/#/Laowo"); window.open("http://www.oytour.com/#/Laowo");
} } else if (this.Typevalue == -7) {
else if(this.Typevalue==-7){
window.open("http://www.oytour.com/#/JapanHotel"); window.open("http://www.oytour.com/#/JapanHotel");
} } else {
else{ window.open("http://www.oytour.com/#/JuanDetails?id=" + this.Typevalue);
window.open("http://www.oytour.com/#/JuanDetails?id="+this.Typevalue);
} }
}, },
// 获取标题 // 获取标题
getDataList(){ getDataList() {
this.apiJavaPost('/api/rssarticle/getArticleList',this.listMsg,res=>{ this.apiJavaPost('/api/rssarticle/getArticleList', this.listMsg, res => {
if(res.data.resultCode==1){ if (res.data.resultCode == 1) {
let data=res.data.data.pageData.list; let data = res.data.data.pageData.list;
this.titleList=data; this.titleList = data;
}else{ } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
},null) }, null)
}, },
//获取微信二维码 //获取微信二维码
getWxCode: function () { getWxCode: function () {
...@@ -875,7 +882,7 @@ ...@@ -875,7 +882,7 @@
TCID: this.$route.query.tcid TCID: this.$route.query.tcid
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.WeiXinShareImgSrc=res.data.data; this.WeiXinShareImgSrc = res.data.data;
} }
}, err => {}) }, err => {})
}, },
...@@ -1087,7 +1094,7 @@ ...@@ -1087,7 +1094,7 @@
//模板参数 //模板参数
templateId: this.showType, templateId: this.showType,
//用户Id //用户Id
UId:this.getLocalStorage().EmployeeId UId: this.getLocalStorage().EmployeeId
}; };
this.$http({ this.$http({
headers: { headers: {
...@@ -1100,7 +1107,7 @@ ...@@ -1100,7 +1107,7 @@
} }
}).then(res => { }).then(res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
let sign = title+"V3" let sign = title + "V3"
const a = document.createElement('a'); const a = document.createElement('a');
a.setAttribute('download', ''); a.setAttribute('download', '');
a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign + a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign +
...@@ -1160,7 +1167,7 @@ ...@@ -1160,7 +1167,7 @@
//模板参数 //模板参数
templateId: this.showType, templateId: this.showType,
//用户Id //用户Id
UId:this.getLocalStorage().EmployeeId UId: this.getLocalStorage().EmployeeId
}; };
this.$http({ this.$http({
headers: { headers: {
...@@ -1173,7 +1180,7 @@ ...@@ -1173,7 +1180,7 @@
} }
}).then(res => { }).then(res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
let sign = title+"V2" let sign = title + "V2"
const a = document.createElement('a'); const a = document.createElement('a');
a.setAttribute('download', ''); a.setAttribute('download', '');
a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign + a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign +
...@@ -1229,7 +1236,7 @@ ...@@ -1229,7 +1236,7 @@
//模板参数 //模板参数
templateId: this.showType, templateId: this.showType,
//用户Id //用户Id
UId:this.getLocalStorage().EmployeeId UId: this.getLocalStorage().EmployeeId
}; };
this.GetLocalFile("DownLoadTripWord", msg, title + ".doc", res => { this.GetLocalFile("DownLoadTripWord", msg, title + ".doc", res => {
this.pdfLoading = false this.pdfLoading = false
...@@ -1278,7 +1285,7 @@ ...@@ -1278,7 +1285,7 @@
//模板参数 //模板参数
templateId: this.showType, templateId: this.showType,
//用户Id //用户Id
UId:this.getLocalStorage().EmployeeId UId: this.getLocalStorage().EmployeeId
}; };
let urlObj = this.domainManager(); let urlObj = this.domainManager();
this.$http({ this.$http({
...@@ -1292,7 +1299,7 @@ ...@@ -1292,7 +1299,7 @@
} }
}).then(res => { }).then(res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
let sign = title+"V2" let sign = title + "V2"
const a = document.createElement('a'); const a = document.createElement('a');
a.setAttribute('download', ''); a.setAttribute('download', '');
a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign + a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign +
...@@ -1321,7 +1328,7 @@ ...@@ -1321,7 +1328,7 @@
cityId: this.$route.query.cityId, cityId: this.$route.query.cityId,
tcid: this.$route.query.tcid, tcid: this.$route.query.tcid,
orderId: this.$route.query.orderId, orderId: this.$route.query.orderId,
isClick:this.isClick//不算统计 isClick: this.isClick //不算统计
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = (res.data.data); let data = (res.data.data);
...@@ -1667,7 +1674,7 @@ ...@@ -1667,7 +1674,7 @@
} }
}, },
//跳转至预览 //跳转至预览
goUrlView(){ goUrlView() {
let routeData = this.$router.resolve({ let routeData = this.$router.resolve({
name: 'newConfimationOrder', name: 'newConfimationOrder',
query: { query: {
......
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