Skip to content

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

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

parents cacf8a6e 57858dc2
Hide whitespace changes
Inline Side-by-side
Showing with 162 additions and 25 deletions
src/App.vue
View file @ af465802
......@@ -108,7 +108,7 @@ export default {
}
</script>
<style>
@import "//at.alicdn.com/t/font_635492_um44bcs5es.css";
@import "//at.alicdn.com/t/font_635492_tjcw5hoim2.css";
@import "./assets/css/Semibold.css";
@import "./assets/css/global/config.css";
@import "./assets/css/fileIcon.css";
......
src/assets/css/feture2.css
View file @ af465802
......@@ -951,7 +951,8 @@ div{
height: 100% !important;
}
.viewSpot_1_info_2_bottom>.viewSpot_1_info_2_bottom_img>div>.dragDiv>div>img{
width: 100%;
/* width: 100%; */
height: 100%;
}
.viewSpot_1_info_2_bottom>.viewSpot_1_info_2_bottom_img>div:nth-child(1){}
.viewSpot_1_info_2_bottom_img>div:nth-child(1)::before{
......@@ -1435,7 +1436,8 @@ div{
height: 100% !important;
}
.viewSpot_2_info_2>.viewSpot_2_info_2_img>div>.dragDiv>div>img{
width: 100%;
/* width: 100%; */
height: 100%;
}
.viewSpot_2_info_2>.viewSpot_2_info_2_img>div:nth-child(1){}
/*.viewSpot_2_info_2_img>div:nth-child(1)::before{*/
......
src/components/Ticketing/TicketManager.vue
View file @ af465802
......@@ -281,7 +281,7 @@
.TK_SeatList > ul > li {
float: left;
text-align: center;
margin: 5px 13px 0 0;
margin: 5px 10px 0 0;
}
.TK_SeatList > ul > li:last-child {
......@@ -310,7 +310,7 @@
}
.TK_SeatList ._num3 {
font-size: 18px;
font-size: 17px;
color: #e95252;
height: 28px;
font-family: PingFangSC-Semibold, sans-serif;
......@@ -1223,7 +1223,7 @@
}
.TK_raduis ul li {
margin-right: 14px;
margin-right: 12px;
float: left;
}
......@@ -1309,10 +1309,10 @@
</li>
<li style="margin-right:50px;">
<button class="normalBtn" type="button" @click="resetPageIndex(),getList()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" type="button" @click="addShow=true,command=false,initAddMsg()">
<button class="normalBtn" type="button" @click="addShow=true,command=false,sanmai=false,initAddMsg()">
{{$t('pub.addBtn')}}
</button>
<button class="hollowFixedBtn" type="button" @click="command=true,addShow=false,initAddMsg()">
<button class="hollowFixedBtn" type="button" @click="command=true,addShow=false,sanmai=false,initAddMsg()">
{{$t('Airticket.Air_orderImport')}}
</button>
<el-dropdown @command="getImport">
......@@ -1457,6 +1457,10 @@
<p class="_num3">{{item.OrderTotalNum}}</p>
<p class="_wz">报名人数</p>
</li>
<li>
<p class="_num3">{{item.UseScatterNum}}/{{item.AirTicketScatterNum }}</p>
<p class="_wz">已卖/总数</p>
</li>
<li>
<p class="_num3">{{item.OutTicketPercent}} %</p>
<p class="_wz">出票百分比</p>
......@@ -1579,7 +1583,12 @@
<el-button v-else type="primary" icon="iconfont icon-xiazai2" style="margin-left:0;"
@click="DownLoad(3,item.TripItinerary)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="日志" placement="top-start" style="float:right;">
<el-tooltip class="item" effect="dark" content="散卖" placement="top-start">
<el-button type="primary" icon="iconfont icon-maichu" @click="sanSale(item)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="日志" placement="top-start">
<el-popover popper-class="Journal" width="400" trigger="click">
<div class="InfoChangeLog">
<div class="changLog">
......@@ -2021,6 +2030,46 @@
</div>
</div>
</el-form>
<el-form class="combottomDiv" v-if="sanmai" label-width="100px" :model="sales" :rules="salerules">
<el-row>
<el-col :span="20">
<p class="_add_t">散卖机票</p>
</el-col>
<el-col :span="4">
<button
type="button"
class="normalBtn"
@click="saveSales()"
>{{$t('pub.saveBtn')}}</button>
<button
class="hollowFixedBtn"
type="button"
@click="resetForm('addMsg'),sanmai=false"
>{{$t('pub.cancelBtn')}}</button>
</el-col>
</el-row>
<div class="_add_sel">
<ul class="clearfix">
<el-col :span="5">
<el-form-item label="人数" prop="AirTicketNum">
<el-input v-model="sales.AirTicketNum" @keyup.native="checkInteger(sales,'AirTicketNum')"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="B2B单价" prop="B2BPrice">
<el-input v-model="sales.B2BPrice" @keyup.native="checkPrice(sales,'B2BPrice')"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="B2C单价" prop="B2CPrice">
<el-input v-model="sales.B2CPrice" @keyup.native="checkPrice(sales,'B2CPrice')"></el-input>
</el-form-item>
</el-col>
</ul>
</div>
</el-form>
<el-dialog custom-class="w700" :title="importFileTitle" :visible.sync="outerVisible" center>
<el-upload v-if="uploadDoc" ref="ticketUpload" drag class="upload-demo" :action="getImportFileUrl()"
:on-success="handleAvatarSuccess">
......@@ -2071,9 +2120,9 @@
},
//机票定金类型
DepositTypeArray: [{
Id: 1,
Name: "一定"
},
Id: 1,
Name: "一定"
},
{
Id: 2,
Name: "二定"
......@@ -2193,8 +2242,18 @@
dataList: [],
addShow: false,
command: false,
sanmai:false,
uploadDoc: true,
//散卖obj
sales:{
AirTicketId:0,
AirTicketNum:0,
B2BPrice:'',
B2CPrice:''
},
//1-一般导入，2-多航段导入
importType: 1,
pickerOptions1: {
......@@ -2270,7 +2329,24 @@
validator: validateLineId,
trigger: 'change',
required: true,
}]
}],
},
salerules:{
AirTicketNum: [{
required: true,
message: "请填写人数",
trigger: "change"
}],
B2BPrice: [{
required: true,
message: "请填写B2B单价",
trigger: "change"
}],
B2CPrice: [{
required: true,
message: "请填写B2C单价",
trigger: "change"
}],
}
};
},
......@@ -2623,6 +2699,7 @@
getEntityExtend(ID) {
this.addShow = true;
this.command = false;
this.sanmai = false;
this.initAddMsg();
this.chengeDelIdList = [];
this.apipost(
......@@ -3013,8 +3090,35 @@
err => {
}
);
}
},
//散卖机票
sanSale(item){
this.sanmai = true;
this.addShow = false;
this.command = false;
this.sales.AirTicketId = item.ID;
this.sales.AirTicketNum = item.AirTicketScatterNum;
this.sales.B2BPrice = item.ScatterB2BPrice;
this.sales.B2CPrice = item.ScatterB2CPrice;
},
//保存
saveSales(){
this.apipost(
"ticket_post_SetAirTicketScattering", this.sales,
res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getList();
this.sanmai = false;
}else{
this.Error(res.data.message);
}
},
err => {
}
);
}
},
mounted() {
var id = this.$route.query.id;
......
src/components/confirmationOrderDownLoad.vue
View file @ af465802
......@@ -9,7 +9,7 @@
<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="下载电脑版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" />
......@@ -643,7 +643,7 @@
}, 2000)
},
methods: {
gernalFeature(type){
gernalFeature(isPc){
this.pdfLoading = true;
let tcid = this.$route.query.tcid;
let UploadUrl = this.domainManager().UploadUrl
......@@ -656,8 +656,13 @@
success: function (data) {
let msg = JSON.parse(data)
if (msg.ResultCode) { // 已经存在文件 直接调用下载
_this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum + '日游',type)
_this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum + '日游',isPc)
} else { // 不存在图片保存图片后下载
console.log(document.querySelector("#gernalCanvas").querySelectorAll('img').length)
if (document.querySelector("#gernalCanvas").querySelectorAll('img').length === 0) {
_this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum + '日游',isPc)
return
}
document.querySelector("#gernalCanvas").querySelectorAll('img').forEach(x => {
let src = x.src
src = src.replace('https:','http:')
......@@ -934,7 +939,7 @@
//是否显示行程图片
isShowTripImage:this.vshowK?1:0,
//isPc是否PC下载
isPc: type,
isPc: isPc,
};
this.GetLocalFile("DownLoadTripWord", msg,title+ ".doc", res=>{
this.pdfLoading = false
......
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ af465802
......@@ -7,7 +7,7 @@
<span class="foldList" @click="fold" v-if="isFold==''">点击折叠</span>
<span class="foldList" @click="fold" v-if="isFold==1">点击展开</span>
<div class="TrfList clearfix">
<!-- v-if="item.TypeState === 4 && this.FeatureData.FeatureType!==4" -->
<!-- 'display_none':(item.TypeState===4 && FeatureData.FeatureType !== 4) || (item.TypeState===4 && !$route.query.configId)-->
<div class="TFslide" v-for="item in TypeArray" :class="{'TFcked':item.isShow,'display_none':(item.TypeState===4 && FeatureData.FeatureType !== 4) || (item.TypeState===4 && !$route.query.configId)}" @click="clickFeature(item)"
:key="item.subCode">
<img v-bind:src="item.imgUrl">
......@@ -469,6 +469,7 @@
});
this.FeatureData.FeatureHtmlJson = null
this.FeatureData.FeatureHtmlJsonDelete = null
this.FeatureData.lastFeatureType = this.FeatureData.FeatureType
this.FeatureData.switch4or5 = true
this.$forceUpdate()
}).catch(() => {
......@@ -493,6 +494,8 @@
x.isShow = true;
this.ckTitle = x.ckTitle;
this.FeatureData.FeatureType = item.TypeState;
this.FeatureData.lastFeatureType = this.FeatureData.FeatureType
this.FeatureData.switch4or5 = true
} else {
x.isShow = false;
}
......@@ -561,6 +564,7 @@
},
initFeature() {
this.TypeArray.forEach(x => {
console.log("this.FeatureData.FeatureType",this.FeatureData.FeatureType)
if (x.TypeState == this.FeatureData.FeatureType) {
x.isShow = true;
this.ckTitle = x.ckTitle;
......
src/components/newTravelmanager/TravelGroupControl/TravelTemp/travelFeature3.vue
View file @ af465802
......@@ -560,7 +560,7 @@
</div>
<div class="travel_noImg dragDiv" :id='"viewSpotBox_"+(item*4+1)+"_0"'>
<div class="triangle_border_rb"></div>
<VueDraggableResizable v-if="viewSpotObj.list[item*4+1].images[0]" :ref='"viewSpotVds_"+(item*4+1)+"_0"' tabindex="0" :resizable='false' :active="false" :parent="false" axis='y' @activated="onActivated(item*4+1,0)" :x="viewSpotObj.list[item*4+1].images[0].x" :y="viewSpotObj.list[item*4+1].images[0].y" :z="2" @dragstop="onViewSpotDragstop">
<VueDraggableResizable v-if="viewSpotObj.list[item*4+1].images[0]" :ref='"viewSpotVds_"+(item*4+1)+"_0"' tabindex="0" :resizable='false' :active="false" :parent="false" axis='x' @activated="onActivated(item*4+1,0)" :x="viewSpotObj.list[item*4+1].images[0].x" :y="0" :z="2" @dragstop="onViewSpotDragstopY">
<img :src='viewSpotObj.list[item*4+1].images[0].Url' :id='"viewSpotImg_"+(item*4+1)+"_0"' />
</VueDraggableResizable>
<div class="triangle_border_rb_b"></div>
......@@ -588,7 +588,8 @@
</div>
<div class="travel_noImg dragDiv" :id='"viewSpotBox_"+(item*4+1)+"_1"'>
<div class="triangle_border_rb_c"></div>
<VueDraggableResizable v-if="viewSpotObj.list[item*4+1].images[1]" :ref='"viewSpotVds_"+(item*4+1)+"_1"' tabindex="0" :resizable='false' :active="false" :parent="false" axis='y' @activated="onActivated(item*4+1,1)" :x="viewSpotObj.list[item*4+1].images[1].x" :y="viewSpotObj.list[item*4+1].images[1].y" :z="2" @dragstop="onViewSpotDragstop">
<!-- viewSpotObj.list[item*4+1].images[1].y -->
<VueDraggableResizable v-if="viewSpotObj.list[item*4+1].images[1]" :ref='"viewSpotVds_"+(item*4+1)+"_1"' tabindex="0" :resizable='false' :active="false" :parent="false" axis='x' @activated="onActivated(item*4+1,1)" :x="viewSpotObj.list[item*4+1].images[1].x" :y="0" :z="2" @dragstop="onViewSpotDragstopY">
<img :src='viewSpotObj.list[item*4+1].images[1].Url' :id='"viewSpotImg_"+(item*4+1)+"_1"' />
</VueDraggableResizable>
<div class="triangle_border_rb_b"></div>
......@@ -773,7 +774,7 @@
</div>
<div class="travel_noImg dragDiv" :id='"viewSpotBox_"+(item*4-1)+"_0"'>
<div class="triangle_border_rb"></div>
<VueDraggableResizable v-if="viewSpotObj.list[item*4-1].images[0]" :ref='"viewSpotVds_"+(item*4-1)+"_0"' tabindex="0" :resizable='false' :active="false" :parent="false" axis='y' @activated="onActivated(item*4-1,0)" :x="viewSpotObj.list[item*4-1].images[0].x" :y="viewSpotObj.list[item*4-1].images[0].y" :z="2" @dragstop="onViewSpotDragstop">
<VueDraggableResizable v-if="viewSpotObj.list[item*4-1].images[0]" :ref='"viewSpotVds_"+(item*4-1)+"_0"' tabindex="0" :resizable='false' :active="false" :parent="false" axis='x' @activated="onActivated(item*4-1,0)" :x="viewSpotObj.list[item*4-1].images[0].x" :y="0" :z="2" @dragstop="onViewSpotDragstopY">
<img :src='viewSpotObj.list[item*4-1].images[0].Url' :id='"viewSpotImg_"+(item*4-1)+"_0"' />
</VueDraggableResizable>
<div class="triangle_border_rb_b"></div>
......@@ -819,7 +820,7 @@
</div>
<div class="travel_noImg dragDiv" :id='"viewSpotBox_"+(item*4)+"_0"'>
<div class="triangle_border_rb_c"></div>
<VueDraggableResizable v-if="viewSpotObj.list[item*4].images[0]" :ref='"viewSpotVds_"+(item*4)+"_0"' tabindex="0" :resizable='false' :active="false" :parent="false" axis='y' @activated="onActivated(item*4,0)" :x="viewSpotObj.list[item*4].images[0].x" :y="viewSpotObj.list[item*4].images[0].y" :z="2" @dragstop="onViewSpotDragstop">
<VueDraggableResizable v-if="viewSpotObj.list[item*4].images[0]" :ref='"viewSpotVds_"+(item*4)+"_0"' tabindex="0" :resizable='false' :active="false" :parent="false" axis='x' @activated="onActivated(item*4,0)" :x="viewSpotObj.list[item*4].images[0].x" :y="0" :z="2" @dragstop="onViewSpotDragstopY">
<img :src='viewSpotObj.list[item*4].images[0].Url' :id='"viewSpotImg_"+(item*4)+"_0"' />
</VueDraggableResizable>
<div class="triangle_border_rb_b_c"></div>
......@@ -865,7 +866,7 @@
</div>
<div class="travel_noImg dragDiv" :id='"viewSpotBox_"+(item*4+1)+"_0"'>
<div class="triangle_border_rb"></div>
<VueDraggableResizable v-if="viewSpotObj.list[item*4+1].images[0]" :ref='"viewSpotVds_"+(item*4+1)+"_0"' tabindex="0" :resizable='false' :active="false" :parent="false" axis='y' @activated="onActivated(item*4+1,0)" :x="viewSpotObj.list[item*4+1].images[0].x" :y="viewSpotObj.list[item*4+1].images[0].y" :z="2" @dragstop="onViewSpotDragstop">
<VueDraggableResizable v-if="viewSpotObj.list[item*4+1].images[0]" :ref='"viewSpotVds_"+(item*4+1)+"_0"' tabindex="0" :resizable='false' :active="false" :parent="false" axis='x' @activated="onActivated(item*4+1,0)" :x="viewSpotObj.list[item*4+1].images[0].x" :y="0" :z="2" @dragstop="onViewSpotDragstopY">
<img :src='viewSpotObj.list[item*4+1].images[0].Url' :id='"viewSpotImg_"+(item*4+1)+"_0"' />
</VueDraggableResizable>
<div class="triangle_border_rb_b_c"></div>
......@@ -1354,7 +1355,8 @@
let deleteDataList = JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJsonDelete));
this.deleteArray = deleteDataList==="" ? this.deleteArray : deleteDataList;
console.log("dataList",dataList,!this.$route.query.configId,dataList.switch4or5)
if (!this.$route.query.configId || (this.$route.query.configId && dataList.switch4or5) || (this.FeatureData.FeatureType !== 4 || this.FeatureData.FeatureType !== 5) ){
// console.log("this.$route.query.configId && this.FeatureData.FeatureType<4",this.$route.query.configId && this.FeatureData.FeatureType<4) || (this.$route.query.configId && this.FeatureData.FeatureType<4)
if (!this.$route.query.configId || (this.$route.query.configId && dataList.switch4or5) || (this.$route.query.configId && this.FeatureData.lastFeatureType<4)){
for (let i = 0; i < dataList.DayList.length; i++) { //组装数据
let restaurantObj = travelFeatureTwo.DinnerInit(i, dataList.DayList) // 餐饮
let hotelObj = travelFeatureTwo.HotelInit(i, dataList.DayList) // 酒店
......@@ -1456,6 +1458,26 @@
this.viewSpotObj.list[this.currentIndex].images[this.imgIndex].y=y;
this.$refs["viewSpotVds_"+this.currentIndex+"_"+this.imgIndex][0]._data.top=y
},
onViewSpotDragstopY(x,y){
let imgWidth=document.querySelector("#viewSpotImg_"+this.currentIndex+"_"+this.imgIndex).width;
let boxWidth=document.querySelector("#viewSpotBox_"+this.currentIndex+"_"+this.imgIndex).offsetWidth;
let cha=boxWidth-imgWidth;
if (cha <= 0) {
if(x < 0 && x < cha) {
x=cha
} else if (x > 0) {
x=0
}
} else {
if (x < 0) {
x = 0
} else if (x > 0 && x > cha) {
x = cha
}
}
this.viewSpotObj.list[this.currentIndex].images[this.imgIndex].x=x;
this.$refs["viewSpotVds_"+this.currentIndex+"_"+this.imgIndex][0]._data.left=x
},
// 餐厅图片拖拽
onRestaurantDragstop(x,y){
let imgHeight=document.querySelector("#restaurantImg_"+this.currentIndex+"_"+this.imgIndex).height;
......
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