Skip to content

S
SuperMan
Commit ada0a9a7 authored by 吴春's avatar 吴春
Browse files
Options

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

parents 62e8534e 724cf79b
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 22 deletions
src/components/TravelManager/TravelList/RegistrationStatistics.vue
View file @ ada0a9a7
......@@ -2,7 +2,7 @@
.RegistrationStatistic .Rs_LtName{
text-align:left;
padding-left:20px;
}
}
.RegistrationStatistic .RS_Nameover{
overflow: hidden;
text-overflow: ellipsis;
......@@ -194,9 +194,9 @@ export default {
},
//获取系列列表
getLineTeamList() {
this.queryMsg.LineteamId = 0;
this.queryMsg.ltID = 0;
let msg = {
lineID: this.queryMsg.LineId,
lineID: this.queryMsg.LineID,
isTOOP: 1
};
this.apipost("team_post_GetList", msg, res => {
......@@ -214,7 +214,7 @@ export default {
this.queryCommonData.loading = false;
if (res.data.resultCode == 1) {
this.DataList = res.data.data;
this.DataList.forEach(item=>{
switch(item.StartCityName){
case '成都':
......
src/components/TravelManager/TravelList/RegistrationStatistics_Sale.vue
View file @ ada0a9a7
......@@ -2,7 +2,7 @@
.RegistrationStatistic .Rs_LtName{
text-align:left;
padding-left:20px;
}
}
.RegistrationStatistic .RS_Nameover{
overflow: hidden;
text-overflow: ellipsis;
......@@ -194,9 +194,9 @@ export default {
},
//获取系列列表
getLineTeamList() {
this.queryMsg.LineteamId = 0;
this.queryMsg.ltID = 0;
let msg = {
lineID: this.queryMsg.LineId,
lineID: this.queryMsg.LineID,
isTOOP: 1
};
this.apipost("team_post_GetList", msg, res => {
......@@ -214,7 +214,7 @@ export default {
this.queryCommonData.loading = false;
if (res.data.resultCode == 1) {
this.DataList = res.data.data;
this.DataList.forEach(item=>{
switch(item.StartCityName){
case '成都':
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ ada0a9a7
......@@ -318,6 +318,7 @@ export default {
CloseIncomeBtn:false,
loading:false,
zhuanMsg: {
NowTCNUM:'',
TCNUM: '',
FrIds: '',
},
......@@ -327,6 +328,7 @@ export default {
methods: {
initZhuanMsg(){
this.zhuanMsg = {
NowTCNUM:'',
TCNUM: '',
FrIds: '',
}
......@@ -347,7 +349,8 @@ export default {
}
},
TransferDocuments: function () {
let TCNUM = this.DataList.TeamBalance.TCNUM
let TCNUM = this.DataList.TeamBalance.TCNUM;
this.zhuanMsg.NowTCNUM=TCNUM;
if (this.zhuanMsg.TCNUM === '') {
return this.$message.error("请输入团号！")
} else if (this.zhuanMsg.TCNUM === TCNUM) {
......
src/components/confirmationOrderDownLoad.vue
View file @ ada0a9a7
......@@ -8,7 +8,8 @@
<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()" />
<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)" />
<!-- ToWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游') -->
<!--&&isopOperation HK 注释 可以让销售修改基本信息-->
<input type="button" v-if="orderId>0" class="travelControlTripBtn" value="修改信息" @click="editMsgShow=true" />
......@@ -642,7 +643,7 @@
}, 2000)
},
methods: {
gernalFeature(){
gernalFeature(type){
this.pdfLoading = true;
let tcid = this.$route.query.tcid;
let UploadUrl = this.domainManager().UploadUrl
......@@ -655,7 +656,7 @@
success: function (data) {
let msg = JSON.parse(data)
if (msg.ResultCode) { // 已经存在文件 直接调用下载
_this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum + '日游')
_this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum + '日游',type)
} else { // 不存在图片保存图片后下载
document.querySelector("#gernalCanvas").querySelectorAll('img').forEach(x => {
let src = x.src
......@@ -687,7 +688,6 @@
context.imageSmoothingEnabled = false
var image = new Image();
image.src = canvas.toDataURL("image/png");
// document.body.appendChild(image) upload.oytour.com
$.ajax({
url: UploadUrl + '/Upload/UploadBase64?fileType=1&fileLimit=5&&filePath=Feature/' + tcid,
type: "POST",
......@@ -697,16 +697,16 @@
},
datatype:"jsonP",
success: function (data) {
// console.log("上传成功",data);
//console.log("上传成功",data);
},
error: function () {
// console.log("上传失败");
//console.log("上传失败");
}
});
if (allNum!==document.querySelectorAll(cName).length) {
allNum += 1
} else {
_this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum + '日游')
_this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum + '日游',type)
}
}
});
......@@ -719,7 +719,7 @@
}
});
} else {
this.ToWord(this.orderMsg.startDate + this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游')
this.ToWord(this.orderMsg.startDate + this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游',type)
}
},
//保存基础数据
......@@ -899,7 +899,7 @@
console.log(err)
})
},
ToWord:function(title)
ToWord:function(title,isPc)
{
let msg = {
configId: this.$route.query.configId,
......@@ -922,7 +922,7 @@
//是否显示同行备注
isShowB2B:this.vshowI?1:0,
//是否显示行程
isShowTrip:this.vshowK?1:0,
isShowTrip:this.vshowD?1:0,
//是否显示标题
isShowTitle:this.vshowL?1:0,
//是否显示旅客名单
......@@ -930,7 +930,11 @@
//是否显示紧急联系人
isShowMan:this.vshowLLR?1:0,
//是否显示团号
isShowTCNUM:this.vshowTCNUM?1:0
isShowTCNUM:this.vshowTCNUM?1:0,
//是否显示行程图片
isShowTripImage:this.vshowK?1:0,
//isPc是否PC下载
isPc: type,
};
this.GetLocalFile("DownLoadTripWord", msg,title+ ".doc", res=>{
this.pdfLoading = false
......
src/components/newTravelmanager/TravelGroupControl/TravelPriceFlightList.vue
View file @ ada0a9a7
......@@ -65,11 +65,17 @@
</td>
<td>{{priceFlight.DepartureAirPortName}}</td>
<td>
{{priceFlight.DepartureTime}}
<el-input v-if="priceFlight.IsShowTime||priceFlight.IsShow" placeholder="起飞时间" class="w120"
v-model="priceFlight.DepartureTime">
</el-input>
<span v-else>{{priceFlight.DepartureTime}}</span>
</td>
<td>{{priceFlight.ArrivalAirPortName}}</td>
<td>
{{priceFlight.ArrivalTime}}
<el-input v-if="priceFlight.IsShowTime||priceFlight.IsShow" placeholder="到达时间" class="w120"
v-model="priceFlight.ArrivalTime">
</el-input>
<span v-else> {{priceFlight.ArrivalTime}}</span>
</td>
<td>
<el-date-picker v-if="priceFlight.IsShow" class="w110" :clearable="false" v-model="priceFlight.StartDate"
......@@ -86,6 +92,18 @@
<span v-else>{{priceFlight.TicketType==1?'去程':'回程'}}</span>
</td>
<td>
<el-tooltip class="item" effect="dark" content="修改时间" placement="top-start"
v-if="!priceFlight.IsShowTime">
<el-button v-if="IsBindFlight" type="primary" icon="el-icon-edit" @click="TimeStatusChange(priceFlight)"
circle></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="保存时间" placement="top-start" v-if="priceFlight.IsShowTime">
<el-button v-if="IsBindFlight" type="primary" icon="iconfont icon-baocun"
@click="saveAirticketFlightTime(priceFlight)" circle></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="修改" placement="top-start" v-if="!priceFlight.IsShow">
<el-button v-if="!IsBindFlight" type="primary" icon="el-icon-edit" @click="StatusChange(priceFlight)"
circle></el-button>
......@@ -190,6 +208,10 @@
StatusChange (item) {
item.IsShow = !item.IsShow
},
//状态切换
TimeStatusChange (item) {
item.IsShowTime = !item.IsShowTime
},
//初始化航空公司下拉
initAirlines () {
this.apipost(
......@@ -253,7 +275,9 @@
res => {
if (res.data.resultCode == 1) {
if (res.data.data != null) {
console.log('res.data.data', res.data.data)
res.data.data.forEach(x => {
x['IsShowTime'] = false
this.priceFlightList.push(x)
})
this.headCallBack()
......@@ -306,6 +330,26 @@
)
this.headCallBack()
},
//保存时间信息
saveAirticketFlightTime (item) {
item.IsShowTime = false
let msg = {
id: item.ID,
departureTime: item.DepartureTime,
arriveTime: item.ArrivalTime,
}
console.log('msg', msg)
this.apipost('travel_post_ModifyAirticketFlightTimeById', msg, res => {
if (res.data.resultCode == 1) {
} else {
this.Warning(res.data.message)
}
},
err => {
}
)
},
//删除航班信息
removePriceFlight (index, item, type) {
var that = this
......
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