Skip to content

S
SuperMan
Commit 15e0f71f authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents ac94acbe 982553ea
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2876 additions and 58 deletions
src/assets/css/newTravelManager.css
View file @ 15e0f71f
......@@ -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: 15px solid #47bf8c;
border-bottom: 15px solid transparent;
border-left: 15px solid transparent;
border-right: 15px solid #47bf8c;
}
.travel_warningDi::after{
content: '地';
position: absolute;
top: -14px;
right: -12px;
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 @ 15e0f71f
......@@ -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/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @ 15e0f71f
......@@ -25,13 +25,13 @@
<li :class="active==1?'_active':''" @click="active=1,tabData(1)">{{$t('fnc.shoukuandan')}}</li>
<li :class="active==2?'_active':''" @click="active=2,tabData(2)">{{$t('fnc.fukuandan')}}</li>
<li v-if="!visaShowTab" :class="active==3?'_active':''" @click="active=3,tabData(3)">挂账单</li>
<li v-if="!visaShowTab" :class="active==4?'_active':''" @click="active=4,tabData(4)">责让单</li>
<li v-if="!visaShowTab" :class="active==4?'_active':''" @click="active=4,tabData(4)">折让单</li>
</ul>
<ul class="_nav ceshi clearfix" v-else>
<li :class="active==1?'_active':''" v-if="showTab==1">{{$t('fnc.shoukuandan')}}</li>
<li :class="active==2?'_active':''" v-if="showTab==2">{{$t('fnc.fukuandan')}}</li>
<li :class="active==3?'_active':''" v-if="showTab==3">挂账单</li>
<li :class="active==4?'_active':''" v-if="showTab==4">责让单</li>
<li :class="active==4?'_active':''" v-if="showTab==4">折让单</li>
</ul>
<!-- 搜索框匹配 -->
<div style="margin:10px 0;">
......
src/components/FinancialModule/RecPayQuery.vue
View file @ 15e0f71f
......@@ -920,7 +920,7 @@ export default {
this.transactionDate[0]=this.$route.query.StartDate;
this.transactionDate[1]=this.$route.query.StartDate;
if(this.$route.query.BankID==''){
// 费用类型：机票责让费
// 费用类型：机票折让费
this.msg.CostTypeID=197;
}
}
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 15e0f71f
......@@ -528,7 +528,7 @@ tr._item_list td:last-child {
<el-option value="9" v-if="isShowType" label="酒店住宿"></el-option>
<el-option value="10" v-if="isShowType" label="景点门票"></el-option>
<el-option value="11" v-if="isShowType" label="餐厅美食"></el-option>
<el-option value="13" label="机票责让"></el-option>
<el-option value="13" label="机票折让"></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -703,7 +703,7 @@ Vue.component("TCNUMJump", {
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===6" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===7" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===12" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===13" @click="goRec('RecPayQuery',rowData)">机票责让{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===13" @click="goRec('RecPayQuery',rowData)">机票折让{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===8" @click="goAIR('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===9">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===10">{{rowData.TCNUM}}</span>
......@@ -733,7 +733,7 @@ Vue.component("TCNUMJump", {
if(rowData.DataType===12){
BankID=19;
}
// 机票责让费
// 机票折让费
if(rowData.DataType===13){
BankID="";
StartDate=moment(rowData.StartDate).format("YYYY-MM-DD");
......
src/components/FinancialModule/addFinancialProcess.vue
View file @ 15e0f71f
......@@ -323,8 +323,8 @@
<el-radio v-model="radio" v-else @change="getCostTypeList(2),CostIdS=[],accListMsg=[],accListShow=false" :label="7">{{$t('fnc.guazhang')}}</el-radio>
<el-radio v-model="radio" v-if="addMsg.TemplateType!=8" disabled="disabled" :label="8">责让</el-radio>
<el-radio v-model="radio" v-else @change="getCostTypeList(2),CostIdS=[],accListMsg=[],accListShow=false" :label="8">责让</el-radio>
<el-radio v-model="radio" v-if="addMsg.TemplateType!=8" disabled="disabled" :label="8">折让</el-radio>
<el-radio v-model="radio" v-else @change="getCostTypeList(2),CostIdS=[],accListMsg=[],accListShow=false" :label="8">折让</el-radio>
</el-form-item>
<el-form-item :label="$t('fnc.scfujian')">
<el-radio v-model="addMsg.IsUploadPic" :label="0">{{$t('fnc.buqiyong')}}</el-radio>
......
src/components/Ticketing/TicketManager.vue
View file @ 15e0f71f
This diff is collapsed.
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ 15e0f71f
......@@ -611,7 +611,7 @@
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">成本</div>
<template v-if="IsHaveAuth">
<input type="button" value="团队责让" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="TDZR" />
<input type="button" value="团队折让" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="TDZR" />
<input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail" />
</template>
</div>
......@@ -1037,7 +1037,7 @@
</tr>
</template>
</table>
<!-- 团队责让 -->
<!-- 团队折让 -->
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">内部结算：
<span v-if="moneyAll.tdzryf>0 || moneyAll.tdzrsf>0">
......@@ -1058,7 +1058,7 @@
<th width="200">当前审核人</th>
</tr>
<template v-for="item in DataList.FinicePayList">
<tr v-if="isExists(item.CostTypeList,'机票责让费')">
<tr v-if="isExists(item.CostTypeList,'机票折让费')">
<td>
<el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
......@@ -1112,7 +1112,7 @@
</tr>
<template v-for="item in DataList.FinicePayList">
<tr
v-if="NotExists(item.CostTypeList,'机票责让费')&&NotExists(item.CostTypeList,'签证费')&&NotExists(item.CostTypeList,'签证佣金') && NotExists(item.CostTypeList,'地接费（领取）') && NotExists(item.CostTypeList,'地接费（结算）') && NotExists(item.CostTypeList,'提成') && NotExists(item.CostTypeList,'国内联运')&& NotExists(item.CostTypeList,'车资') && NotExists(item.CostTypeList,'邀请函费用') && NotExists(item.CostTypeList,'名单表费') && NotExists(item.CostTypeList,'领队佣金') && NotExists(item.CostTypeList,'导游佣金') &&item.OrderSource!==4 && NotExists(item.CostTypeList,'国际段机票') && NotExists(item.CostTypeList,'机票退税') && NotExists(item.CostTypeList,'机票罚金') && NotExists(item.CostTypeList,'机票税金') && item.OrderSource!==11 && NotExists(item.CostTypeList,'赔偿') && NotExists(item.CostTypeList,'保险费') && NotExists(item.CostTypeList,'旅游责任险')">
v-if="NotExists(item.CostTypeList,'机票折让费')&&NotExists(item.CostTypeList,'签证费')&&NotExists(item.CostTypeList,'签证佣金') && NotExists(item.CostTypeList,'地接费（领取）') && NotExists(item.CostTypeList,'地接费（结算）') && NotExists(item.CostTypeList,'提成') && NotExists(item.CostTypeList,'国内联运')&& NotExists(item.CostTypeList,'车资') && NotExists(item.CostTypeList,'邀请函费用') && NotExists(item.CostTypeList,'名单表费') && NotExists(item.CostTypeList,'领队佣金') && NotExists(item.CostTypeList,'导游佣金') &&item.OrderSource!==4 && NotExists(item.CostTypeList,'国际段机票') && NotExists(item.CostTypeList,'机票退税') && NotExists(item.CostTypeList,'机票罚金') && NotExists(item.CostTypeList,'机票税金') && item.OrderSource!==11 && NotExists(item.CostTypeList,'赔偿') && NotExists(item.CostTypeList,'保险费') && NotExists(item.CostTypeList,'旅游责任险')">
<td>
<el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
......@@ -1859,7 +1859,7 @@ this.moneyAll.otheryTotalsf+=item.PayMoney;
this.moneyAll.baoxiansf += item.PayMoney;
}
// 保险费
if (that.isExists(item.CostTypeList, '机票责让费')) {
if (that.isExists(item.CostTypeList, '机票折让费')) {
this.moneyAll.tdzryf += item.Money;
this.moneyAll.tdzrsf += item.PayMoney;
}
......@@ -1874,7 +1874,7 @@ this.moneyAll.otheryTotalsf+=item.PayMoney;
.CostTypeList, '国际段机票') && that.NotExists(item.CostTypeList, '机票退税') && that.NotExists(item
.CostTypeList, '机票罚金') && that.NotExists(item.CostTypeList, '机票税金') && item.OrderSource !==
11 && that.NotExists(item.CostTypeList, '赔偿') && that.NotExists(item.CostTypeList, '保险费') &&
that.NotExists(item.CostTypeList, '旅游责任险') && that.NotExists(item.CostTypeList, '机票责让费')) {
that.NotExists(item.CostTypeList, '旅游责任险') && that.NotExists(item.CostTypeList, '机票折让费')) {
this.moneyAll.otheryf += item.Money;
this.moneyAll.othersf += item.PayMoney;
}
......@@ -1926,7 +1926,7 @@ this.moneyAll.otheryTotalsf+=item.PayMoney;
}
});
},
//团队责让
//团队折让
TDZR() {
var TCArr = [this.TCID];
let orderObj = {
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 15e0f71f
......@@ -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/activity/AppActivityExclusive.vue 0 → 100644
View file @ 15e0f71f
This diff is collapsed.
src/components/activity/CouponList.vue
View file @ 15e0f71f
......@@ -136,6 +136,7 @@
<th>{{$t('admin.admin_status')}}</th>
<th>{{$t('active.cl_addPp')}}</th>
<th>换购价</th>
<th>活动时间</th>
<th>备注</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
......@@ -177,6 +178,10 @@
</td>
<td>{{item.createUserName}}</td>
<td>{{item.redemptionPrice}}</td>
<td>
<p>开始时间：{{item.activityStartDate}}</p>
<p>结束时间：{{item.activityEndDate}}</p>
</td>
<td>{{item.remark}}</td>
<td class="text_al_left">
<!-- <el-button-group> -->
......
src/components/newTravelmanager/TravelGroupControl/TravelConfig.vue
View file @ 15e0f71f
......@@ -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 @ 15e0f71f
......@@ -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 @ 15e0f71f
......@@ -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 @ 15e0f71f
......@@ -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 @ 15e0f71f
......@@ -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 @ 15e0f71f
......@@ -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',
......@@ -3798,6 +3806,14 @@ export default {
title: '优惠券列表'
}
},
{
path: '/AppActivityExclusive',
name: 'AppActivityExclusive',
component: resolve => require(['@/components/activity/AppActivityExclusive'], resolve),
meta: {
title: 'APP专享活动'
}
},
{
path: '/CouponDetail',
name: 'CouponDetail',
......
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