Skip to content

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

页面修改

parent c79d2bf9
Show whitespace changes
Inline Side-by-side
Showing with 129 additions and 173 deletions
src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue
View file @ c1920649
<style>
@import "../../../assets/css/newTravelManager.css";
@import "../../../assets/css/endTravelManager.css";
.mapImg-Img p{
.mapImg-Img p {
text-align: center;
padding: 20px 40px;
font-size: 18px;
color: #E95252;
}
.mapImg-Img img{
.mapImg-Img img {
pointer-events: auto !important;
}
</style>
<template>
<div class="clearfix" style="margin:auto;width:1200px;">
......@@ -30,7 +33,7 @@
<div class="TravelLine" v-if="TeamType!=3"></div>
<div class="TravelNavList" v-if="(TeamType!=3)" :class="{'TravelCked':ckedNav==6}"
@click.prevent="custormAnchor('thirdMap',6)">
地图
地图 {{PostConfig.TeamType}}
</div>
<div class="TravelLine" v-if="TeamType!=3"></div>
<div class="TravelNavList" v-if="TeamType!=3" :class="{'TravelCked':ckedNav==4}"
......@@ -47,10 +50,11 @@
<TravelConfig @headCallBack="getConfig" @setTravelUploadData="setTravelUploadData" :PostConfig="PostConfig"
:TCNUM="TCNUM" id="firstAnchor" :LineList="LineList" :TeamType="TeamType" :CurrentUserInfo="CurrentUserInfo">
</TravelConfig>
<TravelDaysTripDirect id="secondAnchor" @headCallBack="getDaysTrip" :dataAll="PostConfig" :NoticeParameters="NoticeParameters"
:subConfig="journeyList" :isOpenGroup="false" :IsDirect="PostConfig.IsDirect" v-bind:AllCityList="AllCityList"
v-bind:StartCity="StartCity" :UseTypeArray="UseTypeArray" :AirPickUp="AirPickUp" :AirSend="AirSend"
@change="handlerChangeData" :TeamType="TeamType" :IsOpenHotel="PostConfig.IsOpenHotel"></TravelDaysTripDirect>
<TravelDaysTripDirect id="secondAnchor" @headCallBack="getDaysTrip" :dataAll="PostConfig"
:NoticeParameters="NoticeParameters" :subConfig="journeyList" :isOpenGroup="false"
:IsDirect="PostConfig.IsDirect" v-bind:AllCityList="AllCityList" v-bind:StartCity="StartCity"
:UseTypeArray="UseTypeArray" :AirPickUp="AirPickUp" :AirSend="AirSend" @change="handlerChangeData"
:TeamType="TeamType" :IsOpenHotel="PostConfig.IsOpenHotel"></TravelDaysTripDirect>
<TravelFeature :TripColor="PostConfig.TripColor" :class="{'showOther':(TeamType==3)}" ref="TravelFeature"
id="thirdAnchor" @featureCallBack="getFeature" :FeatureData="FeatureData" :TeamType="TeamType"
:isNewConfig="isNewConfig" @unlockFormCommit="unlockFormCommit" :CurrentUserInfo="CurrentUserInfo">
......@@ -64,40 +68,38 @@
</div>
<div class="mapImg-Img marginT20">
<div v-if="PostConfig&&PostConfig.MapUrl">
<el-image
style="width: 100%; height: auto;"
:src="PostConfig.MapUrl"
<el-image style="width: 100%; height: auto;" :src="PostConfig.MapUrl"
:preview-src-list="[PostConfig.MapUrl]">
</el-image>
</div>
<p v-else @click="ShowMap=!ShowMap" style="cursor: pointer;">地图暂未生成图</p>
</div>
</div>
<Tripmap v-if="ShowMap" :PostConfig="PostConfig" :ConfigId="ConfigId"
@Cancel="ShowMap=false"
@Success="getMapImgSuccess()"
@saveMsg="SaveData(1)"></Tripmap>
<Tripmap v-if="ShowMap" :PostConfig="PostConfig" :ConfigId="ConfigId" @Cancel="ShowMap=false"
@Success="getMapImgSuccess()" @saveMsg="SaveData(1)"></Tripmap>
</div>
<TravelNotice :class="{'showOther':TeamType==3}" ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice"
:subArray="NoticeParameters" :NoticeData="NoticeData" v-bind:PostConfig="PostConfig"
v-bind:AllCityList="AllCityList" v-bind:CountryID="PostConfig.CountryID"></TravelNotice>
<!--常规团-->
<TravelPrice @saveMsg="SaveData(1)" ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice"
:priceList="PriceList" v-if="TeamType==0" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
:TeamType="TeamType" :CurrentUserInfo="CurrentUserInfo" :IsDirect="PostConfig.IsDirect"></TravelPrice>
<TravelPrice v-show="PostConfig.TeamType==0" @saveMsg="SaveData(1)" ref="TravelPrice" id="fiveAnchor"
@headCallBack="getPrice" :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
:CurrentUserInfo="CurrentUserInfo" :IsDirect="PostConfig.IsDirect"></TravelPrice>
<!--小包团-->
<TravelPrice2 @saveMsg="SaveData(1)" ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice"
:PostDaysTrip="PostDaysTrip" v-if="TeamType==1" :priceList="PriceList" :PostConfig="PostConfig"
:modifyTcid="modifyTcid" :TeamType="TeamType" :CurrentUserInfo="CurrentUserInfo"
:IsDirect="PostConfig.IsDirect"></TravelPrice2>
<!--一日游-->
<TravelPrice2 v-show="PostConfig.TeamType==1" @saveMsg="SaveData(1)" ref="TravelPrice" id="fiveAnchor"
@headCallBack="getPrice" :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
:CurrentUserInfo="CurrentUserInfo" :IsDirect="PostConfig.IsDirect">
</TravelPrice2>
<!--当地游-->
<TravelPrice3 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip"
v-if="TeamType==2" :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
:TeamType="TeamType"></TravelPrice3>
v-if="PostConfig.TeamType==2" :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
:TeamType="PostConfig.TeamType"></TravelPrice3>
<!--地接团-->
<TravelPrice4 @saveMsg="SaveData(1)" ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice"
:PostDaysTrip="PostDaysTrip" v-if="TeamType==3" :priceList="PriceList" :PostConfig="PostConfig"
:modifyTcid="modifyTcid" :TeamType="TeamType"></TravelPrice4>
:PostDaysTrip="PostDaysTrip" v-if="PostConfig.TeamType==3" :priceList="PriceList" :PostConfig="PostConfig"
:modifyTcid="modifyTcid" :TeamType="PostConfig.TeamType"></TravelPrice4>
<div class="btnFixedDiv" v-if="IsShowBtn">
<div class="toTop" @click="backTop">
......@@ -211,9 +213,9 @@
WCountryId: 0, //国家编号
WLocationId: 0, //位置编号
WCityId: 0, //城市编号
TripColor:"",//行程特色主色
TripCountryList: [],//行程国家
TripCitwlist: [],//行程城市
TripColor: "", //行程特色主色
TripCountryList: [], //行程国家
TripCitwlist: [], //行程城市
TripMapList: [],
},
//行程
......@@ -297,7 +299,7 @@
};
},
methods: {
getMapImgSuccess(path){
getMapImgSuccess(path) {
this.PostConfig.MapUrl = path
this.ShowMap = false
},
......@@ -316,7 +318,7 @@
this.$refs.TravelFeature.setNewDate(data);
}
},
getConfig(){
getConfig() {
},
/*获取组件配置信息【回调方法】*/
......@@ -439,7 +441,7 @@
basicData.ReturnArriveCityId = this.PostDaysTrip.ReturnArriveCityId;
}
}
basicData.TripColor=this.PostConfig.TripColor;
basicData.TripColor = this.PostConfig.TripColor;
basicData.SelfpayingList = this.PostConfig.SelfpayingList;
basicData.ShopList = this.PostConfig.ShopList;
basicData.DinnerList = this.PostDaysTrip.DinnerList;
......@@ -851,10 +853,10 @@
}
//如果当前config配置主色就使用当前config配置的主色，没有配置，就取线路配置的主色
if (tempData.TripColor && tempData.TripColor != '') {
this.PostConfig.TripColor=tempData.TripColor;
this.PostConfig.TripColor = tempData.TripColor;
this.FeatureData.TripColor = tempData.TripColor;
} else if (tempData.LineTripColor && tempData.LineTripColor != '') {
this.PostConfig.TripColor=tempData.LineTripColor;
this.PostConfig.TripColor = tempData.LineTripColor;
this.FeatureData.TripColor = tempData.LineTripColor;
}
this.FeatureData.LtName = tempData.LtName;
......@@ -868,7 +870,7 @@
this.PostConfig.LineId = tempData.LineId;
this.PostConfig.LineteamId = tempData.LineteamId;
this.PostConfig.CountryID = tempData.CountryID;
this.PostConfig.TeamType=tempData.TeamType;
this.PostConfig.TeamType = tempData.TeamType;
//视频地址
this.PostConfig.VideoStr = tempData.VideoStr;
this.PostConfig.OpenTeamDescribe = tempData.OpenTeamDescribe;
......@@ -882,8 +884,8 @@
this.PostConfig.TripCitwlist = tempData.TripCitwlist;
this.PostConfig.TripMapList = tempData.TripMapList;
this.PostConfig.MapUrl = tempData.MapUrl;
let arrList = function(list){
list.forEach(x=>{
let arrList = function (list) {
list.forEach(x => {
x.NationList = []
x.CityListAll = []
x.CityListIds = []
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ c1920649
......@@ -398,7 +398,7 @@
<ul class="days">
<li class="liList" v-for="(dayobject,index) in days" :key="index+1000">
<span v-if="dayobject.checkState==$calendarUtils.checkState.noChecked"
class="other-month" >{{dayobject.day.getDate()}}</span>
class="other-month">{{dayobject.day.getDate()}}</span>
<!---->
<span v-if="dayobject.checkState==$calendarUtils.checkState.checked" class="checked1"
@click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
......@@ -664,14 +664,6 @@
'TCb2c':standardCurrencyName=='新台币','AppPlat':standardCurrencyName=='',
'otherPlat':standardCurrencyName=='',}">{{standardCurrencyName}}结算</span>
</el-form-item>
<!-- <el-form-item prop="OutGroupType" style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">组团类型</span>
<el-select class="w180" v-model="priceData.OutGroupType">
<el-option v-for="item in OutGroupTypeList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
</el-form-item> -->
<el-form-item style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">供应商</span>
<el-select class="w180" v-model="priceData.SupplierId">
......@@ -884,7 +876,8 @@
<el-select class="w180" v-model="priceData.PriceTeamType">
<template v-for="item in TeamListArr">
<!--去掉小包团2023-04-19-->
<el-option v-if="item.Id!=4" :key="item.Id" :label="item.Name" :value="item.Id">
<el-option v-if="item.Id==1||item.Id==2||item.Id==3||item.Id==4" :key="item.Id"
:label="item.Name" :value="item.Id">
</el-option>
</template>
</el-select>
......@@ -1111,9 +1104,7 @@
import TravelPriceFlightList from "../TravelGroupControl/TravelPriceFlightList.vue";
import TravelPriceFlightList_Self from "../TravelGroupControl/TravelPriceFlightList_Self.vue";
export default {
props: ["priceList", "priceIsDirect", "OfferList", "PostConfig", "modifyTcid", "TeamType", "CurrentUserInfo",
"IsDirect"
],
props: ["priceList", "PostConfig", "modifyTcid", "CurrentUserInfo", "IsDirect"],
data() {
return {
outerVisible: false,
......@@ -1993,8 +1984,7 @@
this.apipost("travel_get_GetTravelPriceTeamTypeList", {}, res => {
if (res.data.resultCode == 1) {
this.TeamListArr = res.data.data;
// 屏蔽单项服务
this.TeamListArr.splice(-1)
} else {
this.Error(res.data.message);
}
......@@ -2090,14 +2080,6 @@
},
deep: true
},
//监听报价单日期
OfferList: {
//深度监听，可监听到对象、数组的变化
handler: function (val, oldVal) {
this.initCalendar();
},
deep: true
}
},
components: {
TravelPriceFlightList: TravelPriceFlightList,
......@@ -2105,5 +2087,4 @@
TravelPriceFlightListSelf: TravelPriceFlightList_Self,
}
};
</script>
\ No newline at end of file
src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue
View file @ c1920649
......@@ -883,7 +883,7 @@
<el-select class="w180" v-model="priceData.PriceTeamType">
<template v-for="item in TeamListArr">
<!--去掉小包团2023-04-19-->
<el-option v-if="item.Id!=4" :key="item.Id" :label="item.Name" :value="item.Id">
<el-option v-if="item.Id==2||item.Id==3" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</template>
</el-select>
......@@ -1994,8 +1994,7 @@
this.apipost("travel_get_GetTravelPriceTeamTypeList", {}, res => {
if (res.data.resultCode == 1) {
this.TeamListArr = res.data.data;
// 屏蔽单项服务
this.TeamListArr.splice(-1)
} else {
this.Error(res.data.message);
}
......@@ -2043,6 +2042,7 @@
priceList: {
//深度监听，可监听到对象、数组的变化
handler: function (val, oldVal) {
console.log("travel_price2");
this.returnPriceList = JSON.parse(JSON.stringify(this.priceList));
//当团期修改
if (this.modifyTcid > 0) {
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue
View file @ c1920649
......@@ -385,11 +385,11 @@
<span v-if="dayobject.checkState==$calendarUtils.checkState.noChecked"
class="other-month">{{dayobject.day.getDate()}}</span>
<!---->
<span v-if="dayobject.checkState==$calendarUtils.checkState.checked"
class="checked1" @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
<span v-if="dayobject.checkState==$calendarUtils.checkState.checked" class="checked1"
@click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
<!---->
<span
v-else-if="dayobject.checkState==$calendarUtils.checkState.hasValue" @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
<span v-else-if="dayobject.checkState==$calendarUtils.checkState.hasValue"
@click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
</li>
</ul>
</div>
......@@ -865,7 +865,7 @@
<script>
import TravelPriceFlightList from "../TravelGroupControl/TravelPriceFlightList.vue";
export default {
props: ["priceList", "priceIsDirect", "OfferList", "PostConfig", "modifyTcid", "TeamType"],
props: ["priceList", "PostConfig", "modifyTcid", "CurrentUserInfo", "IsDirect"],
data() {
return {
outerVisible: false,
......@@ -1178,25 +1178,6 @@
this.returnPriceList.push(obj);
})
} else {
// var that = this;
// if (this.returnPriceList && this.returnPriceList.length > 0) {
// this.returnPriceList.forEach(item => {
// if (item.TCID > 0) {
// that.apipost(
// "travel_post_RemoveTravelPrice", {
// TCID: item.TCID
// },
// res => {
// if (res.data.resultCode == 1) {
// } else {
// that.Info(res.data.message);
// }
// },
// null
// );
// }
// })
// }
//取消选中
this.days.forEach(x => {
x.checkState = '2';
......@@ -1788,14 +1769,6 @@
},
deep: true
},
//监听报价单日期
OfferList: {
//深度监听，可监听到对象、数组的变化
handler: function (val, oldVal) {
this.initCalendar();
},
deep: true
}
},
components: {
TravelPriceFlightList: TravelPriceFlightList
......
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