Skip to content

S
SuperMan
Commit 8e472353 authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents 0643d707 c9d851b0
Hide whitespace changes
Inline Side-by-side
Showing with 177 additions and 70 deletions
src/assets/css/tripIndexNew2.css
View file @ 8e472353
......@@ -275,7 +275,6 @@ html, body{
}
.travelDaysTitlle{
margin-top: 47px;
overflow: hidden;
}
.travelDaysTitlle-left {
width: 173px;
......@@ -288,7 +287,7 @@ html, body{
height: 173px;
/* background: url('https://imgfile.oytour.com/Static/NewTripFeature/Shape.png')no-repeat center #FFF; */
background: url('../img/trip/xclogo.png')no-repeat center;
background-size: 100% 100%;
background-size: auto 100%;
overflow: hidden;
border-radius: 50%;
-webkit-border-radius: 50%;
......
src/assets/img/trip/xclogo.png
View replaced file @ 0643d707 View file @ 8e472353
src/assets/img/trip/xclogo.png

36.2 KB | W: | H:

src/assets/img/trip/xclogo.png

65.6 KB | W: | H:

src/assets/img/trip/xclogo.png
src/assets/img/trip/xclogo.png
src/assets/img/trip/xclogo.png
src/assets/img/trip/xclogo.png
  • 2-up
  • Swipe
  • Onion skin
src/components/FinancialModule/HandDispensingFee/list.vue
View file @ 8e472353
......@@ -42,7 +42,11 @@
<td><span v-if="childItem.Type==1">房</span>
<span v-if="childItem.Type==2">餐</span>
<span v-if="childItem.Type==3">车</span>
<span v-if="childItem.Type==4">门票</span></td>
<span v-if="childItem.Type==4">门票</span>
<span v-if="childItem.Type==5">房费送客手数料</span>
<span v-if="childItem.Type==6">餐费送客手数料</span>
<span v-if="childItem.Type==7">门票送客手数料</span>
</td>
<td>{{childItem.Unit_Price}}</td>
<td>{{childItem.CostTypeName}}</td>
<td>{{childItem.FlowZName}}</td>
......@@ -229,6 +233,7 @@
:value="item.Id"></el-option>
</el-select>
</el-form-item>
<div>
<!-- <el-button style="margin-left: 15px;padding: 6px;" type="danger" size="mini" class="el-icon-delete" circle
v-if="addMsg.DetailList.length>1" @click="addMsg.DetailList.splice(y,1)">
......@@ -379,6 +384,9 @@
{Name:'餐',Id:2,disabled:false},
{Name:'车',Id:3,disabled:false},
{Name:'门票',Id:4,disabled:false},
{Name:'房费送客手数料',Id:5,disabled:false},
{Name:'餐费送客手数料',Id:6,disabled:false},
{Name:'门票送客手数料',Id:7,disabled:false},
], //类型
ClientAccountList: [], //付款对象
showVisible: false, //弹窗的显示
......@@ -647,8 +655,11 @@
getEdit(row,type) { //修改
let data = JSON.parse(JSON.stringify(row))
this.addMsg = data
console.log("data",data);
if(type==1){
this.addMsg.DetailList.forEach(item=>{
item.Unit_Price = Number(item.Unit_Price)
})
this.addMsg.ClientIdList = data.ClientIds.split(',').map(Number)
......@@ -726,7 +737,7 @@
addDetailList() { //新增类型
// let isdisabled = false
// let isdisabledXHS = false
for(let i = 2;i<5;i++){
for(let i = 2;i<8;i++){
let obj = {
Type: i,
Unit_Price: null,
......@@ -751,6 +762,8 @@
ClientIdList:this.addMsg.ClientIdList,
ClientIds:this.addMsg.ClientIds,
DetailList:this.addMsg.DetailList,
BranchId:this.addMsg.BranchId,
CurrencyId:this.addMsg.CurrencyId,
}
this.submitLoading = true
this.apipost(
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 8e472353
......@@ -826,12 +826,15 @@
<span v-if="x.Type==2">餐</span>
<span v-if="x.Type==3">车</span>
<span v-if="x.Type==4">门票</span>
<span v-if="x.Type==5">房费送客手数料</span>
<span v-if="x.Type==6">餐费送客手数料</span>
<span v-if="x.Type==7">门票送客手数料</span>
</td>
<td>
<el-input v-model="x.Num" type="Number" class="w80 _border_b_1"></el-input>
<el-input v-model="x.Num" type="Number" class="w80 _border_b_1" :disabled="x.Type>4?true:false"></el-input>
</td>
<td>
<el-input v-model="x.Unit_Price" type="Number" @keyup.native="checkInteger(x,'Number')"
<el-input v-model="x.Unit_Price" type="Number" :disabled="x.Type>4?true:false" @keyup.native="checkInteger(x,'Number')"
class="w80 _border_b_1"></el-input>
</td>
<td>{{x.Num*x.Unit_Price}}</td>
......@@ -1114,7 +1117,10 @@
Name: '门票',
Id: 4,
disabled: false
},
},
{Name:'房费送客手数料',Id:5,disabled:false},
{Name:'餐费送客手数料',Id:6,disabled:false},
{Name:'门票送客手数料',Id:7,disabled:false},
], //类型
isHandFee: false,
is_HandFee: true, //是否开启
......@@ -1175,6 +1181,7 @@
},
// 是否开启手配费
getHandFee() {
if (this.is_HandFee) {
this.chooseHandFee()
} else {
......@@ -1184,12 +1191,14 @@
},
// 获取当前手配费选项
chooseHandFee() {
console.log("我进来啦1",this.HandFeeDetail );
console.log("我进来啦2", this.msg.detailList );
if (!this.is_HandFee) return
if (this.msg.detailList.length > 0) {
let HandFeeObj = this.HandFeeList.map(item => {
if (item.BranchId == this.HandFee.BranchId) return item
})
this.HandFeeDetail = HandFeeObj[0]
this.HandFeeDetail && this.HandFeeDetail.DetailList.forEach(x => {
x.show = false
......@@ -1199,6 +1208,7 @@
let numToCE = 0
let numToMEN = 0
let states = true
let companyID= this.$route.query.companyID;
this.msg.detailList.forEach((x, index) => {
let obj = x
if (x.CostTypeName.indexOf('房') != -1 ||
......@@ -1206,22 +1216,49 @@
x.CostTypeName.indexOf('车') != -1 ||
x.CostTypeName.indexOf('门票') != -1) {
this.HandFeeDetail && this.HandFeeDetail.DetailList.forEach((y, indexs) => {
if (x.CostTypeName.indexOf('房') != -1 && y.Type == 1) {
if (x.CostTypeName.indexOf('房') != -1&&x.CostTypeName.indexOf('房费送客手数料') == -1 && y.Type == 1&&companyID!=1220) {
y.show = true, numToFANG += Number(obj.Number)//, y.Num = numToFANG
}
if (x.CostTypeName.indexOf('餐') != -1 && y.Type == 2) {
if (x.CostTypeName.indexOf('餐') != -1&&x.CostTypeName.indexOf('餐费送客手数料') == -1 && y.Type == 2&&companyID!=1220) {
y.show = true, numToCAN += Number(obj.Number)//, y.Num = numToCAN
}
if (x.CostTypeName.indexOf('车') != -1 && y.Type == 3) {
if (x.CostTypeName.indexOf('车') != -1 && y.Type == 3&&companyID!=1220) {
y.show = true, numToCE += Number(obj.Number)//, y.Num = numToCE
}
if (x.CostTypeName.indexOf('门票') != -1 && y.Type == 4) {
if (x.CostTypeName.indexOf('门票') != -1&&x.CostTypeName.indexOf('门票送客手数料') == -1 && y.Type == 4&&companyID!=1220) {
y.show = true, numToMEN += Number(obj.Number)//, y.Num = numToMEN
}
if (x.CostTypeName.indexOf('房费送客手数料') != -1 && y.Type == 5) {
if(x.UnitPriceTo<0){ y.Unit_Price=x.UnitPriceTo*-1}
else{
y.Unit_Price=x.UnitPriceTo
}
y.Num=x.Number
y.show = true, numToMEN += Number(obj.Number)//, y.Num = numToMEN
}
if (x.CostTypeName.indexOf('餐费送客手数料') != -1 && y.Type == 6) {
y.Num=x.Number
if(x.UnitPriceTo<0){ y.Unit_Price=x.UnitPriceTo*-1}
else{
y.Unit_Price=x.UnitPriceTo
}
y.show = true, numToMEN += Number(obj.Number)//, y.Num = numToMEN
}
if (x.CostTypeName.indexOf('门票送客手数料') != -1 && y.Type == 7) {
y.Num=x.Number
if(x.UnitPriceTo<0){ y.Unit_Price=x.UnitPriceTo*-1}
else{
y.Unit_Price=x.UnitPriceTo
}
y.show = true, numToMEN += Number(obj.Number)//, y.Num = numToMEN
}
states = false
})
}
})
console.log("我进来啦3",this.HandFeeDetail );
if (states) {
this.msg.detailList.forEach((x, index) => {
this.HandFeeDetail && this.HandFeeDetail.DetailList.forEach((y, indexs) => {
......@@ -2318,10 +2355,10 @@
}, err => {})
},
admin_get_DepartmentGetList(Bid, T) {
if (this.msg.RB_Branch_Id == 1220) {
this.is_HandFee = false
this.isHandFee = false
} else {
// if (this.msg.RB_Branch_Id == 1220) { update by:W 2023-10-16
// this.is_HandFee = false
// this.isHandFee = false
// } else {
if (this.$route.query.id == 245 ||
this.$route.query.id == 246 ||
this.$route.query.id == 247 ||
......@@ -2333,14 +2370,14 @@
this.msg.TemplateId == 246 ||
this.msg.TemplateId == 247 ||
this.msg.TemplateId == 248 ||
this.msg.TemplateId == 267) && this.msg.HandFeeFrId == 0 && this.msg.RB_Branch_Id != 1220) {
this.msg.TemplateId == 267) && this.msg.HandFeeFrId == 0 ) {//&& this.msg.RB_Branch_Id != 1220 update by:W 2023-10-16
this.is_HandFee = true
this.isHandFee = true
} else {
this.is_HandFee = false
this.isHandFee = false
}
}
//}
if (Bid >= 0) {
let isShow = true
this.companyList.forEach(item => {
......
src/components/LeaveGroupDownload/ItineraryFeatures.vue
View file @ 8e472353
......@@ -7,7 +7,13 @@
<div class="zidingyi" v-if="showType==3">
<div v-html="feature.featureContent"></div>
</div>
<div v-if="showType>=4" id="gernalCanvas" style="margin:auto;width:100%" v-html="feature.featureHtml">
<!-- <div v-if="showType>=4" id="gernalCanvas" style="margin:auto;width:100%" v-html="feature.featureHtml"></div> -->
<div v-if="showType>=4" id="gernalCanvas" class="slider" style="margin:auto;width:100%">
<template v-for="(i,index) in feature.tripImageList">
<img :key="index" :src="feature.headerImage" style="width:100%;display: block;">
<img :key="index" :src="i" style="width:100%;display: block;">
<img :key="index" class="MT19" :src="feature.footerImage" style="width:100%;display: block;">
</template>
</div>
</div>
</div>
......
src/components/LeaveGroupDownload/index.vue
View file @ 8e472353
......@@ -4,6 +4,27 @@
<div class="absolute z-index1 column" style="left: 0;right: 0; top: 0;bottom: 0;">
<Header :TripColor="dataAll&&dataAll.tripColor" :orderMsg="orderMsg"></Header>
<div class="travelDaysTitlle row-aic" :style="{'background':backgroundColor}">
<div class="travelDaysTitlle-left">
<div class="relative">
<div class="travelDaysTitlle-left-text column-ajc absolute">
<div class="travelDaysTitlle-left-textOne">
<span></span>
</div>
<div class="travelDaysTitlle-left-textTwo">
<span></span>
</div>
</div>
</div>
</div>
<div class="travelDaysTitlle-right">
<div class="travelDaysTitlle-right-text row-aic"
:style="{'font-size': getFontSize(orderMsg.lineteamName+orderMsg.dayNum),'color':textColor}">
{{ orderMsg.lineteamName }}{{ orderMsg.dayNum }}日游
</div>
</div>
</div>
<!--
<div class="travelDaysTitlle row-aic">
<div class="travelDaysTitlle-left">
<div class="travelDaysTitlle-left-text column-ajc">
......@@ -21,7 +42,7 @@
{{ orderMsg.lineteamName }}{{ orderMsg.dayNum }}日游
</div>
</div>
</div>
</div> -->
<div style="margin: 0 30px;">
<div class="trip-adviser" style="margin-top: 20px;">
<!-- <h1 class="trip-nav-title">
......@@ -244,11 +265,19 @@
methods: {
getFontSize(title) {
if (title.length + 2 > 60) {
return 929 / 60 + 'px'
} else {
return '30px'
if (!title) return
let size = 30;
if (title && title.length > 0 && title.length > 80) {
var tempSize = Number(80) / Number(title.length);
tempSize = tempSize * 30;
size = tempSize.toFixed(1);
}
return size + "px";
// if (title.length + 2 > 60) {
// return 929 / 60 + 'px'
// } else {
// return '30px'
// }
},
},
computed: {},
......@@ -262,7 +291,7 @@
let rgba0 = rgba[0].split('(')
let arr = [rgba0[1], rgba[1], rgba[2]]
if (this.getRgbLevel(arr) > 50) {
this.textColor = "#fff"
this.textColor = "#333"
} else {
this.textColor = "#333"
}
......
src/components/LeaveGroupDownload/travelDays.vue
View file @ 8e472353
<template>
<div id="pdf_3" v-if="vshowD">
<div class="UpgradedVersion-boxHeight height UpgradedVersion-homebj relative" v-for="(item,index) in tripList">
<div style="width: 1123px;">
<template v-for="(i,index) in feature.detailsImageList">
<img :key="index" :src="feature.headerImage" style="width:100%;display: block;">
<img :key="index" :src="i" style="width:100%;display: block;">
<img :key="index" class="MT19" :src="feature.footerImage" style="width:100%;display: block;">
</template>
</div>
<div style="display: none;" class="UpgradedVersion-boxHeight height UpgradedVersion-homebj relative" v-for="(item,index) in tripList">
<div class="z-index1">
<Header :TripColor="dataAll.tripColor" :orderMsg="orderMsg"></Header>
<div class="travelDaysTitlle row-aic">
......@@ -123,7 +130,7 @@
components: {
Header
},
props: ['dataAll', 'tripList', 'orderMsg', 'orderTripdiff', 'vshowD', 'vshowK'],
props: ['dataAll', 'tripList', 'orderMsg', 'orderTripdiff', 'vshowD', 'vshowK','feature'],
data() {
return {
title: '北京-马德里-塞戈维亚-萨拉曼卡-贝尼多姆/小镇-瓦伦西亚-巴塞罗那（约 253km，约 3h）北京-马德里-塞戈维亚-萨拉曼卡-贝尼多姆/小镇-瓦伦西亚-巴塞罗那（约 253km，约 3h）',
......
src/components/confirmationOrderDownLoadNew.vue
View file @ 8e472353
......@@ -85,7 +85,7 @@
<!-- 行程天数 -->
<travelDays :dataAll="dataAll" :orderMsg="orderMsg" :orderTripdiff="orderTripdiff" :tripList="tripList"
:vshowD="vshowD" :vshowK="vshowK"></travelDays>
:vshowD="vshowD" :vshowK="vshowK" :feature="feature"></travelDays>
<!-- 团队费用说明 -->
<TourFareDescription :vshowE="vshowE" :vshowF="vshowF" :dataList="dataList" :feature="feature">
......@@ -979,7 +979,7 @@
<style>
@import url('../assets/css/tripIndex.css');
@import url("../assets/css/UpgradedVersion.css");
@import url("../assets/css/tripIndexNew.css");
@import url("../assets/css/tripIndexNew2.css");
@import url('../assets/css/detail.css');
......
src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue
View file @ 8e472353
......@@ -313,9 +313,6 @@
} else {
this.$refs.TravelFeature.setNewDate(data);
}
},
getConfig() {
},
/*获取组件配置信息【回调方法】*/
getConfig(configObj) {
......
src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_DirectThree.vue
View file @ 8e472353
......@@ -151,7 +151,7 @@
</div>
<div class="newDayContent"
:style="{'width':!item.isHide?'520px':'1020px'}">
<travelDaysTrip v-bind:dayObj="item" v-bind:CurrentIndex="index"
<travelDaysTrip :dataAll="dataAll" v-bind:dayObj="item" v-bind:CurrentIndex="index"
v-bind:TotalCount="subConfig.DayList.length" v-bind:isOpenGroup="isOpenGroup"
v-bind:AllCityList="AllCityList" v-bind:StartCity="StartCity" v-bind:UseTypeArray="UseTypeArray"
v-bind:AirPickUp="AirPickUp" v-bind:AirSend="AirSend" v-bind:DayList="subConfig.DayList"
......@@ -364,7 +364,7 @@
TrafficList: TrafficList,
WarmTipList: WarmTipList,
TitleList: TitleList,
IsUpdateTrip:this.subConfig.IsUpdateTrip
IsUpdateTrip:this.subConfig.IsUpdateTrip,
};
this.HotelList = HotelList;
this.DinnerList = DinnerList;
......@@ -406,7 +406,7 @@
this.emitData();
},
deep: true
}
},
}
};
......
src/components/newTravelmanager/travelLineTrip/components/travelDays.vue
View file @ 8e472353
......@@ -26,7 +26,7 @@
</div>
</div>
<!-- 一张图 1-单张图，2-多张图-->
<div v-if="dataAll.ShowTripType==1||(item.ScenicArray.length==0||item.ScenicArray.length==1)">
<div v-if="item.TitleObj.ShowTripType==1">
<div :id="'viewSpotBox_'+(item*4)+'_0'+index" class="travelDaysMasterMap relative borderRadius18 hidden">
<div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
<div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
......@@ -80,7 +80,7 @@
</div>
</div>
</div>
<template v-else>
<template v-if="item.TitleObj.ShowTripType==2">
<div class="column travelDaysMasterMap2-box">
<!-- 2张 -->
<div v-if="item.ScenicArray.length==2">
......@@ -793,6 +793,37 @@
},
methods: {
infor(){
this.RenderingOk = false;
this.ScenicArrayList = []
this.item.ScenicArray.forEach((x, index) => {
if(this.item.TitleObj.ShowTripType==1&&this.item.ScenicArray&&this.item.ScenicArray.length>0){
if (x.DefaultNum > 0) {
this.defaultScenicIndex = index;
this.ScenicArrayList.push(x)
}
}else{
this.ScenicArrayList.push(x)
}
});
if (this.ScenicArrayList.length == 0) {
this.item.ScenicArray.forEach((x, index) => {
if(this.item.TitleObj.ShowTripType==1&&this.item.ScenicArray&&this.item.ScenicArray.length>0){
if (index == 0) {
x.DefaultNum = 1;
this.defaultScenicIndex = index;
this.ScenicArrayList.push(x)
}
}else{
this.ScenicArrayList.push(x)
}
});
}
this.RenderingOk = true;
setTimeout(()=>{
this.pageHeight = document.querySelector(`#LineOfTravel${this.item * 4}_0${this.index}`).offsetHeight
},500)
},
getHtmlPlainText(html_str) {
//提取字符串中的文字
let re = new RegExp('<[^<>]+>', 'g')
......@@ -943,37 +974,7 @@
watch: {
item: {
handler(val, oldVal) {
this.RenderingOk = false;
this.ScenicArrayList = []
this.item.ScenicArray.forEach((x, index) => {
if(this.item.ScenicArray&&this.item.ScenicArray.length==1){
if (x.DefaultNum > 0) {
this.defaultScenicIndex = index;
this.ScenicArrayList.push(x)
}
}else{
this.ScenicArrayList.push(x)
}
});
if (this.ScenicArrayList.length == 0) {
this.item.ScenicArray.forEach((x, index) => {
if(this.item.ScenicArray&&this.item.ScenicArray.length==1){
if (index == 0) {
x.DefaultNum = 1;
this.defaultScenicIndex = index;
this.ScenicArrayList.push(x)
}
}else{
this.ScenicArrayList.push(x)
}
});
}
console.log(this.ScenicArrayList,'-----')
this.RenderingOk = true;
setTimeout(()=>{
this.pageHeight = document.querySelector(`#LineOfTravel${this.item * 4}_0${this.index}`).offsetHeight
},500)
this.infor()
},
deep: true,
immediate: true
......
src/components/newTravelmanager/travelLineTrip/travelDaysTripThree.vue
View file @ 8e472353
......@@ -222,9 +222,16 @@
</li>
</ul>
</div>
<div class="row-aic marginT10" style="width: 100%;" v-if="dayObj.ScenicArray.length>0&&dayObj.ScenicArray.length==1">
<div class="row-aic marginT10" style="width: 100%;" v-if="dayObj.ScenicArray.length>0">
<span>是否展示多景</span>
<div style="margin-left: 5px;">
<el-checkbox v-model="dayObj.TitleObj.ShowTripType" border size="mini"
:true-label="ShowTripType[0]" :false-label="ShowTripType[1]"></el-checkbox>
</div>
</div>
<div class="row-aic marginT10" style="width: 100%;" v-if="dayObj.TitleObj.ShowTripType==1&&dayObj.ScenicArray.length>0">
<span v-if="ishasScenic">默认展示图</span>
<el-select v-if="ishasScenic&&NoticeParameters.IsDirect==1" class="w220 Ht_hotelSelect" size="mini"
<el-select style="margin-left: 5px;" v-if="ishasScenic&&NoticeParameters.IsDirect==1" class="w220 Ht_hotelSelect" size="mini"
:placeholder="$t('pub.pleaseSel')" v-model="ScenicArraySingle" filterable @change="setDefaultScenic">
<el-option v-for="(item,index) in dayObj.ScenicArray" :label="item.CouponsName" :value="item.CouponsId"
:key="index">
......@@ -284,6 +291,7 @@
export default {
props: [
"dataAll",
"CurrentIndex", //当前索引
"TotalCount", //总索引
"dayObj", //行程每天对象
......@@ -301,6 +309,7 @@
],
data() {
return {
ShowTripType:[2,1],
ScenicArraySingle: this.dayObj.ScenicArrayImg ? this.dayObj.ScenicArrayImg : '', //单选默认图
ScenicArray: this.dayObj.ScenicArrayImg ? this.dayObj.ScenicArrayImg : [], //默认展示图
DefaultSelectValue: 0,
......@@ -322,6 +331,9 @@
};
},
methods: {
hasTripTypeChange(){
},
//设置默认显示的景点图
setDefaultScenic() {
this.dayObj.ScenicArray.forEach(x => {
......@@ -723,6 +735,12 @@
},
deep: true
},
dataAll: {
handler: function (val, oldVal) {
},
deep: true
},
},
mounted() {},
components: {
......
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