Skip to content

S
SuperMan
Commit a8326654 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

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

parents d3b131ca 956a2d7a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1950 additions and 42 deletions
src/assets/css/newTravelManager.css
View file @ a8326654
......@@ -499,7 +499,7 @@
}
.TDTextspan {
display: inline-block;
margin: 0 12px 0 30px;
margin: 0 12px 0 23px;
}
.TDTextspan:first-child {
margin-left: 0px;
......@@ -2855,6 +2855,26 @@
color: #FFFFFF;
font-size: 12px;
}
.travel_warningDi{
position: absolute;
top: 0px;
right: 0px;
width: 0px;
height: 0px;
border-top: 12px solid red;
border-bottom: 12px solid transparent;
border-left: 12px solid transparent;
border-right: 12px solid red;
}
.travel_warningDi::after{
content: '地';
position: absolute;
top: -12px;
right: -10px;
white-space: nowrap;
color: #FFFFFF;
font-size: 12px;
}
.TC_customerInfo table{margin-top:15px;padding-right: 20px;}
.TC_customerInfo table tr td{
height:40px;
......@@ -2874,3 +2894,8 @@
.travelnowrap{white-space: nowrap}
/*团控列表报价样式*/
.travelprice{color:#47BF8C; font-size: 12px; font-weight: bold; margin: 5px 0;white-space: nowrap}
.showOther{
display:none!important;
}
src/components/FinancialModule/Application.vue
View file @ a8326654
......@@ -271,7 +271,6 @@ export default {
}
}
// console.log("this.data",this.data)
this.formdata=Object.assign({},res.data.data);
if(this.formdata.Type==0){
this.formdata.Type=1;
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ a8326654
......@@ -383,7 +383,8 @@
</div>
<div>
<div class="el-col" style="position:relative;width:200px">
<div v-if="item.IsWarning===1" title="紧急团" class="travel_warning"></div>
<div v-if="item.IsWarning===1&&item.TeamType!=3" title="紧急团" class="travel_warning"></div>
<div v-else title="地接团" class="travel_warningDi"></div>
<div>
<div class="TC_teamType">
<span v-if="item.IsB2B==0" title="内部团">{{$t('Operation.Op_nei')}}</span>
......@@ -749,10 +750,17 @@
<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown" class="TC-dropdown">
<el-dropdown-item @click.native="goToOpenTravel('TravelManager2',item.ID,0)">
<el-dropdown-item v-if="item.TeamType!=3" @click.native="goToOpenTravel('TravelManager2',item.ID,0)">
{{$t('Operation.Op_xilieModyfi')}}
</el-dropdown-item>
<el-dropdown-item @click.native="goTonowTeam('TravelManager2',item.ID,item.TCID,item.TCNUM)">
<el-dropdown-item v-else @click.native="goToOpenTravel('TravelManager6',item.ID,0)">
{{$t('Operation.Op_xilieModyfi')}}
</el-dropdown-item>
<el-dropdown-item v-if="item.TeamType!=3" @click.native="goTonowTeam('TravelManager2',item.ID,item.TCID,item.TCNUM)">
{{$t('Operation.Op_dangtuanModify')}}
</el-dropdown-item>
<el-dropdown-item v-else @click.native="goTonowTeam('TravelManager6',item.ID,item.TCID,item.TCNUM)">
{{$t('Operation.Op_dangtuanModify')}}
</el-dropdown-item>
</el-dropdown-menu>
......
src/components/newTravelmanager/TravelGroupControl/TravelConfig.vue
View file @ a8326654
......@@ -110,30 +110,36 @@
</el-form-item>
</div>
</div>
<div>
<div :class="{'showOther':TeamType==3}">
<el-form-item label="PDF别名">
<el-input type="text" v-model="PostConfig.PDFAlias"></el-input>
</el-form-item>
</div>
<div>
<div v-if="TeamType==3">
<el-form-item label="标题备注">
<el-input v-model="PostConfig.Title" type="textarea" :autosize="{minRows: 3, maxRows: 3 }" resize="none"
placeholder="标题备注"></el-input>
</el-form-item>
</div>
<div v-else>
<el-form-item label="团队标题">
<el-input v-model="PostConfig.Title" type="textarea" :autosize="{minRows: 3, maxRows: 3 }" resize="none"
placeholder="请填写团队标题"></el-input>
</el-form-item>
</div>
<div>
<div :class="{'showOther':TeamType==3}">
<el-form-item label="本团卖点">
<el-input v-model="PostConfig.ProductRecommend" type="textarea" :autosize="{minRows: 3, maxRows: 3 }"
resize="none" placeholder="本团卖点" maxlength="2000"></el-input>
</el-form-item>
</div>
<div>
<div :class="{'showOther':TeamType==3}">
<el-form-item label="备注">
<el-input v-model="PostConfig.OpenTeamDescribe" type="textarea" :autosize="{minRows: 1, maxRows: 2 }"
resize="none" placeholder="此备注只在开团行程列表中显示" maxlength="300"></el-input>
</el-form-item>
</div>
<div class="_VideoStr_box">
<div class="_VideoStr_box" :class="{'showOther':TeamType==3}">
<el-form-item label="视频地址">
<el-input v-model="PostConfig.VideoStr" type="textarea" :autosize="{minRows: 1, maxRows: 1 }"
placeholder="https//:video.mp4" @blur="loadVideo"></el-input>
......@@ -154,7 +160,7 @@
<div v-if="GGMapShow">
<GGMap></GGMap>
</div>
<div class="Travel_ImgList clearfix">
<div class="Travel_ImgList clearfix" :class="{'showOther':TeamType==3}">
<div class="TFimgList" v-for="(item,index) in PostConfig.fileList" :key="item.subCode">
<img v-if="!item.Url" src="../../../assets/img/bg_c3@3x.png">
<img v-else :src='compressImg(item.Url, "filt", 170, "")'>
......@@ -210,7 +216,7 @@
import GGMap from "../../commonPage/GGMap";
export default {
/*接收父组件传递的参数*/
props: ["PostConfig", "LineList" ,"TCNUM"],
props: ["PostConfig", "LineList" ,"TCNUM","TeamType"],
data() {
return {
//系列列表
......
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ a8326654
......@@ -288,7 +288,7 @@
},
getHtml: function (postData, SaveType, TeamType) {
//HK 2019-10-14 新增开始
if (this.$refs.newFeature2 != undefined) {
if (this.$refs.newFeature2 != undefined) {
//检查是否有更新
var IsRefresh = this.$refs.newFeature2.getIsRefresh();
if (IsRefresh) {
......@@ -355,8 +355,10 @@
path = "TravelManager3";
} else if (TeamType == 2) {
path = "TravelManager4";
} else if (TeamType == 3) {
path = "TravelManager6";
}
if(postData.isfromManager){
if (postData.isfromManager) {
path = "TravelManager5";
}
this.Success("保存成功");
......@@ -378,7 +380,8 @@
//提交按钮和另存模板跳转团控列表
else if (SaveType == 2 || SaveType == 3) {
let path = "TravelControlList";
if (TeamType == 0) {
//OP开团和地接开团
if (TeamType == 0 || TeamType == 3) {
path = "TravelControlList";
} else if (TeamType == 1) {
path = "TravelControlListSale";
......
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ a8326654
......@@ -15,12 +15,12 @@
<div class="TravelNavList" :class="{'TravelCked':ckedNav==2}" @click.prevent="custormAnchor('secondAnchor',2)">
线路行程
</div>
<div class="TravelLine"></div>
<div class="TravelNavList" :class="{'TravelCked':ckedNav==3}" @click.prevent="custormAnchor('thirdAnchor',3)">
<div class="TravelLine" v-if="TeamType!=3"></div>
<div class="TravelNavList" v-if="TeamType!=3" :class="{'TravelCked':ckedNav==3}" @click.prevent="custormAnchor('thirdAnchor',3)">
产品特色
</div>
<div class="TravelLine"></div>
<div class="TravelNavList" :class="{'TravelCked':ckedNav==4}" @click.prevent="custormAnchor('fourAnchor',4)">
<div class="TravelLine" v-if="TeamType!=3"></div>
<div class="TravelNavList" v-if="TeamType!=3" :class="{'TravelCked':ckedNav==4}" @click.prevent="custormAnchor('fourAnchor',4)">
补充信息
</div>
<div class="TravelLine"></div>
......@@ -31,16 +31,17 @@
</div>
<div class="newTravelRight" v-loading="loading">
<TravelConfig @headCallBack="getConfig" @setTravelUploadData="setTravelUploadData" :PostConfig="PostConfig"
:TCNUM="TCNUM" id="firstAnchor" :LineList="LineList"></TravelConfig>
:TCNUM="TCNUM" id="firstAnchor" :LineList="LineList" :TeamType="TeamType"></TravelConfig>
<TravelDaysTripDirect id="secondAnchor" @headCallBack="getDaysTrip" :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 ref="TravelFeature" id="thirdAnchor" @featureCallBack="getFeature" :FeatureData="FeatureData"
:TeamType="TeamType" :isNewConfig="isNewConfig" @unlockFormCommit="unlockFormCommit"></TravelFeature>
<TravelNotice ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice" :subArray="NoticeParameters"
:NoticeData="NoticeData" v-bind:PostConfig="PostConfig" v-bind:AllCityList="AllCityList"
v-bind:CountryID="PostConfig.CountryID"></TravelNotice>
<TravelFeature :class="{'showOther':TeamType==3}" ref="TravelFeature" id="thirdAnchor"
@featureCallBack="getFeature" :FeatureData="FeatureData" :TeamType="TeamType" :isNewConfig="isNewConfig"
@unlockFormCommit="unlockFormCommit"></TravelFeature>
<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"
......@@ -51,6 +52,10 @@
<TravelPrice3 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip"
v-if="TeamType==2" :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
:TeamType="TeamType"></TravelPrice3>
<TravelPrice4 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip"
v-if="TeamType==3" :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
:TeamType="TeamType"></TravelPrice4>
<div class="btnFixedDiv" v-if="IsShowBtn">
<div class="toTop" @click="backTop">
<i class="iconfont icon-huidaodingbu"></i>
......@@ -75,6 +80,7 @@
import TravelPrice from "../TravelGroupControl/TravelPrice";
import TravelPrice2 from "../TravelGroupControl/TravelPrice2";
import TravelPrice3 from "../TravelGroupControl/TravelPrice3";
import TravelPrice4 from "../TravelGroupControl/TravelPrice4";
export default {
provide() {
......@@ -217,7 +223,8 @@
TravelNotice: TravelNotice,
TravelPrice: TravelPrice,
TravelPrice2: TravelPrice2,
TravelPrice3: TravelPrice3
TravelPrice3: TravelPrice3,
TravelPrice4: TravelPrice4
},
methods: {
/*获取行程特色内容对象*/
......@@ -609,6 +616,9 @@
if (routeName == 'TravelManager4') {
this.TeamType = 2;
}
if (routeName == 'TravelManager6') {
this.TeamType = 3;
}
let configId = this.$route.query.configId;
this.modifyTcid = this.$route.query.tcid;
this.TCNUM = this.$route.query.TCNUM;
......@@ -765,6 +775,9 @@
this.initFileList();
this.initFeatureFile();
this.loading = true;
if (this.TeamType == 3) {
this.PostConfig.LineteamId = 588;
}
this.apipost(
"travel_get_GetCommonTravelInfo", {
TeamType: this.TeamType
......
src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_Direct.vue
View file @ a8326654
......@@ -76,8 +76,8 @@
</el-input>
</el-form-item>
</span>
<span class="TDTextspan">集合出发城市</span>
<span>
<span class="TDTextspan" :class="{'showOther':TeamType==3}">集合出发城市</span>
<span :class="{'showOther':TeamType==3}">
<el-form-item prop="StartCityId">
<el-select class="w120" :placeholder="$t('pub.pleaseSel')" v-model="subConfig.StartCityId" filterable>
<el-option :label="$t('pub.unlimitedSel')" :value="SelectDefaultValue"></el-option>
......@@ -86,8 +86,8 @@
</el-select>
</el-form-item>
</span>
<span class="TDTextspan">返回抵达城市</span>
<span>
<span class="TDTextspan" :class="{'showOther':TeamType==3}">返回抵达城市</span>
<span :class="{'showOther':TeamType==3}">
<el-form-item prop="ReturnArriveCityId">
<el-select class="w120" :placeholder="$t('pub.pleaseSel')" v-model="subConfig.ReturnArriveCityId"
filterable>
......@@ -97,8 +97,8 @@
</el-select>
</el-form-item>
</span>
<span class="TDTextspan" >是否更新行程特色</span>
<span>
<span class="TDTextspan" :class="{'showOther':TeamType==3}">是否更新行程特色</span>
<span :class="{'showOther':TeamType==3}">
<el-form-item prop="ReturnArriveCityId">
<el-select class="w120" :placeholder="$t('pub.pleaseSel')" v-model="subConfig.IsUpdateTrip">
<el-option label="不更新" :value="0"></el-option>
......
src/components/newTravelmanager/travelLineTrip/travelDaysTrip.vue
View file @ a8326654
......@@ -186,33 +186,33 @@
</div>
</div>
<div class>
<noScenic v-if="!ishasScenic" :trafficObj="dayObj.TrafficObj"></noScenic>
<noScenic v-if="!ishasScenic" :trafficObj="dayObj.TrafficObj" :class="{'showOther':TeamType==3}"></noScenic>
</div>
<div class="TC-ComInfoDiv" :class="scenicCheck>0||dayObj.ScenicArray.length>0?'_margin_bottom':''">
<onedayList
<onedayList :class="{'showOther':TeamType==3}"
v-if="(NoticeParameters.IsDirect==1 && dayObj.ScenicArray.length==1)||(scenicCheck==1 && NoticeParameters.IsDirect==0)"
:isRead="dayObj.isRead" :scenicArray="dayObj.ScenicArray"
:IsDirect="NoticeParameters.IsDirect" :DayNum="dayObj.DayNum"></onedayList>
<twodayList
<twodayList :class="{'showOther':TeamType==3}"
v-if="(NoticeParameters.IsDirect==1 && dayObj.ScenicArray.length==2)||(scenicCheck==2 && NoticeParameters.IsDirect==0)"
:isRead="dayObj.isRead" :scenicArray="dayObj.ScenicArray"
:IsDirect="NoticeParameters.IsDirect" :DayNum="dayObj.DayNum"></twodayList>
<threedayList
<threedayList :class="{'showOther':TeamType==3}"
v-if="(NoticeParameters.IsDirect==1 && dayObj.ScenicArray.length==3)||(scenicCheck==3 && NoticeParameters.IsDirect==0)"
:isRead="dayObj.isRead" :scenicArray="dayObj.ScenicArray"
:IsDirect="NoticeParameters.IsDirect" :DayNum="dayObj.DayNum"></threedayList>
<fourdayList
<fourdayList :class="{'showOther':TeamType==3}"
v-if="(NoticeParameters.IsDirect==1 && dayObj.ScenicArray.length==4)||(scenicCheck==4 && NoticeParameters.IsDirect==0)"
:isRead="dayObj.isRead" :scenicArray="dayObj.ScenicArray"
:IsDirect="NoticeParameters.IsDirect" :DayNum="dayObj.DayNum"></fourdayList>
<fivedayList
<fivedayList :class="{'showOther':TeamType==3}"
v-if="(NoticeParameters.IsDirect==1 && dayObj.ScenicArray.length==5)||(scenicCheck==5 && NoticeParameters.IsDirect==0)"
:isRead="dayObj.isRead" :scenicArray="dayObj.ScenicArray"
:IsDirect="NoticeParameters.IsDirect" :DayNum="dayObj.DayNum"></fivedayList>
</div>
<div class="TC-warmTips TC-Comtitlediv" v-if="!dayObj.isRead">
<div class="TC-warmTips TC-Comtitlediv" v-if="!dayObj.isRead" :class="{'showOther':TeamType==3}">
<div class="TC-SpecialInstruction clearfix">
<div class="TC-leftTitle">温馨提醒</div>
<div class="TC-leftTitle">温馨提醒111</div>
<div class="TC-rightContent">
<!--<el-input type="textarea" v-model="dayObj.WarmTipObj.Description"></el-input>-->
<my-edit v-on:edit-value="dayObj.WarmTipObj.Description = arguments[0]"
......@@ -222,9 +222,9 @@
</div>
</div>
</div>
<div class="TC-warmTips TC-Comtitlediv TC-warmText" v-if="dayObj.isRead">
<div class="TC-warmTips TC-Comtitlediv TC-warmText" v-if="dayObj.isRead" :class="{'showOther':TeamType==3}">
<div class="TC-SpecialInstruction clearfix">
<div class="TC-leftTitle">温馨提醒</div>
<div class="TC-leftTitle">温馨提醒222</div>
<div class="TC-rightContent" v-html="dayObj.WarmTipObj.Description"></div>
</div>
</div>
......
src/router/config.js
View file @ a8326654
......@@ -1854,6 +1854,14 @@ export default {
title: '自主开团'
},
},
{
path: '/TravelManager6',
name: 'TravelManager6',
component: resolve => require(['@/components/newTravelManager/TravelGroupControl/TravelManager2'], resolve),
meta: {
title: '地接开团'
},
},
{
path: '/BasicOpenGroup', //基础班团控配置
name: 'BasicOpenGroup',
......
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