Skip to content

S
SuperMan
Commit 5e876e31 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents fc4ee3a4 2a6a2c19
Hide whitespace changes
Inline Side-by-side
Showing with 202 additions and 159 deletions
src/assets/css/salefeture2.css → src/assets/css/sale_pdf.css
View file @ 5e876e31
.travelControlTrip *{
page-break-inside: avoid;
}
.clearfix:after {content: "\0020";display: block;height: 0;clear: both;}
.travelControlTrip .trip-box{
page-break-after: always;
}
.travelControlTrip .logo-div{width: 100%;text-align: center;}
.travelControlTrip .logo-div>img{
width: 100%;
}
.travelControlTrip .footer-div{text-align: center;padding: 25px 0; border-top: 1px solid #eee;}
.travelControlTrip .website{text-align: center; font-size: 12px; color: #e73e6d; margin-top: 10px; }
.travelControlTrip .website .website-line{height: 1px; background: #f1f1f1; transform: rotateX(60deg);}
.travelControlTrip .trip-adviser{background: #f7f7f7; font-size: 14px; color: #000000; line-height: 30px;margin: 10px 0 0 0; padding: 10px 20px;}
.travelControlTrip .trip-adviser>p{margin: 10px 0 0 0;font-size: 18px;}
.travelControlTrip .website span{top:-10px; position: relative; background: #fff; padding: 0 15px; font-size: 13px; color: #EE4454;}
.travelControlTrip .trip-nav-title{font-size: 22px; text-align: center;margin: 0px;}
.travelControlTrip .module-title{text-align: center; font-size: 18px; color: #333; padding-top: 30px; padding-bottom: 30px;}
.travelControlTrip .module-title h2{font-weight: normal;font-size: 18px;margin: 0px;}
.template-box .travelSpecial{padding-top: 0px;}
.travelControlTrip .module-title .short-line{width: 32px; height: 2px; background: #e73e6d; margin: 12px auto;}
.travelControlTrip .module-title .english-title{font-family: arial; font-size: 12px; color: #ccc;}
.travelControlTrip .module-title .long-line{width: 100%; height: 1px; background: #f1f1f1; margin: 35px 0; transform: rotateX(60deg) /*解决pdf打印线条过粗*/;}
.travelControlTrip .essential{display: flex; flex-direction: row; flex-wrap: wrap; margin-bottom: 40px;}
.travelControlTrip .essential-item{width:320px; height:100px; box-sizing: border-box;padding-left: 20px;}
.travelControlTrip .essential-item img{float: left; margin-right:12px; width: 66px; height: 66px; border-radius: 38px;}
.travelControlTrip .essential-item p.pkey{font-size: 14px; color: #000; margin:10px 0 0 0; }
.travelControlTrip .essential-item p.pvalue{font-size: 18px; color: #000; margin-top:5px; }
.detail-box .left-team-box{
height: 465px;
overflow-y: auto;
......
src/components/SalesModule/productQuery.vue
View file @ 5e876e31
......@@ -170,26 +170,26 @@
<el-row :gutter="20">
<el-col :span="4">
<el-form-item label="客户类型" prop="CustomerType">
<el-select v-model='addMsg.CustomerType' filterable :placeholder="$t('pub.pleaseSel')" @change='getTypePrice(),resetSelect();getDdlyList();getKhmdList();getTotalPrice()'>
<el-select v-model='addMsg.CustomerType' filterable :placeholder="$t('pub.pleaseSel')" @change='getTypePrice();resetSelect();getDdlyList();getKhmdList();getTotalPrice()'>
<el-option v-for="item in khlxList" :label='item.Name' :value='item.Id' :key='item.Id'>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="参团类型" prop="GroupType">
<el-select v-model='addMsg.GroupType' @change="groupTypeChange" filterable :placeholder="$t('pub.pleaseSel')">
<el-select v-model='addMsg.GroupType' @change="groupTypeChange()" filterable :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in ctlxList" v-if="item.Id!=5" :label='item.Name' :value='item.Id' :key='item.Id'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="联系人" prop="ContactName" v-show='addMsg.CustomerType==3||addMsg.CustomerType==4'>
<el-form-item label="联系人" prop="ContactName" v-if='addMsg.CustomerType==3||addMsg.CustomerType==4'>
<el-input v-model='addMsg.ContactName'></el-input>
</el-form-item>
<el-form-item label="联系电话" prop="ContactMobile" v-show='addMsg.CustomerType==3||addMsg.CustomerType==4'>
<el-form-item label="联系电话" prop="ContactMobile" v-if='addMsg.CustomerType==3||addMsg.CustomerType==4'>
<el-input v-model='addMsg.ContactMobile' maxlength='20'></el-input>
</el-form-item>
<el-form-item label="客户门店" prop="CustomerId" v-show="addMsg.CustomerType==1||addMsg.CustomerType==2||addMsg.CustomerType==''">
<el-form-item label="客户门店" prop="CustomerId" v-if="addMsg.CustomerType==1||addMsg.CustomerType==2||addMsg.CustomerType==''">
<el-select v-model='addMsg.CustomerId' filterable :placeholder="$t('pub.pleaseSel')" @change='getSspt'>
<el-option v-for="item in khmdList" :label='item.customerName+"-"+item.contact' :value='item.customerId'
:key='item.customerId'>
......@@ -1567,10 +1567,12 @@
if (this.addMsg.CustomerType == 1) {
this.addMsg.TC_Price = this.addObj.B2BMemberPrice
this.addMsg.Unit_Price = this.addObj.B2BMemberPrice;
//this.addMsg.CustomerId = ''
}
if (this.addMsg.CustomerType == 2) {
this.addMsg.TC_Price = this.addObj.B2BPrice
this.addMsg.Unit_Price = this.addObj.B2BPrice;
//this.addMsg.CustomerId = ''
}
if (this.addMsg.CustomerType == 3) {
this.addMsg.TC_Price = this.addObj.B2CMemberPrice
......@@ -1892,7 +1894,6 @@
Number(this.addMsg.BabyNum) + Number(this.addMsg.AirticketNum)
this.addMsg.IsChildrenTour = this.addObj.IsSupportChildren
this.addMsg.IsBirdDiscount = this.addObj.IsBirdDiscount
this.apipost('sellorder_post_SetOrderInfo_02', this.addMsg, res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message)
......
src/components/SalesconfirmationOrder.vue
View file @ 5e876e31
......@@ -15,9 +15,9 @@
<div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div>
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版PDF"
@click="toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载手机版WORD"
<input type="button" style="width: auto !important; display:none;" class="travelControlTripBtn" value="下载手机版WORD"
@click="gernalFeature(0)" />
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版WORD"
<input type="button" style="width: auto !important; display:none;" class="travelControlTripBtn" value="下载电脑版WORD"
@click="gernalFeature(1)" />
<a class="travelControlTripBtn" v-if="priceList.length>0&& priceList[0].wordPath!=''" style="display:inline-block;text-decoration:none;
width:135px;text-align:center;line-height:30px;font-size:13px;position:relative;top:2px;"
......@@ -252,145 +252,150 @@
<div id="teamacitvy"> </div>
</div>
<div class="trip-box">
<div class="timeline" style="z-index:999">
<div class="timeline-box"></div>
<div v-for="(item,index) in dataList.dayList" :key="index">
<div class="timeline-item">
<div class="left">
<span class="big" style=" font-size: 20px;">行程</span>
</div>
<div class="new_right">
<span class="medium">
<div v-for="(dn,i) in item.dayArray" :key="i">
{{dn.childItem.title}}
</div>
</span>
</div>
<div class="timeline" style="z-index:999">
<div class="timeline-box"></div>
<div v-for="(item,index) in dataList.dayList" :key="index">
<div class="timeline-item">
<div class="left">
<span class="big" style=" font-size: 20px;">行程</span>
</div>
<div class="new_right">
<span class="medium">
<div v-for="(dn,i) in item.dayArray" :key="i">
{{dn.childItem.title}}
</div>
</span>
</div>
</div>
<div v-for="(son,i) in item.dayArray" :key="i">
<!-- <traffice :tripItem='son' v-if="son.type==1"></traffice> -->
<template v-if="son.type==1">
<div class="timeline-item">
<div class="left">
<i class="iconfont icon-feiji"></i>
</div>
<div class="new_right">
<span class="time" v-if="son.childItem.timeType==1">上午</span>
<span class="time" v-if="son.childItem.timeType==2">下午</span>
<span class="time" v-if="son.childItem.timeType==0">全天</span>
<span class="title">
<span v-if="son.type==1" v-for="(dns,o) in son.childItem.subTraffic" :key="o">
{{dns.startCityName}}
<i v-if="dns.arrivalType==1" class="iconfont icon-feiji"></i>
<i v-if="dns.arrivalType==2" class="iconfont icon-bus"></i>
<i v-if="dns.arrivalType==3" class="iconfont icon-icon31"></i>
<i v-if="dns.arrivalType==4" class="iconfont icon-gaotiedongche"></i>
<span v-if="o+1==son.childItem.subTraffic.length">{{dns.arrivalCityName}}</span>
</span>
</span>
<span class="content" v-html="son.childItem.description"></span>
</div>
<div v-for="(son,i) in item.dayArray" :key="i">
<!-- <traffice :tripItem='son' v-if="son.type==1"></traffice> -->
<template v-if="son.type==1">
<div class="timeline-item">
<div class="left">
<i class="iconfont icon-feiji"></i>
</div>
<div class="new_right">
<span class="time" v-if="son.childItem.timeType==1">上午</span>
<span class="time" v-if="son.childItem.timeType==2">下午</span>
<span class="time" v-if="son.childItem.timeType==0">全天</span>
<span class="title">
<span v-if="son.type==1" v-for="(dns,o) in son.childItem.subTraffic" :key="o">
{{dns.startCityName}}
<i v-if="dns.arrivalType==1" class="iconfont icon-feiji"></i>
<i v-if="dns.arrivalType==2" class="iconfont icon-bus"></i>
<i v-if="dns.arrivalType==3" class="iconfont icon-icon31"></i>
<i v-if="dns.arrivalType==4" class="iconfont icon-gaotiedongche"></i>
<span v-if="o+1==son.childItem.subTraffic.length">{{dns.arrivalCityName}}</span>
</span>
</span>
<span class="content" v-html="son.childItem.description"></span>
</div>
</div>
</template>
</div>
</template>
<template v-if="son.type==2">
<div class="timeline-item">
<div class="left">
<i class="iconfont icon-zuji"></i>
</div>
<div class="new_right">
<span class="time" v-if="son.childItem.timeType==1">上午</span>
<span class="time" v-if="son.childItem.timeType==2">下午</span>
<span class="time" v-if="son.childItem.timeType==0">全天</span>
<span class="title">
{{son.childItem.couponsName}}
</span>
<span class="playTime"> <i class="iconfont icon-shijian"></i> 游玩时间：<span v-if="son.childItem.playTimeHour!=null&&son.childItem.playTimeHour!=''">{{son.childItem.playTimeHour+'小时'}}</span><span v-if="son.childItem.playTimeMinutes!=null&&son.childItem.playTimeMinutes!=''">{{son.childItem.playTimeMinutes+'分钟'}}</span></span>
<span class="content" v-html="son.childItem.description"></span>
<div class="Newimg-list" v-if="son.childItem.imaArray.length">
<div class="item" v-for="(img,i) in son.childItem.imaArray" :key="i">
<img :src='img.url'/>
</div>
</div>
</div>
</div>
</template>
<template v-if="son.type==3">
<div class="timeline-item">
<div class="left">
<i class="iconfont icon-jiudian"></i>
</div>
<div class="new_right">
<span class="time" v-if="son.childItem.timeType==1">上午</span>
<span class="time" v-if="son.childItem.timeType==2">下午</span>
<span class="time" v-if="son.childItem.timeType==0">全天</span>
<span class="title">
{{son.childItem.hotelName+son.childItem.hotelProductName}}
</span>
<span class="content" v-html="son.childItem.description"></span>
<div class="Newimg-list" v-if="son.childItem.imaArray.length">
<div class="item" v-for="(img,i) in son.childItem.imaArray" :key="i">
<img :src='img.url'/>
</div>
</div>
</div>
</div>
</template>
<template v-if="son.type==4">
<div class="timeline-item">
<div class="left">
<i class="iconfont icon-yongcan"></i>
</div>
<div class="new_right">
<span class="time" v-if="son.childItem.timeType==1">上午</span>
<span class="time" v-if="son.childItem.timeType==2">下午</span>
<span class="time" v-if="son.childItem.timeType==0">全天</span>
<span class="title">
{{son.childItem.dinnerName+son.childItem.mealName}}
</span>
<span class="playTime"> <i class="iconfont icon-shijian"></i> 用餐时长：<span v-if="son.childItem.playTimeHour!=null&&son.childItem.playTimeHour!=''">{{son.childItem.playTimeHour+'小时'}}</span><span v-if="son.childItem.playTimeMinutes!=null&&son.childItem.playTimeMinutes!=''">{{son.childItem.playTimeMinutes+'分钟'}}</span></span>
<span class="content" v-html="son.childItem.description"></span>
<div class="Newimg-list" v-if="son.childItem.imaArray.length">
<div class="item" v-for="(img,i) in son.childItem.imaArray" :key="i">
<img :src='img.url'/>
</div>
</div>
</div>
</div>
</template>
<template v-if="son.type==5">
<div class="timeline-item">
<div class="left">
<i class="iconfont icon-huodong"></i>
</div>
<div class="new_right">
<span class="time" v-if="son.childItem.timeType==1">上午</span>
<span class="time" v-if="son.childItem.timeType==2">下午</span>
<span class="time" v-if="son.childItem.timeType==0">全天</span>
<span class="content" v-html="son.childItem.description"></span>
</div>
</div>
</template>
<template v-if="son.type==6">
<div class="timeline-item">
<div class="left">
<i class="iconfont icon-tishi"></i>
</div>
<div class="new_right">
<span class="content" v-html="son.childItem.description"></span>
</div>
</div>
</template>
<template v-if="son.type==2">
<div class="timeline-item">
<div class="left">
<i class="iconfont icon-zuji"></i>
</div>
<div class="new_right">
<span class="time" v-if="son.childItem.timeType==1">上午</span>
<span class="time" v-if="son.childItem.timeType==2">下午</span>
<span class="time" v-if="son.childItem.timeType==0">全天</span>
<span class="title">
{{son.childItem.couponsName}}
</span>
<div class="playTime"> <i class="iconfont icon-shijian"></i> 游玩时间：
<span v-if="son.childItem.playTimeHour!=null&&son.childItem.playTimeHour!=''">{{son.childItem.playTimeHour+'小时'}}</span>
<span v-if="son.childItem.playTimeMinutes!=null&&son.childItem.playTimeMinutes!=''">{{son.childItem.playTimeMinutes+'分钟'}}</span>
</div>
<div class="content" v-html="son.childItem.description"></div>
<div class="Newimg-list clearfix" v-if="son.childItem.imaArray.length">
<div class="item" v-for="(img,i) in son.childItem.imaArray" :key="i">
<img :src='img.url' />
</div>
</div>
</div>
</div>
</template>
<!-- <scenic v-if="son.type==2" :tripItem='son'></scenic> -->
<!-- <hotel v-if="son.type==3" :tripItem='son'></hotel> -->
<!-- <restaurant v-if="son.type==4" :tripItem='son'></restaurant> -->
<!-- <activity v-if="son.type==5" :tripItem='son'></activity> -->
<!-- <tips v-if="son.type==6" :tripItem='son'></tips> -->
<template v-if="son.type==3">
<div class="timeline-item">
<div class="left">
<i class="iconfont icon-jiudian"></i>
</div>
</div>
<div class="new_right">
<span class="time" v-if="son.childItem.timeType==1">上午</span>
<span class="time" v-if="son.childItem.timeType==2">下午</span>
<span class="time" v-if="son.childItem.timeType==0">全天</span>
<div class="title">
{{son.childItem.hotelName+son.childItem.hotelProductName}}
</div>
<div class="content" v-html="son.childItem.description"></div>
<div class="Newimg-list clearfix" v-if="son.childItem.imaArray.length">
<div class="item" v-for="(img,i) in son.childItem.imaArray" :key="i">
<img :src='img.url' />
</div>
</div>
</div>
</div>
</template>
<template v-if="son.type==4">
<div class="timeline-item">
<div class="left">
<i class="iconfont icon-yongcan"></i>
</div>
<div class="new_right">
<span class="time" v-if="son.childItem.timeType==1">上午</span>
<span class="time" v-if="son.childItem.timeType==2">下午</span>
<span class="time" v-if="son.childItem.timeType==0">全天</span>
<span class="title">
{{son.childItem.dinnerName+son.childItem.mealName}}
</span>
<div class="playTime"> <i class="iconfont icon-shijian"></i> 用餐时长：<span
v-if="son.childItem.playTimeHour!=null&&son.childItem.playTimeHour!=''">{{son.childItem.playTimeHour+'小时'}}</span><span
v-if="son.childItem.playTimeMinutes!=null&&son.childItem.playTimeMinutes!=''">{{son.childItem.playTimeMinutes+'分钟'}}</span></div>
<div class="content" v-html="son.childItem.description"></div>
<div class="Newimg-list clearfix" v-if="son.childItem.imaArray.length">
<div class="item" v-for="(img,i) in son.childItem.imaArray" :key="i">
<img :src='img.url' />
</div>
</div>
</div>
</div>
</template>
<template v-if="son.type==5">
<div class="timeline-item">
<div class="left">
<i class="iconfont icon-huodong"></i>
</div>
<div class="new_right">
<span class="time" v-if="son.childItem.timeType==1">上午</span>
<span class="time" v-if="son.childItem.timeType==2">下午</span>
<span class="time" v-if="son.childItem.timeType==0">全天</span>
<span class="content" v-html="son.childItem.description"></span>
</div>
</div>
</template>
<template v-if="son.type==6">
<div class="timeline-item">
<div class="left">
<i class="iconfont icon-tishi"></i>
</div>
<div class="new_right">
<span class="content" v-html="son.childItem.description"></span>
</div>
</div>
</template>
<!-- <scenic v-if="son.type==2" :tripItem='son'></scenic> -->
<!-- <hotel v-if="son.type==3" :tripItem='son'></hotel> -->
<!-- <restaurant v-if="son.type==4" :tripItem='son'></restaurant> -->
<!-- <activity v-if="son.type==5" :tripItem='son'></activity> -->
<!-- <tips v-if="son.type==6" :tripItem='son'></tips> -->
</div>
</div>
</div>
</div>
<div id="pdf_4">
<div v-if='vshowE' class="module-title">
......@@ -621,7 +626,7 @@
effect="dark" content="下移" placement="top-start">
<el-button type="danger" icon="iconfont icon-xiayi1" @click="MoveItem(priceFlight,index,1)" circle>
</el-button>
</el-tooltip>
</el-tooltip>
</td>
</tr>
</table>
......@@ -961,7 +966,7 @@
url: urlObj.DomainUrl + '/api/file/GetWebHtmlTwo',
data: {
"msg": pageData,
isSale:1
sign: "sale_pdf"
}
}).then(res => {
if (res.data.resultCode === 1) {
......@@ -1044,7 +1049,7 @@
}, res => {
if (res.data.resultCode == 1) {
let data = (res.data.data);
console.log(data,'dataaaa');
console.log(data, 'dataaaa');
this.orderTripdiff = data.orderTripdiff;
this.orderMsg = data.orderMsg;
if (this.orderTripdiff && this.orderTripdiff.flightInfoJson) {
......@@ -1397,7 +1402,7 @@
</script>
<style>
@import url('../assets/css/tripIndex.css');
@import url('../assets/css/salefeture2.css');
@import url('../assets/css/sale_pdf.css');
.edit_form_box {
display: flex;
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 5e876e31
......@@ -655,6 +655,7 @@
<div class="TC_SeatList">{{$t('Airticket.Air_firstClass')}}：{{item.FSeat}}</div>
<div class="TC_SeatList">{{$t('Airticket.Air_businessClass')}}：{{item.CSeat}}</div>
<div class="TC_SeatList">{{$t('Airticket.Air_EconomyClass')}}：{{item.YSeat}}</div>
<div class="TC_SeatList" v-if="item.BindNum>0" style="color:red;">绑定数量: {{item.BindNum}}</div>
<div class="TC_SeatList" v-if="item.TicketNum>0 && item.TicketList">
<el-popover width="340" trigger="click" popper-class="TC_customerInfo">
<table width="340" border="0" cellspacing="0" cellpadding="0">
......@@ -675,7 +676,6 @@
style="cursor:pointer;color:red;text-decoration: underline;">总机位数: {{item.TicketNum}}</span>
</el-popover>
</div>
<div class="TC_SeatList" v-if="item.BindNum>0" style="color:red;">绑定数量: {{item.BindNum}}</div>
</div>
</div>
<div class="el-col" style="width:200px;">
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 5e876e31
......@@ -553,7 +553,7 @@
</span>
<el-dropdown-menu slot="dropdown" class="TC-dropdown">
<el-dropdown-item @click.native="goTeamBalance(item.TCID,item.OutBranchId)">团队收支明细</el-dropdown-item>
<el-dropdown-item @click.native="goUrlR('confirmationOrderDownLoad',item.TCID,item.ID,item.StartCityID)">行程下载</el-dropdown-item>
<el-dropdown-item @click.native="goUrlR('SalesconfirmationOrder',item.TCID,item.ID,item.StartCityID)">行程下载</el-dropdown-item>
<el-dropdown-item @click.native="removeTeamInfo(item.TCID)">删除</el-dropdown-item>
<el-dropdown-item v-if="item.TCState==2||item.TCState==0||item.TCState==1" @click.native="setUpPlat(item)">上架</el-dropdown-item>
<el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)">下架</el-dropdown-item>
......@@ -900,7 +900,6 @@
});
}
});
console.log(this.queryCommonData.dataList,'dataList');
}
},
err => {}
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ 5e876e31
......@@ -57,12 +57,13 @@
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; margin-top: 10px; " class="ownScrollbarStyle">
<table border="0" cellspacing="1" cellpadding="0" class="dmcTotalTable" v-loading="loading">
<tr>
<th colspan="10">公司通用信息</th>
<th colspan="11">公司通用信息</th>
<th colspan="5">团队需求表</th>
<th colspan="7">地接op操作</th>
</tr>
<tr>
<th width="130">序号</th>
<th width="75">出团公司</th>
<th width="75">出发地</th>
<th width="80">航班时间</th>
<th width="125">公司团号</th>
......@@ -94,6 +95,9 @@
<td>
{{item.StartCityNames}}
</td>
<td>
{{item.OutBranchName}}
</td>
<td>
<div class="w120">
{{item.FlightDate}}
......@@ -264,7 +268,7 @@
</td>
</tr>
<tr>
<td colspan="21" style="text-align: left!important;padding:0 20px;">
<td colspan="22" style="text-align: left!important;padding:0 20px;">
<div class="link">
<p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')" style="padding-top:4px;">{{item.Titles}}</p>
<div v-if="outItem.StaticsReportList[index].DMCNum && outItem.StaticsReportList[index].DMCNum!=''" class="colorE95252" style="padding-top:5px;">地接备注团号:{{outItem.StaticsReportList[index].DMCNum}}</div>
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue
View file @ 5e876e31
......@@ -896,6 +896,12 @@
)
};
}
this.queryFlightAirListData.forEach(subItem=>{
if(subItem.FlightDate==objItem.StartDate)
{
objItem.AirTicketId=subItem.AirLineTicketId
}
});
this.returnPriceList.push(objItem);
this.initDatePickerCheched();
this.returnPriceList.sort(
......@@ -1323,7 +1329,6 @@
this.returnPriceList.forEach(x => {
if (x.TCID == this.modifyTcid) {
priceList = [];
// x.TCID = 0;
x.ConfigID = 0;
priceList.push(x);
}
......@@ -1338,7 +1343,6 @@
this.priceData = this.returnPriceList[index];
x["Checked"] = true;
this.chooseDay = this.priceData.StartDate;
} else {
x["Checked"] = false;
}
......
src/components/newTravelmanager/oldTravelGroupControl/TravelManager5.vue
View file @ 5e876e31
......@@ -572,7 +572,7 @@
dinnerObj.UseDinnerType = useDinnerType
dinnerObj.DinnerName = dinnerName
dinnerObj.BreakfastUseType = 0
dinnerObj.DayNum = dayNum
dinnerObj.DayNum = dayNumdayNum
return dinnerObj
},
firstLoadConfigInfo() {
......@@ -640,7 +640,7 @@
this.FeatureData.Subtitle = tempData.LtName
this.FeatureData.LineName = tempData.LineName
this.FeatureData.DayList = tempData.DayList
this.FeatureData.DayList = tempData.DayList2
this.ConfigId = tempData.ID
//HK 2019-01-08添加 NewConfigId B2B预览使用
......
src/components/scenicSpot/scenicSpotInfoManage.vue
View file @ 5e876e31
......@@ -829,11 +829,11 @@
inputVisible2: false,
inputValue2: "",
IsFreeList: [{
value: 1,
value: 0,
label: "是"
},
{
value: 0,
value: 1,
label: "否"
}
],
......
src/components/scenicSpot/scenicSpotList.vue
View file @ 5e876e31
......@@ -393,11 +393,11 @@
value: "-1",
label: "不限"
},{
value: "1",
value: "0",
label: "免费"
},
{
value: "0",
value: "1",
label: "有价"
}
],
......
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