Commit b1e7e989 authored by zhengke's avatar zhengke

页面修改

parent 790b293d
...@@ -499,7 +499,7 @@ ...@@ -499,7 +499,7 @@
} }
.TDTextspan { .TDTextspan {
display: inline-block; display: inline-block;
margin: 0 12px 0 30px; margin: 0 12px 0 23px;
} }
.TDTextspan:first-child { .TDTextspan:first-child {
margin-left: 0px; margin-left: 0px;
......
...@@ -752,7 +752,10 @@ ...@@ -752,7 +752,10 @@
<el-dropdown-item @click.native="goToOpenTravel('TravelManager2',item.ID,0)"> <el-dropdown-item @click.native="goToOpenTravel('TravelManager2',item.ID,0)">
{{$t('Operation.Op_xilieModyfi')}} {{$t('Operation.Op_xilieModyfi')}}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="goTonowTeam('TravelManager2',item.ID,item.TCID,item.TCNUM)"> <el-dropdown-item v-if="item.TeamType==0" @click.native="goTonowTeam('TravelManager2',item.ID,item.TCID,item.TCNUM)">
{{$t('Operation.Op_dangtuanModify')}}
</el-dropdown-item>
<el-dropdown-item v-if="item.TeamType==3" @click.native="goTonowTeam('TravelManager6',item.ID,item.TCID,item.TCNUM)">
{{$t('Operation.Op_dangtuanModify')}} {{$t('Operation.Op_dangtuanModify')}}
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
...@@ -1300,6 +1303,7 @@ ...@@ -1300,6 +1303,7 @@
this.queryMsg.TCID = ""; this.queryMsg.TCID = "";
} }
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
console.log(res,'resssssssss');
this.queryCommonData.dataList = res.data.data.pageData; this.queryCommonData.dataList = res.data.data.pageData;
this.queryMsg.total = res.data.data.count this.queryMsg.total = res.data.data.count
this.queryMsg.noData = !this.queryMsg.total > 0 this.queryMsg.noData = !this.queryMsg.total > 0
......
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
<div> <div v-if="isShowOther">
<el-form-item label="PDF别名"> <el-form-item label="PDF别名">
<el-input type="text" v-model="PostConfig.PDFAlias"></el-input> <el-input type="text" v-model="PostConfig.PDFAlias"></el-input>
</el-form-item> </el-form-item>
...@@ -121,19 +121,19 @@ ...@@ -121,19 +121,19 @@
placeholder="请填写团队标题"></el-input> placeholder="请填写团队标题"></el-input>
</el-form-item> </el-form-item>
</div> </div>
<div> <div v-if="isShowOther">
<el-form-item label="本团卖点"> <el-form-item label="本团卖点">
<el-input v-model="PostConfig.ProductRecommend" type="textarea" :autosize="{minRows: 3, maxRows: 3 }" <el-input v-model="PostConfig.ProductRecommend" type="textarea" :autosize="{minRows: 3, maxRows: 3 }"
resize="none" placeholder="本团卖点" maxlength="2000"></el-input> resize="none" placeholder="本团卖点" maxlength="2000"></el-input>
</el-form-item> </el-form-item>
</div> </div>
<div> <div v-if="isShowOther">
<el-form-item label="备注"> <el-form-item label="备注">
<el-input v-model="PostConfig.OpenTeamDescribe" type="textarea" :autosize="{minRows: 1, maxRows: 2 }" <el-input v-model="PostConfig.OpenTeamDescribe" type="textarea" :autosize="{minRows: 1, maxRows: 2 }"
resize="none" placeholder="此备注只在开团行程列表中显示" maxlength="300"></el-input> resize="none" placeholder="此备注只在开团行程列表中显示" maxlength="300"></el-input>
</el-form-item> </el-form-item>
</div> </div>
<div class="_VideoStr_box"> <div class="_VideoStr_box" v-if="isShowOther">
<el-form-item label="视频地址"> <el-form-item label="视频地址">
<el-input v-model="PostConfig.VideoStr" type="textarea" :autosize="{minRows: 1, maxRows: 1 }" <el-input v-model="PostConfig.VideoStr" type="textarea" :autosize="{minRows: 1, maxRows: 1 }"
placeholder="https//:video.mp4" @blur="loadVideo"></el-input> placeholder="https//:video.mp4" @blur="loadVideo"></el-input>
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
<div v-if="GGMapShow"> <div v-if="GGMapShow">
<GGMap></GGMap> <GGMap></GGMap>
</div> </div>
<div class="Travel_ImgList clearfix"> <div class="Travel_ImgList clearfix" v-if="isShowOther">
<div class="TFimgList" v-for="(item,index) in PostConfig.fileList" :key="item.subCode"> <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-if="!item.Url" src="../../../assets/img/bg_c3@3x.png">
<img v-else :src='compressImg(item.Url, "filt", 170, "")'> <img v-else :src='compressImg(item.Url, "filt", 170, "")'>
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
import GGMap from "../../commonPage/GGMap"; import GGMap from "../../commonPage/GGMap";
export default { export default {
/*接收父组件传递的参数*/ /*接收父组件传递的参数*/
props: ["PostConfig", "LineList" ,"TCNUM"], props: ["PostConfig", "LineList" ,"TCNUM","isShowOther"],
data() { data() {
return { return {
//系列列表 //系列列表
...@@ -437,6 +437,7 @@ ...@@ -437,6 +437,7 @@
//线路监听 //线路监听
LineList: { LineList: {
handler: function (val, oldVal) { handler: function (val, oldVal) {
console.log(this.PostConfig,'pppppppppp');
if (this.PostConfig.LineId == 0) { if (this.PostConfig.LineId == 0) {
this.PostConfig.LineId = this.LineList[0].LineID; this.PostConfig.LineId = this.LineList[0].LineID;
this.PostConfig.LineName=this.LineList[0].LineName; this.PostConfig.LineName=this.LineList[0].LineName;
...@@ -450,6 +451,7 @@ ...@@ -450,6 +451,7 @@
//深度监听,可监听到对象、数组的变化 //深度监听,可监听到对象、数组的变化
handler: function (val, oldVal) { handler: function (val, oldVal) {
this.$emit("headCallBack", this.PostConfig); this.$emit("headCallBack", this.PostConfig);
console.log(this.PostConfig,'postConfigggg');
}, },
deep: true deep: true
}, },
......
<style> <style>
@import "../../../assets/css/newTravelManager.css"; @import "../../../assets/css/newTravelManager.css";
@import "../../../assets/css/endTravelManager.css"; @import "../../../assets/css/endTravelManager.css";
.showOther{
display:none;
}
</style> </style>
<template> <template>
<div> <div>
...@@ -31,19 +33,19 @@ ...@@ -31,19 +33,19 @@
</div> </div>
<div class="newTravelRight" v-loading="loading"> <div class="newTravelRight" v-loading="loading">
<TravelConfig @headCallBack="getConfig" @setTravelUploadData="setTravelUploadData" :PostConfig="PostConfig" <TravelConfig @headCallBack="getConfig" @setTravelUploadData="setTravelUploadData" :PostConfig="PostConfig"
:TCNUM="TCNUM" id="firstAnchor" :LineList="LineList"></TravelConfig> :TCNUM="TCNUM" id="firstAnchor" :LineList="LineList" :isShowOther="isShowOther"></TravelConfig>
<TravelDaysTripDirect id="secondAnchor" @headCallBack="getDaysTrip" :NoticeParameters="NoticeParameters" <TravelDaysTripDirect id="secondAnchor" @headCallBack="getDaysTrip" :NoticeParameters="NoticeParameters"
:subConfig="journeyList" :isOpenGroup="false" :IsDirect="PostConfig.IsDirect" v-bind:AllCityList="AllCityList" :subConfig="journeyList" :isOpenGroup="false" :IsDirect="PostConfig.IsDirect" v-bind:AllCityList="AllCityList"
v-bind:StartCity="StartCity" :UseTypeArray="UseTypeArray" :AirPickUp="AirPickUp" :AirSend="AirSend" v-bind:StartCity="StartCity" :UseTypeArray="UseTypeArray" :AirPickUp="AirPickUp" :AirSend="AirSend"
@change="handlerChangeData" :TeamType="TeamType" :IsOpenHotel="PostConfig.IsOpenHotel"></TravelDaysTripDirect> @change="handlerChangeData" :TeamType="TeamType" :IsOpenHotel="PostConfig.IsOpenHotel"></TravelDaysTripDirect>
<TravelFeature ref="TravelFeature" id="thirdAnchor" @featureCallBack="getFeature" :FeatureData="FeatureData" <TravelFeature :class="{'showOther':!isShowOther}" ref="TravelFeature" id="thirdAnchor" @featureCallBack="getFeature" :FeatureData="FeatureData"
:TeamType="TeamType" :isNewConfig="isNewConfig" @unlockFormCommit="unlockFormCommit"></TravelFeature> :TeamType="TeamType" :isNewConfig="isNewConfig" @unlockFormCommit="unlockFormCommit"></TravelFeature>
<TravelNotice ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice" :subArray="NoticeParameters" <TravelNotice :class="{'showOther':!isShowOther}" ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice" :subArray="NoticeParameters"
:NoticeData="NoticeData" v-bind:PostConfig="PostConfig" v-bind:AllCityList="AllCityList" :NoticeData="NoticeData" v-bind:PostConfig="PostConfig" v-bind:AllCityList="AllCityList"
v-bind:CountryID="PostConfig.CountryID"></TravelNotice> v-bind:CountryID="PostConfig.CountryID"></TravelNotice>
<TravelPrice @saveMsg="SaveData(1)" ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" <TravelPrice @saveMsg="SaveData(1)" ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice"
:priceList="PriceList" v-if="TeamType==0" :PostConfig="PostConfig" :modifyTcid="modifyTcid" :priceList="PriceList" v-if="TeamType==0||TeamType==3" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
:TeamType="TeamType"></TravelPrice> :TeamType="TeamType"></TravelPrice>
<TravelPrice2 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip" <TravelPrice2 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip"
v-if="TeamType==1" :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid" v-if="TeamType==1" :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
...@@ -84,6 +86,8 @@ ...@@ -84,6 +86,8 @@
}, },
data() { data() {
return { return {
//判断是否显示其他项
isShowOther:true,
IsShowBtn: false, //是否显示按钮 IsShowBtn: false, //是否显示按钮
ConfigId: 0, //地址栏查询参数 ConfigId: 0, //地址栏查询参数
IsHaveOffer: 0, //是否有报价单 IsHaveOffer: 0, //是否有报价单
...@@ -609,6 +613,10 @@ ...@@ -609,6 +613,10 @@
if (routeName == 'TravelManager4') { if (routeName == 'TravelManager4') {
this.TeamType = 2; this.TeamType = 2;
} }
if(routeName =='TravelManager6'){
this.TeamType = 3;
this.isShowOther=false;
}
let configId = this.$route.query.configId; let configId = this.$route.query.configId;
this.modifyTcid = this.$route.query.tcid; this.modifyTcid = this.$route.query.tcid;
this.TCNUM = this.$route.query.TCNUM; this.TCNUM = this.$route.query.TCNUM;
......
...@@ -1854,6 +1854,14 @@ export default { ...@@ -1854,6 +1854,14 @@ export default {
title: '自主开团' title: '自主开团'
}, },
}, },
{
path: '/TravelManager6',
name: 'TravelManager6',
component: resolve => require(['@/components/newTravelManager/TravelGroupControl/TravelManager2'], resolve),
meta: {
title: '地接开团'
},
},
{ {
path: '/BasicOpenGroup', //基础班团控配置 path: '/BasicOpenGroup', //基础班团控配置
name: '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