Skip to content

S
SuperMan
Commit 71d529bc authored by 黄奎's avatar 黄奎
Browse files
Options

开团列表新增行程预览和下载

parent d4bd0b61
Hide whitespace changes
Inline Side-by-side
Showing with 125 additions and 60 deletions
src/components/TravelManager/TravelList/OpTripList.vue
View file @ 71d529bc
......@@ -103,6 +103,8 @@
<div class="d7">
<el-button @click="goToOpenTravel('TravelManager2',item.ID)" type="primary">{{$t('Operation.Op_tripUpdate')}}</el-button>
<el-button @click="copyTravelInfo(item.ID)" type="primary">{{$t('Operation.Op_tripCopy')}}</el-button>
<el-button @click="goUrlR('confirmationOrderDownLoad',item)" type="primary">{{$t('Operation.Op_tripDownLoad')}}</el-button>
<el-button style="display:none;" @click="goB2B(item.ID, 0)" type="primary">{{$t('Operation.Op_b2bView')}}</el-button>
<el-button v-if="item.TCNUMS==''" @click="delConfig(item.ID)" type="primary">{{$t('system.table_delete')}}</el-button>
</div>
</div>
......@@ -157,6 +159,8 @@
StartGroupDate: "",
EndGroupDate: "",
},
//当前登录人员信息
CurrentUserInfo:{},
remarkMsg: {
TCID: 0,
OPRemark: "",
......@@ -326,12 +330,44 @@
err => {}
);
},
goB2B(ConfigId, tcid) {
var B2BDomain = this.CurrentUserInfo.B2BDomain;
var url="http://192.168.2.214:8084";
url="http://www.oytour.com";
window.open(
url+'/#/detailTwo/' +
encodeURIComponent(ConfigId) + '/' + tcid +
'/preview',
'_blank'
)
},
goUrlR(path, item) {
var cityId = item.StartCityID
if (item.IsUnion == 1 && item.UnionTypeStr == 2) {
cityId = item.UnionCityId
}
let routeData = this.$router.resolve({
name: path,
query: {
configId: item.ID,
cityId: cityId,
tcid: 0,
orderId: 0,
vshowL: false,
vshowM: false,
vshowTCNUM: true,
}
})
window.open(routeData.href, '_blank')
}
},
mounted() {
this.getEmployeeList();
this.getLineList();
},
created() {
let userInfo = this.getLocalStorage()
this.CurrentUserInfo = userInfo;
this.getControlList();
},
};
......
src/components/confirmationOrderDownLoad.vue
View file @ 71d529bc
<style>
.confirmOrder{
width:950px;
.confirmOrder {
width: 950px;
}
.travelControlTrip .hangban-info tr td,.travelControlTrip .hangban-info tr th{
.travelControlTrip .hangban-info tr td,
.travelControlTrip .hangban-info tr th {
padding-left: 0 !important;
}
</style>
<template>
<div class="travelControlTrip detail-box">
<div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div>
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版PDF" @click="toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载手机版WORD" @click="gernalFeature(0)" />
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版WORD" @click="gernalFeature(1)" />
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版PDF"
@click="toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载手机版WORD"
@click="gernalFeature(0)" />
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版WORD"
@click="gernalFeature(1)" />
<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>
width:135px;text-align:center;line-height:30px;font-size:13px;position:relative;top:2px;"
:href="domainManager().ViittoFileUrl+priceList[0].wordPath">下载WORD行程</a>
<!-- ToWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游') -->
<!--&&isopOperation HK 注释 可以让销售修改基本信息-->
<input type="button" v-if="orderId>0" class="travelControlTripBtn" value="修改信息" @click="editMsgShow=true" />
......@@ -22,7 +29,8 @@
<div id='pdfDom' style="padding:0 20px;">
<div id="pdf_1">
<div class="logo-div">
<img :src="vshowJ===true? domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/headerImg.jpg':domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/headerImg2.jpg'">
<img
:src="vshowJ===true? domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/headerImg.jpg':domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/headerImg2.jpg'">
</div>
<div class="website">
<div class="website-line"></div>
......@@ -157,10 +165,13 @@
</table>
<div class="_hangban_line"></div>
<table border="0" align="center" cellspacing="0" cellpadding="0" class="flight_list">
<tbody v-if="orderTripdiff&&orderTripdiff.travelOrderFlightList&& orderTripdiff.travelOrderFlightList.length>0">
<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>&nbsp;<span class="num">{{flight.departureTime}}</span></td>
<td width="160"><span class="nth-day">{{flight.arriveDate.substring(5)}}</span>&nbsp;<span class="num">{{flight.arrivalTime}}</span></td>
<td width="140"><span class="nth-day">{{flight.startDate.substring(5)}}</span>&nbsp;<span
class="num">{{flight.departureTime}}</span></td>
<td width="160"><span class="nth-day">{{flight.arriveDate.substring(5)}}</span>&nbsp;<span
class="num">{{flight.arrivalTime}}</span></td>
<td width="160">{{flight.departureAirPortName}}<span class="citycode"></span></td>
<td width="18" class="gap">&nbsp;</td>
<td width="160">{{flight.arrivalAirPortName}}<span class="citycode"></span></td>
......@@ -173,8 +184,10 @@
</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>&nbsp;<span class="num">{{flight.departureTime}}</span></td>
<td width="160"><span class="nth-day">{{flight.arriveDate.substring(5)}}</span>&nbsp;<span class="num">{{flight.arrivalTime}}</span></td>
<td width="140"><span class="nth-day">{{flight.startDate.substring(5)}}</span>&nbsp;<span
class="num">{{flight.departureTime}}</span></td>
<td width="160"><span class="nth-day">{{flight.arriveDate.substring(5)}}</span>&nbsp;<span
class="num">{{flight.arrivalTime}}</span></td>
<td width="160">{{flight.departureAirPortName}}<span class="citycode"></span></td>
<td width="18" class="gap">&nbsp;</td>
<td width="160">{{flight.arrivalAirPortName}}<span class="citycode"></span></td>
......@@ -199,20 +212,23 @@
<table>
<tbody>
<tr>
<td @click="showImg(feature.featureImgList),initialIndex=index" v-for="(i,index) in feature.featureImgList"
:key="index" v-if="index<3" :style="{background:'url(' + i.url + ') no-repeat bottom left/100% auto'}">
<td @click="showImg(feature.featureImgList),initialIndex=index"
v-for="(i,index) in feature.featureImgList" :key="index" v-if="index<3"
:style="{background:'url(' + i.url + ') no-repeat bottom left/100% auto'}">
&nbsp;
</td>
</tr>
<tr>
<td @click="showImg(feature.featureImgList),initialIndex=index" v-for="(i,index) in feature.featureImgList"
:key="index" v-if="index>2&&index<6" :style="{background:'url(' + i.url + ') no-repeat bottom left/100% auto'}">
<td @click="showImg(feature.featureImgList),initialIndex=index"
v-for="(i,index) in feature.featureImgList" :key="index" v-if="index>2&&index<6"
:style="{background:'url(' + i.url + ') no-repeat bottom left/100% auto'}">
&nbsp;
</td>
</tr>
<tr>
<td @click="showImg(feature.featureImgList),initialIndex=index" v-for="(i,index) in feature.featureImgList"
:key="index" v-if="index>5&&index<=8" :style="{background:'url(' + i.url + ') no-repeat bottom left/100% auto'}">
<td @click="showImg(feature.featureImgList),initialIndex=index"
v-for="(i,index) in feature.featureImgList" :key="index" v-if="index>5&&index<=8"
:style="{background:'url(' + i.url + ') no-repeat bottom left/100% auto'}">
&nbsp;
</td>
</tr>
......@@ -244,16 +260,16 @@
<div class="short-line"></div>
<div class="english-title">Scheduling</div>
</div>
<oneday v-if="item.details && item.details.length==1" :day='item' :dayNum="item.dayNum" :title="item.title"
:isDirect="isDirect"></oneday>
<twoday v-if="item.details && item.details.length==2" :day='item' :dayNum="item.dayNum" :title="item.title"
:isDirect="isDirect"></twoday>
<threeday v-if="item.details && item.details.length==3" :day='item' :dayNum="item.dayNum" :title="item.title"
:isDirect="isDirect"></threeday>
<fourday v-if="item.details && item.details.length==4" :day='item' :dayNum="item.dayNum" :title="item.title"
:isDirect="isDirect"></fourday>
<fiveday v-if="item.details && item.details.length>=5" :day='item' :dayNum="item.dayNum" :title="item.title"
:isDirect="isDirect"></fiveday>
<oneday v-if="item.details && item.details.length==1" :day='item' :dayNum="item.dayNum"
:title="item.title" :isDirect="isDirect"></oneday>
<twoday v-if="item.details && item.details.length==2" :day='item' :dayNum="item.dayNum"
:title="item.title" :isDirect="isDirect"></twoday>
<threeday v-if="item.details && item.details.length==3" :day='item' :dayNum="item.dayNum"
:title="item.title" :isDirect="isDirect"></threeday>
<fourday v-if="item.details && item.details.length==4" :day='item' :dayNum="item.dayNum"
:title="item.title" :isDirect="isDirect"></fourday>
<fiveday v-if="item.details && item.details.length>=5" :day='item' :dayNum="item.dayNum"
:title="item.title" :isDirect="isDirect"></fiveday>
</div>
</div>
<div v-else>
......@@ -519,7 +535,8 @@
<el-select class="w120" :placeholder="$t('pub.pleaseSel')" filterable v-model="priceFlight.airLineID"
@change="airLineSelectChange(priceFlight.airLineID,priceFlight,1)">
<el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option>
<el-option v-for="item in airLineList" :label="item.AlName" :value="item.AirLineId" :key="item.AirLineId"></el-option>
<el-option v-for="item in airLineList" :label="item.AlName" :value="item.AirLineId"
:key="item.AirLineId"></el-option>
</el-select>
</td>
<td>
......@@ -530,9 +547,12 @@
:key="item.ID"></el-option>
</el-select>
</td>
<td>{{priceFlight.departureAirPortName}} <template v-if="priceFlight.departureTime&& priceFlight.departureTime!=''">（{{priceFlight.departureTime}}）</template></td>
<td>{{priceFlight.departureAirPortName}} <template
v-if="priceFlight.departureTime&& priceFlight.departureTime!=''">（{{priceFlight.departureTime}}）</template>
</td>
<td>
{{priceFlight.arrivalAirPortName}}<template v-if="priceFlight.arrivalTime && priceFlight.arrivalTime!=''">（{{priceFlight.arrivalTime}}）</template>
{{priceFlight.arrivalAirPortName}}<template
v-if="priceFlight.arrivalTime && priceFlight.arrivalTime!=''">（{{priceFlight.arrivalTime}}）</template>
</td>
<td>
<el-date-picker class="w110" :clearable="false" v-model="priceFlight.startDate" type="date"
......@@ -547,12 +567,15 @@
<el-button type="danger" icon="el-icon-delete" @click="removePriceFlight(index,priceFlight,1)"
circle></el-button>
</el-tooltip>
<el-tooltip class="item" v-if="index!=0" style="margin-left:0" effect="dark" content="上移" placement="top-start">
<el-button type="danger" icon="iconfont icon-shangyi" @click="MoveItem(priceFlight,index,0)" circle></el-button>
<el-tooltip class="item" v-if="index!=0" style="margin-left:0" effect="dark" content="上移"
placement="top-start">
<el-button type="danger" icon="iconfont icon-shangyi" @click="MoveItem(priceFlight,index,0)" circle>
</el-button>
</el-tooltip>
<el-tooltip class="item" v-if="index!=editForm.travelOrderFlightList.length-1" style="margin-left:0"
effect="dark" content="下移" placement="top-start">
<el-button type="danger" icon="iconfont icon-xiayi1" @click="MoveItem(priceFlight,index,1)" circle></el-button>
<el-button type="danger" icon="iconfont icon-xiayi1" @click="MoveItem(priceFlight,index,1)" circle>
</el-button>
</el-tooltip>
</td>
</tr>
......@@ -703,10 +726,10 @@
},
datatype: "jsonP",
success: function (data) {
},
error: function () {
}
});
if (allNum !== document.querySelectorAll(cName).length) {
......@@ -846,20 +869,26 @@
}
this.editForm.travelOrderFlightList.push(obj)
},
setDate: function (j) {
let stDate = this.priceList[0].startDate
let stDate = "";
if (this.priceList && this.priceList.length > 0) {
stDate = this.priceList[0].startDate;
}
if (j === 0) {
return stDate
} else {
let d = new Date(stDate)
d = d.getTime(d);
let add = d + ((24 * 60 * 60 * 1000) * j)
let date = new Date(add); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
let Y = date.getFullYear() + '-';
let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
let D = date.getDate() < 10 ? ('0' + date.getDate()) + ' ' : date.getDate() + ' ';
return Y + M + D;
if (stDate) {
let d = new Date(stDate)
d = d.getTime(d);
let add = d + ((24 * 60 * 60 * 1000) * j)
let date = new Date(add); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
let Y = date.getFullYear() + '-';
let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
let D = date.getDate() < 10 ? ('0' + date.getDate()) + ' ' : date.getDate() + ' ';
return Y + M + D;
} else {
return "";
}
}
},
appendParent() {
......@@ -903,7 +932,7 @@
}
this.pdfLoading = false
}).catch(err => {
})
},
ToWord: function (title, isPc) {
......@@ -973,17 +1002,16 @@
this.orderMsg = data.orderMsg;
if (this.orderTripdiff && this.orderTripdiff.flightInfoJson) {
this.orderTripdiff.travelOrderFlightList = JSON.parse(this.orderTripdiff.flightInfoJson);
if(this.orderMsg.outNotice==1)
{
if(this.orderTripdiff.travelOrderFlightList!=null && this.orderTripdiff.travelOrderFlightList.length>0)
{
this.orderTripdiff.travelOrderFlightList.forEach(subItem=>{
subItem.flightState=1;
});
}
if (this.orderMsg.outNotice == 1) {
if (this.orderTripdiff.travelOrderFlightList != null && this.orderTripdiff.travelOrderFlightList
.length > 0) {
this.orderTripdiff.travelOrderFlightList.forEach(subItem => {
subItem.flightState = 1;
});
}
}
}
//HK新加
this.SourceData.Id = 0;
if (this.$route.query.orderId > 0) {
......@@ -997,7 +1025,8 @@
}
this.SourceData.leaderInfo = str;
this.SourceData.gatheringTime = this.orderMsg.gatheringTime;
this.SourceData.airportService = this.orderMsg.airportServicePerson + "/" + this.orderMsg.airportServicePhone;
this.SourceData.airportService = this.orderMsg.airportServicePerson + "/" + this.orderMsg
.airportServicePhone;
this.SourceData.gatherIdent = this.orderMsg.bName;
this.SourceData.emergencyContact = this.orderMsg.sellName + "/" + this.orderMsg.sellTel;
this.SourceData.gatheringAddress = this.orderMsg.gatheringAddress;
......@@ -1036,7 +1065,7 @@
this.airLineSelectChange(fItem.airLineID, fItem);
});
}
this.title = this.orderMsg.startDate + this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游'
document.title = this.title;
//初始化行程
......@@ -1221,7 +1250,7 @@
x.jiu2 = jiu2
if (jin.length > 0) {
details = jin
}
}
// else if (jiu.length > 0) {
// // details = jiu
// }
......
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