Commit cb8dbb36 authored by 黄奎's avatar 黄奎

销售开团修改

parent 6e9e0381
...@@ -169,12 +169,15 @@ ...@@ -169,12 +169,15 @@
.TPSetInfo .multiple_input .el-input__inner { .TPSetInfo .multiple_input .el-input__inner {
margin-top: 3px; margin-top: 3px;
} }
.TPSetInfo .multiple_input.multiple_input2{
.TPSetInfo .multiple_input.multiple_input2 {
height: 34px !important; height: 34px !important;
} }
.TPSetInfo .multiple_input.multiple_input2 .el-input__inner { .TPSetInfo .multiple_input.multiple_input2 .el-input__inner {
height: 34px !important; height: 34px !important;
} }
.SimulateDrop-box { .SimulateDrop-box {
width: 190px; width: 190px;
min-height: 34px; min-height: 34px;
...@@ -253,23 +256,28 @@ ...@@ -253,23 +256,28 @@
.TCswitch { .TCswitch {
width: 280px; width: 280px;
} }
.dijiebaojia{
.dijiebaojia {
margin-bottom: 15px; margin-bottom: 15px;
padding-top: 15px; padding-top: 15px;
} }
.dijiebaojia table{
.dijiebaojia table {
border-collapse: collapse; border-collapse: collapse;
width: 390px; width: 390px;
border-color: #dcdfe6; border-color: #dcdfe6;
} }
.dijiebaojia table tr td{
.dijiebaojia table tr td {
padding: 8px 15px; padding: 8px 15px;
color: #000; color: #000;
} }
.dijiebaojia table tr td._price{
.dijiebaojia table tr td._price {
/*color: red;*/ /*color: red;*/
} }
.dijiebaojia_table_btn{
.dijiebaojia_table_btn {
background-color: #e95252; background-color: #e95252;
font-size: 12px; font-size: 12px;
color: white; color: white;
...@@ -277,13 +285,16 @@ ...@@ -277,13 +285,16 @@
border-radius: 4px; border-radius: 4px;
cursor: pointer; cursor: pointer;
} }
.dijiebaojia_table_btn_hide{
.dijiebaojia_table_btn_hide {
margin-left: 10px; margin-left: 10px;
} }
._yes_click{
._yes_click {
background-color: #e95252 !important; background-color: #e95252 !important;
color: white; color: white;
} }
</style> </style>
<template> <template>
...@@ -300,19 +311,19 @@ ...@@ -300,19 +311,19 @@
<span class="Travel_Line"></span> <span class="Travel_Line"></span>
</div> </div>
<div class="clearfix"> <div class="clearfix">
<div class="TPDateContent" id="DayAll" > <div class="TPDateContent" id="DayAll">
<div class="month"> <div class="month">
<ul> <ul>
<li> <li>
<i class="arrow monthminus" @click="currentYear-=1,getDateString(),initCalendar(dateString)">&lt;</i> <i class="arrow monthminus" @click="currentYear-=1,getDateString(),initCalendar(dateString)">&lt;</i>
<input type="text" v-model="currentYear" disabled class="currentInput" <input type="text" v-model="currentYear" disabled class="currentInput"
@input="getDateString(),initCalendar(dateString)"> @input="getDateString(),initCalendar(dateString)">
<i class="arrow monthadd" @click="currentYear+=1,getDateString(),initCalendar(dateString)">&gt;</i> <i class="arrow monthadd" @click="currentYear+=1,getDateString(),initCalendar(dateString)">&gt;</i>
</li> </li>
<li> <li>
<i class="arrow monthminus" @click="pickPre(currentYear,currentMonth)">&lt;</i> <i class="arrow monthminus" @click="pickPre(currentYear,currentMonth)">&lt;</i>
<input type="text" v-model="currentMonth" disabled class="currentInput" <input type="text" v-model="currentMonth" disabled class="currentInput"
@input="getDateString(),initCalendar(dateString)"> @input="getDateString(),initCalendar(dateString)">
<i class="arrow monthadd" @click="pickNext(currentYear,currentMonth)">&gt;</i> <i class="arrow monthadd" @click="pickNext(currentYear,currentMonth)">&gt;</i>
</li> </li>
</ul> </ul>
...@@ -330,20 +341,16 @@ ...@@ -330,20 +341,16 @@
<!-- 日期 --> <!-- 日期 -->
<ul class="days"> <ul class="days">
<li class="liList" v-for="(dayobject,index) in days" :key="dayobject.subCode"> <li class="liList" v-for="(dayobject,index) in days" :key="dayobject.subCode">
<span v-if="dayobject.checkState==$calendarUtils.checkState.noChecked" class="other-month">{{dayobject.day.getDate()}}</span> <template v-if="dayobject.click">
<span v-if="dayobject.checkState==$calendarUtils.checkState.checked" class="checked1" <span v-if="dayobject.checkState==$calendarUtils.checkState.checked" class="checked1"
@click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span> @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
<span v-else-if="dayobject.checkState==$calendarUtils.checkState.hasValue" <span v-else-if="dayobject.checkState==$calendarUtils.checkState.hasValue"
@click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span> @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
</template>
<template v-else>
<span class="other-month">{{dayobject.day.getDate()}}</span>
</template>
</li> </li>
<!-- <li class="liList" v-for="(dayobject,index) in days" :key="dayobject.subCode">
<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-else-if="dayobject.checkState==$calendarUtils.checkState.hasValue"
@click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
</li> -->
</ul> </ul>
</div> </div>
</div> </div>
...@@ -355,24 +362,23 @@ ...@@ -355,24 +362,23 @@
<span class="TPNotice">(注意:公司已开启价格预警机制,最低销售价格不能低于2000.00元)</span> <span class="TPNotice">(注意:公司已开启价格预警机制,最低销售价格不能低于2000.00元)</span>
<span class="TPLine"></span> <span class="TPLine"></span>
</div> </div>
<div class="TP_rightDate"> <div class="TP_rightDate">
<div class="TP_dateContent"> <div class="TP_dateContent">
<span class="TP_toLeft" @click="priceLeftMove"> <span class="TP_toLeft" @click="priceLeftMove">
<i class="iconfont icon-previewleft"></i> <i class="iconfont icon-previewleft"></i>
</span> </span>
<div class="TP_childContent"> <div class="TP_childContent">
<span class="TP_tips" :class="{'ckedSpan':item.Checked}" @click="getDateInfo(item)" <span class="TP_tips" :class="{'ckedSpan':item.Checked}" @click="getDateInfo(item)"
v-for="(item,index) in showPriceList" v-for="(item,index) in showPriceList" :key="index">
:key="index"> {{item.StartDate}}
{{item.StartDate}} <span class="TP_cancel" @click.stop="delDateList(item)">
<span class="TP_cancel" @click.stop="delDateList(item)"> <i class="iconfont icon-quxiao"></i>
<i class="iconfont icon-quxiao"></i>
</span>
</span> </span>
</span>
</div> </div>
<span class="TP_Right" @click="priceRightMove"> <span class="TP_Right" @click="priceRightMove">
<i class="iconfont icon-arrow-right"></i> <i class="iconfont icon-arrow-right"></i>
</span> </span>
</div> </div>
<div class="TP_DateList"></div> <div class="TP_DateList"></div>
</div> </div>
...@@ -381,9 +387,10 @@ ...@@ -381,9 +387,10 @@
<el-form label-width="10px" style="border-collapse:collapse;"> <el-form label-width="10px" style="border-collapse:collapse;">
<div class="dijiebaojia clearfix"> <div class="dijiebaojia clearfix">
<p class="TPbaseSet" style="width: 140px">地接报价</p> <p class="TPbaseSet" style="width: 140px">地接报价</p>
<table border="1" bordercolor="#dcdfe6" class="fl" v-if="dijiebaojiaShow&&queryPriceList.length>0" v-loading="queryPriceListLoading"> <table border="1" bordercolor="#dcdfe6" class="fl" v-if="dijiebaojiaShow&&queryPriceList.length>0"
v-loading="queryPriceListLoading">
<template v-for="item in queryPriceList"> <template v-for="item in queryPriceList">
<template v-for="son in item.PricesList" > <template v-for="son in item.PricesList">
<tr v-if="son.OfferType===1"> <tr v-if="son.OfferType===1">
<td rowspan="4">{{item.DayNum}}</td> <td rowspan="4">{{item.DayNum}}</td>
<td>酒店</td> <td>酒店</td>
...@@ -406,8 +413,10 @@ ...@@ -406,8 +413,10 @@
<td colspan="2" align="center">{{OfferTotalMoney}}</td> <td colspan="2" align="center">{{OfferTotalMoney}}</td>
</tr> </tr>
</table> </table>
<p class="fl dijiebaojia_table_btn" v-if="!dijiebaojiaShow&&queryPriceList.length>0" @click="dijiebaojiaShow=true">显示地接报价</p> <p class="fl dijiebaojia_table_btn" v-if="!dijiebaojiaShow&&queryPriceList.length>0"
<p class="fl dijiebaojia_table_btn dijiebaojia_table_btn_hide" v-if="dijiebaojiaShow&&queryPriceList.length>0" @click="dijiebaojiaShow=false">隐藏地接报价</p> @click="dijiebaojiaShow=true">显示地接报价</p>
<p class="fl dijiebaojia_table_btn dijiebaojia_table_btn_hide"
v-if="dijiebaojiaShow&&queryPriceList.length>0" @click="dijiebaojiaShow=false">隐藏地接报价</p>
</div> </div>
<div class="clearfix"> <div class="clearfix">
<div class="leftSetInfo"> <div class="leftSetInfo">
...@@ -417,37 +426,37 @@ ...@@ -417,37 +426,37 @@
<div class="TPright"> <div class="TPright">
<el-form-item prop="B2BMemberPrice"> <el-form-item prop="B2BMemberPrice">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.B2BMemberPrice" <el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.B2BMemberPrice"
@keyup.native="checkPrice(priceData,'B2BMemberPrice')"> @keyup.native="checkPrice(priceData,'B2BMemberPrice')">
<template slot="prepend">同行会员</template> <template slot="prepend">同行会员</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="B2BPrice"> <el-form-item prop="B2BPrice">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.B2BPrice" <el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.B2BPrice"
@keyup.native="checkPrice(priceData,'B2BPrice')"> @keyup.native="checkPrice(priceData,'B2BPrice')">
<template slot="prepend">同行</template> <template slot="prepend">同行</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="B2CMemberPrice"> <el-form-item prop="B2CMemberPrice">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.B2CMemberPrice" <el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.B2CMemberPrice"
@keyup.native="checkPrice(priceData,'B2CMemberPrice')"> @keyup.native="checkPrice(priceData,'B2CMemberPrice')">
<template slot="prepend">直客会员</template> <template slot="prepend">直客会员</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="B2CPrice"> <el-form-item prop="B2CPrice">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.B2CPrice" <el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.B2CPrice"
@keyup.native="checkPrice(priceData,'B2CPrice')"> @keyup.native="checkPrice(priceData,'B2CPrice')">
<template slot="prepend">直客</template> <template slot="prepend">直客</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="BabyPrice"> <el-form-item prop="BabyPrice">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.BabyPrice" <el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.BabyPrice"
@keyup.native="checkInteger(priceData,'BabyPrice')"> @keyup.native="checkInteger(priceData,'BabyPrice')">
<template slot="prepend">婴儿</template> <template slot="prepend">婴儿</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.SingleDMCPrice" <el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.SingleDMCPrice"
@keyup.native="checkPrice(priceData,'SingleDMCPrice')"> @keyup.native="checkPrice(priceData,'SingleDMCPrice')">
<template slot="prepend">单地接</template> <template slot="prepend">单地接</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
...@@ -461,43 +470,43 @@ ...@@ -461,43 +470,43 @@
<div class="TPright"> <div class="TPright">
<el-form-item prop="ChildNeedPrice"> <el-form-item prop="ChildNeedPrice">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.ChildNeedPrice" <el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.ChildNeedPrice"
@keyup.native="checkInteger(priceData,'ChildNeedPrice')"> @keyup.native="checkInteger(priceData,'ChildNeedPrice')">
<template slot="prepend">儿童占床</template> <template slot="prepend">儿童占床</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="BabyChargePrice"> <el-form-item prop="BabyChargePrice">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.BabyChargePrice" <el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.BabyChargePrice"
@keyup.native="checkPrice(priceData,'BabyChargePrice')"> @keyup.native="checkPrice(priceData,'BabyChargePrice')">
<template slot="prepend">儿童附加费</template> <template slot="prepend">儿童附加费</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="OldManChargePrice"> <el-form-item prop="OldManChargePrice">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.OldManChargePrice" <el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.OldManChargePrice"
@keyup.native="checkPrice(priceData,'OldManChargePrice')"> @keyup.native="checkPrice(priceData,'OldManChargePrice')">
<template slot="prepend">老人附加费</template> <template slot="prepend">老人附加费</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="VisaPrice"> <el-form-item prop="VisaPrice">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.VisaPrice" <el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.VisaPrice"
@keyup.native="checkPrice(priceData,'VisaPrice')"> @keyup.native="checkPrice(priceData,'VisaPrice')">
<template slot="prepend">签证费</template> <template slot="prepend">签证费</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="SingleRoomPrice"> <el-form-item prop="SingleRoomPrice">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.SingleRoomPrice" <el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.SingleRoomPrice"
@keyup.native="checkPrice(priceData,'SingleRoomPrice')"> @keyup.native="checkPrice(priceData,'SingleRoomPrice')">
<template slot="prepend">单房差</template> <template slot="prepend">单房差</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="SafeMoney"> <el-form-item prop="SafeMoney">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.SafeMoney" <el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.SafeMoney"
@keyup.native="checkInteger(priceData,'SafeMoney')"> @keyup.native="checkInteger(priceData,'SafeMoney')">
<template slot="prepend">保险</template> <template slot="prepend">保险</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="OtherPrice"> <el-form-item prop="OtherPrice">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.OtherPrice" <el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.OtherPrice"
@keyup.native="checkPrice(priceData,'OtherPrice')"> @keyup.native="checkPrice(priceData,'OtherPrice')">
<template slot="prepend">杂费</template> <template slot="prepend">杂费</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
...@@ -511,26 +520,26 @@ ...@@ -511,26 +520,26 @@
<div class="TPright"> <div class="TPright">
<el-form-item prop="ChildNoNeedPrice"> <el-form-item prop="ChildNoNeedPrice">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.ChildNoNeedPrice" <el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.ChildNoNeedPrice"
@keyup.native="checkInteger(priceData,'ChildNoNeedPrice')"> @keyup.native="checkInteger(priceData,'ChildNoNeedPrice')">
<template slot="prepend">儿童不占床</template> <template slot="prepend">儿童不占床</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="BackVisaPrice"> <el-form-item prop="BackVisaPrice">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.BackVisaPrice" <el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.BackVisaPrice"
@keyup.native="checkInteger(priceData,'BackVisaPrice')"> @keyup.native="checkInteger(priceData,'BackVisaPrice')">
<template slot="prepend">退签证费</template> <template slot="prepend">退签证费</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item style="display:none;"> <el-form-item style="display:none;">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.RebatePrice" <el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.RebatePrice"
@keyup.native="checkPrice(priceData,'RebatePrice')"> @keyup.native="checkPrice(priceData,'RebatePrice')">
<template slot="prepend">同行返佣</template> <template slot="prepend">同行返佣</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item style="display:none;"> <el-form-item style="display:none;">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.DiscountPrice" <el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.DiscountPrice"
@keyup.native="checkPrice(priceData,'DiscountPrice')"> @keyup.native="checkPrice(priceData,'DiscountPrice')">
<template slot="prepend">早鸟优惠</template> <template slot="prepend">早鸟优惠</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
...@@ -540,68 +549,67 @@ ...@@ -540,68 +549,67 @@
<div class="leftSetInfo"> <div class="leftSetInfo">
<span class="TPbaseSet">设置</span> <span class="TPbaseSet">设置</span>
<span class="TPsecondTitle" style="margin-right: 10px">机票绑定</span> <span class="TPsecondTitle" style="margin-right: 10px">机票绑定</span>
<el-select class="w180" v-model="priceData.AirTicketId" > <el-select class="w180" v-model="priceData.AirTicketId">
<el-option v-for="(item,index) in queryFlightAirListData" :key="index" :label="item.AlCode+'-'+item.FlightDate+'-'+item.PNR" <el-option v-for="(item,index) in queryFlightAirListData" :key="index"
:value="item.AirLineTicketId"></el-option> :label="item.AlCode+'-'+item.FlightDate+'-'+item.PNR" :value="item.AirLineTicketId"></el-option>
</el-select> </el-select>
</div> </div>
<div class="TPright clearfix"> <div class="TPright clearfix">
<el-form-item prop="ClearOrderHour" v-if="TeamType==1"> <el-form-item prop="ClearOrderHour" v-if="TeamType==1">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.ClearOrderHour" <el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.ClearOrderHour"
@keyup.native="checkInteger(priceData,'ClearOrderHour')" @keyup.native="checkInteger(priceData,'ClearOrderHour')"
@blur="checkInteger(priceData,'ClearOrderHour')"> @blur="checkInteger(priceData,'ClearOrderHour')">
<template slot="prepend">自动清位</template> <template slot="prepend">自动清位</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<span class="TP_Sendprepend" v-if="TeamType==1">送签时间</span> <span class="TP_Sendprepend" v-if="TeamType==1">送签时间</span>
<el-form-item prop="SendVisaTime" style="margin-top:1px;" v-if="TeamType==1"> <el-form-item prop="SendVisaTime" style="margin-top:1px;" v-if="TeamType==1">
<el-date-picker clearable class="w150" v-model="priceData.SendVisaTime" type="date" <el-date-picker clearable class="w150" v-model="priceData.SendVisaTime" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')"></el-date-picker>
:placeholder="$t('admin.admin_choDate')"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item prop="OutBranchId" style="margin-top:1px;"> <el-form-item prop="OutBranchId" style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">出团公司</span> <span class="TP_Sendprepend" style="margin:3px -1px 0 0">出团公司</span>
<el-select class="w180" v-model="priceData.OutBranchId" :disabled="TeamType==1"> <el-select class="w180" v-model="priceData.OutBranchId" :disabled="TeamType==1">
<el-option :label="$t('pub.unlimitedSel')" :value="SelectOtherDefault"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="SelectOtherDefault"></el-option>
<el-option v-for="item in companyList" :key="item.id" :label="item.bName" <el-option v-for="item in companyList" :key="item.id" :label="item.bName" :value="item.id">
:value="item.id"></el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item style="margin-top:1px;" v-if="TeamType==1"> <el-form-item style="margin-top:1px;" v-if="TeamType==1">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">销售公司</span> <span class="TP_Sendprepend" style="margin:3px -1px 0 0">销售公司</span>
<el-select class="w180 multiple_input" :class="{'SaleBranchList':priceData.SaleBranchIdArray==''}" <el-select class="w180 multiple_input" :class="{'SaleBranchList':priceData.SaleBranchIdArray==''}"
v-model="priceData.SaleBranchIdArray" multiple> v-model="priceData.SaleBranchIdArray" multiple>
<el-option v-for="item in companyList" :key="item.id" :label="item.bName" <el-option v-for="item in companyList" :key="item.id" :label="item.bName" :value="item.id">
:value="item.id"></el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item style="margin-top:1px;" v-else> <el-form-item style="margin-top:1px;" v-else>
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">销售公司</span> <span class="TP_Sendprepend" style="margin:3px -1px 0 0">销售公司</span>
<el-select class="w180 multiple_input multiple_input2" :class="{'SaleBranchList':priceData.SaleBranchIdArray==''}" <el-select class="w180 multiple_input multiple_input2"
:disabled="TeamType==1" :class="{'SaleBranchList':priceData.SaleBranchIdArray==''}" :disabled="TeamType==1"
v-model="priceData.SaleBranchIdArray" multiple> v-model="priceData.SaleBranchIdArray" multiple>
<el-option v-for="item in companyList" :key="item.id" :label="item.bName" <el-option v-for="item in companyList" :key="item.id" :label="item.bName" :value="item.id">
:value="item.id"></el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</div> </div>
<div class="TPright clearfix"> <div class="TPright clearfix">
<el-form-item prop="YSeat" v-if="TeamType==1"> <el-form-item prop="YSeat" v-if="TeamType==1">
<el-input placeholder="人数" class="w190" v-model="priceData.YSeat" <el-input placeholder="人数" class="w190" v-model="priceData.YSeat"
@keyup.native="checkInteger(priceData,'YSeat')"> @keyup.native="checkInteger(priceData,'YSeat')">
<template slot="prepend">经济舱/上铺</template> <template slot="prepend">经济舱/上铺</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="CSeat" v-if="TeamType==1"> <el-form-item prop="CSeat" v-if="TeamType==1">
<el-input placeholder="人数" class="w190" v-model="priceData.CSeat" <el-input placeholder="人数" class="w190" v-model="priceData.CSeat"
@keyup.native="checkInteger(priceData,'CSeat')"> @keyup.native="checkInteger(priceData,'CSeat')">
<template slot="prepend">商务舱/中铺</template> <template slot="prepend">商务舱/中铺</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="FSeat" v-if="TeamType==1"> <el-form-item prop="FSeat" v-if="TeamType==1">
<el-input placeholder="人数" class="w260" v-model="priceData.FSeat" <el-input placeholder="人数" class="w260" v-model="priceData.FSeat"
@keyup.native="checkInteger(priceData,'FSeat')"> @keyup.native="checkInteger(priceData,'FSeat')">
<template slot="prepend">头等舱/下铺</template> <template slot="prepend">头等舱/下铺</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
...@@ -613,8 +621,8 @@ ...@@ -613,8 +621,8 @@
<el-form-item style="margin-top:1px;"> <el-form-item style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">销售状态</span> <span class="TP_Sendprepend" style="margin:3px -1px 0 0">销售状态</span>
<el-select class="w180" v-model="priceData.TCSaleState"> <el-select class="w180" v-model="priceData.TCSaleState">
<el-option v-for="item in TeamList" :key="item.Id" :label="item.name" <el-option v-for="item in TeamList" :key="item.Id" :label="item.name" :value="item.Id">
:value="item.Id"></el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="TeamType==1"> <el-form-item v-if="TeamType==1">
...@@ -645,26 +653,26 @@ ...@@ -645,26 +653,26 @@
<div class="TPright" style="float:left;"> <div class="TPright" style="float:left;">
<el-form-item style="margin-top:-20px;"> <el-form-item style="margin-top:-20px;">
<el-input v-model="priceData.OPRemark" type="textarea" :autosize="{minRows: 3, maxRows: 3 }" <el-input v-model="priceData.OPRemark" type="textarea" :autosize="{minRows: 3, maxRows: 3 }"
resize="none" class="w760" placeholder="op对外备注"></el-input> resize="none" class="w760" placeholder="op对外备注"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<div> <div>
<span class="TCSwitchtitle">订单操作</span> <span class="TCSwitchtitle">订单操作</span>
<span class="TCswitch"> <span class="TCswitch">
<el-switch v-model="priceData.IsOrder" :active-value="inActive" <el-switch v-model="priceData.IsOrder" :active-value="inActive" :inactive-value="notInActive">
:inactive-value="notInActive"></el-switch> </el-switch>
<div class="TC-config">关闭后,业务人员将不能操作订单</div> <div class="TC-config">关闭后,业务人员将不能操作订单</div>
</span> </span>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<div> <div>
<span class="TCSwitchtitle">同行在线预订</span> <span class="TCSwitchtitle">同行在线预订</span>
<span class="TCswitch"> <span class="TCswitch">
<el-switch v-model="priceData.IsB2B" :active-value="inActive" <el-switch v-model="priceData.IsB2B" :active-value="inActive" :inactive-value="notInActive">
:inactive-value="notInActive"></el-switch> </el-switch>
<div class="TC-config">产品将会直接推送到B2B站点</div> <div class="TC-config">产品将会直接推送到B2B站点</div>
</span> </span>
</div> </div>
</el-form-item> </el-form-item>
</div> </div>
...@@ -673,32 +681,32 @@ ...@@ -673,32 +681,32 @@
<div> <div>
<span class="TCSwitchtitle">报名候补</span> <span class="TCSwitchtitle">报名候补</span>
<span class="TCswitch"> <span class="TCswitch">
<el-switch v-model="priceData.IsSubstitution" :active-value="inActive" <el-switch v-model="priceData.IsSubstitution" :active-value="inActive"
:inactive-value="notInActive"></el-switch> :inactive-value="notInActive"></el-switch>
<div class="TC-config">关闭后不可超收人数</div> <div class="TC-config">关闭后不可超收人数</div>
</span> </span>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<div> <div>
<span class="TCSwitchtitle">直客在线预订</span> <span class="TCSwitchtitle">直客在线预订</span>
<span class="TCswitch"> <span class="TCswitch">
<el-switch v-model="priceData.IsB2C" :active-value="inActive" <el-switch v-model="priceData.IsB2C" :active-value="inActive" :inactive-value="notInActive">
:inactive-value="notInActive"></el-switch> </el-switch>
<div class="TC-config">产品将会直接推送到B2C站点</div> <div class="TC-config">产品将会直接推送到B2C站点</div>
</span> </span>
</div> </div>
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
<div class="TPright" style="float:left;"> <div class="TPright" style="float:left;">
<span>团期标签</span> <span>团期标签</span>
<span> <span>
<el-checkbox-group v-model="priceData.PriceTagIds"> <el-checkbox-group v-model="priceData.PriceTagIds">
<el-checkbox v-for="team in teamTips" :label="team.ID" <el-checkbox v-for="team in teamTips" :label="team.ID" :key="team.Content">{{team.Content}}
:key="team.Content">{{team.Content}}</el-checkbox> </el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</span> </span>
</div> </div>
</div> </div>
</el-form> </el-form>
...@@ -707,8 +715,7 @@ ...@@ -707,8 +715,7 @@
</div> </div>
</div> </div>
<TravelPriceFlightList @headCallBack="setDisDirectFlight" ref="TravelFlightList" :priceData="priceData" <TravelPriceFlightList @headCallBack="setDisDirectFlight" ref="TravelFlightList" :priceData="priceData"
:AirTicketId="priceData.AirTicketId" :AirTicketId="priceData.AirTicketId" :selectFilghtList="selectFilghtList"></TravelPriceFlightList>
:selectFilghtList="selectFilghtList"></TravelPriceFlightList>
</div> </div>
</div> </div>
</template> </template>
...@@ -716,7 +723,7 @@ ...@@ -716,7 +723,7 @@
import TravelPriceFlightList from "../TravelGroupControl/TravelPriceFlightList.vue"; import TravelPriceFlightList from "../TravelGroupControl/TravelPriceFlightList.vue";
export default { export default {
props: ["priceList", "priceIsDirect", "OfferList", "PostConfig", "modifyTcid","PostDaysTrip","TeamType"], props: ["priceList", "priceIsDirect", "OfferList", "PostConfig", "modifyTcid", "PostDaysTrip", "TeamType"],
data() { data() {
return { return {
currentDay: 1, currentDay: 1,
...@@ -765,9 +772,9 @@ ...@@ -765,9 +772,9 @@
}] }]
}, },
TeamList: [{ TeamList: [{
Id: 1, Id: 1,
name: "一般团" name: "一般团"
}, },
{ {
Id: 2, Id: 2,
name: "促销团" name: "促销团"
...@@ -779,17 +786,17 @@ ...@@ -779,17 +786,17 @@
], ],
currentPriceIndex: 0, //当前团期索引位置 currentPriceIndex: 0, //当前团期索引位置
showPriceList: [], showPriceList: [],
priceShowCount: 6,//团期展示条数 priceShowCount: 6, //团期展示条数
userID:null, userID: null,
dijiebaojiaShow:false, dijiebaojiaShow: false,
queryPriceListLoading:true, queryPriceListLoading: true,
queryPriceList:[], queryPriceList: [],
OfferTotalMoney:0, OfferTotalMoney: 0,
queryFlightAirListData:[], queryFlightAirListData: [],
queryFlightAirDateList:[], queryFlightAirDateList: [],
getSelectdata:'', getSelectdata: '',
//团期标签 //团期标签
teamTips:[], teamTips: [],
}; };
}, },
methods: { methods: {
...@@ -881,9 +888,9 @@ ...@@ -881,9 +888,9 @@
IsSubstitution: 1, IsSubstitution: 1,
AirticketBindList: [], AirticketBindList: [],
LowNum: 2, LowNum: 2,
TeamType:1, TeamType: 1,
//选中团期标签 //选中团期标签
PriceTagIds:[], PriceTagIds: [],
PriceFlight: JSON.parse( PriceFlight: JSON.parse(
JSON.stringify(this.PostConfig.FlightList) JSON.stringify(this.PostConfig.FlightList)
) )
...@@ -901,7 +908,7 @@ ...@@ -901,7 +908,7 @@
}, },
// 获取地接报价 // 获取地接报价
queryPriceOffer(time) { queryPriceOffer(time) {
if(this.PostDaysTrip === "") return; if (this.PostDaysTrip === "") return;
this.queryPriceListLoading = true; this.queryPriceListLoading = true;
let queryPriceList = { let queryPriceList = {
LowNum: 2, LowNum: 2,
...@@ -914,7 +921,7 @@ ...@@ -914,7 +921,7 @@
}; };
queryPriceList.DayNum = this.PostDaysTrip.DayNum; queryPriceList.DayNum = this.PostDaysTrip.DayNum;
// 酒店 // 酒店
this.PostDaysTrip.HotelList.forEach(x=> { this.PostDaysTrip.HotelList.forEach(x => {
let msg = { let msg = {
HotelId: x.HotelId, HotelId: x.HotelId,
DayNum: x.DayNum DayNum: x.DayNum
...@@ -922,14 +929,14 @@ ...@@ -922,14 +929,14 @@
queryPriceList.HotelList.push(msg); queryPriceList.HotelList.push(msg);
}); });
// 交通 // 交通
this.PostDaysTrip.TrafficList.forEach(x=> { this.PostDaysTrip.TrafficList.forEach(x => {
let msg = { let msg = {
DayNum: x.DayNum, DayNum: x.DayNum,
}; };
queryPriceList.TrafficList.push(msg); queryPriceList.TrafficList.push(msg);
}); });
// 景点 // 景点
this.PostDaysTrip.ScenicList.forEach(x=> { this.PostDaysTrip.ScenicList.forEach(x => {
let msg = { let msg = {
CouponsId: x.CouponsId, CouponsId: x.CouponsId,
DayNum: x.DayNum DayNum: x.DayNum
...@@ -937,7 +944,7 @@ ...@@ -937,7 +944,7 @@
queryPriceList.ScenicList.push(msg); queryPriceList.ScenicList.push(msg);
}); });
// 餐厅 // 餐厅
this.PostDaysTrip.DinnerList.forEach(x=> { this.PostDaysTrip.DinnerList.forEach(x => {
let msg = { let msg = {
DinnerId: x.DinnerId, DinnerId: x.DinnerId,
DayNum: x.DayNum DayNum: x.DayNum
...@@ -946,85 +953,71 @@ ...@@ -946,85 +953,71 @@
}); });
// 时间 // 时间
queryPriceList.PriceList.push({ queryPriceList.PriceList.push({
StartDate:time?time:this.chooseDay StartDate: time ? time : this.chooseDay
}); });
this.apipost('travel_get_GetTeamGroupLocalOfferList',queryPriceList,res=> { this.apipost('travel_get_GetTeamGroupLocalOfferList', queryPriceList, res => {
if(res.data.resultCode===1){ if (res.data.resultCode === 1) {
let data = res.data.data; let data = res.data.data;
this.queryPriceList = data.objList; this.queryPriceList = data.objList;
this.OfferTotalMoney = data.TotalMoney; this.OfferTotalMoney = data.TotalMoney;
} }
this.queryPriceListLoading = false; this.queryPriceListLoading = false;
},null) }, null)
}, },
// 获取飞机票1 // 获取飞机票1
queryFlightAir() { queryFlightAir() {
let TrafficList = this.PostDaysTrip; let TrafficList = this.PostDaysTrip;
let msg = { let msg = {
FstartcityId:0, FstartcityId: 0,
FendcityId: 0, FendcityId: 0,
EstartcityId: 0, EstartcityId: 0,
EendcityId: 0, EendcityId: 0,
}; };
if (TrafficList.TrafficList!=null&&TrafficList.TrafficList.length >= 2) {
if(TrafficList.TrafficList.length>=2) { if (TrafficList.TrafficList[0].SubTraffic[0].ArrivalCityId === 0) return;
if(TrafficList.TrafficList[0].SubTraffic[0].ArrivalType!==1) return; if (TrafficList.TrafficList[0].SubTraffic[0].StartCityId === 0) return;
if(TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic[0].ArrivalType!==1) return;
if(TrafficList.TrafficList[0].SubTraffic[0].ArrivalCityId===0) return;
if(TrafficList.TrafficList[0].SubTraffic[0].StartCityId===0) return;
msg.FstartcityId = TrafficList.TrafficList[0].SubTraffic[0].StartCityId; msg.FstartcityId = TrafficList.TrafficList[0].SubTraffic[0].StartCityId;
msg.FendcityId = TrafficList.TrafficList[0].SubTraffic[0].ArrivalCityId; msg.FendcityId = TrafficList.TrafficList[0].SubTraffic[0].ArrivalCityId;
if(TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic.length>=2){ if (TrafficList.TrafficList[TrafficList.TrafficList.length - 1].SubTraffic.length >= 2) {
let list = TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic[TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic.length-1]; let list = TrafficList.TrafficList[TrafficList.TrafficList.length - 1].SubTraffic[TrafficList.TrafficList[
if(list.ArrivalCityId===0) return; TrafficList.TrafficList.length - 1].SubTraffic.length - 1];
if(list.StartCityId===0) return; if (list.ArrivalCityId === 0) return;
if (list.StartCityId === 0) return;
msg.EstartcityId = list.StartCityId; msg.EstartcityId = list.StartCityId;
msg.EendcityId = list.ArrivalCityId; msg.EendcityId = list.ArrivalCityId;
}else { } else {
if(TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic[0].ArrivalCityId===0) return; if (TrafficList.TrafficList[TrafficList.TrafficList.length - 1].SubTraffic[0].ArrivalCityId === 0) return;
if(TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic[0].StartCityId===0) return; if (TrafficList.TrafficList[TrafficList.TrafficList.length - 1].SubTraffic[0].StartCityId === 0) return;
msg.EstartcityId = TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic[0].StartCityId; msg.EstartcityId = TrafficList.TrafficList[TrafficList.TrafficList.length - 1].SubTraffic[0].StartCityId;
msg.EendcityId = TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic[0].ArrivalCityId; msg.EendcityId = TrafficList.TrafficList[TrafficList.TrafficList.length - 1].SubTraffic[0].ArrivalCityId;
}
let storageMsg = localStorage.queryFlightAirMsg?JSON.parse(localStorage.queryFlightAirMsg):null;
if(storageMsg){
if(storageMsg.FstartcityId!==msg.FstartcityId
||storageMsg.FendcityId!==msg.FendcityId
||storageMsg.EstartcityId!==msg.EstartcityId
||storageMsg.EendcityId!==msg.EendcityId){
this.queryFlightAirList(msg);
}else {
return;
}
}else {
localStorage.queryFlightAirMsg = JSON.stringify(msg);
this.queryFlightAirList(msg)
} }
}else {} this.queryFlightAirList(msg);
}
}, },
// 获取飞机票2 // 获取飞机票2
queryFlightAirList(msg) { queryFlightAirList(msg) {
this.apipost("AirTicket_get_GetTicketList",msg,res=>{ this.apipost("AirTicket_get_GetTicketList", msg, res => {
if(res.data.resultCode===1){ if (res.data.resultCode === 1) {
this.queryFlightAirListData = res.data.data; this.queryFlightAirListData = res.data.data;
this.queryFlightAirListData.forEach(x=>{ this.queryFlightAirListData.forEach(x => {
this.queryFlightAirDateList.push({day:x.FlightDate}) this.queryFlightAirDateList.push({
day: x.FlightDate
})
}); });
this.initCalendarEdit(); this.initCalendarEdit();
} }
},null) }, null)
}, },
// 拿到航班信息初始化日历 // 拿到航班信息初始化日历
initCalendarEdit() { initCalendarEdit() {
for (let i in this.queryFlightAirDateList) {
for(let i in this.queryFlightAirDateList){ for (let k in this.days) {
for(let k in this.days){ if (this.queryFlightAirDateList[i].day == new Date(this.days[k].day).Format("yyyy-MM-dd")) {
if(this.queryFlightAirDateList[i].day == new Date(this.days[k].day).Format("yyyy-MM-dd")){
this.days[k].click = true; this.days[k].click = true;
} }
} }
} }
//this.$forceUpdate();
}, },
//单团期修改重置日历选中 //单团期修改重置日历选中
initDatePickerCheched() { initDatePickerCheched() {
...@@ -1098,65 +1091,7 @@ ...@@ -1098,65 +1091,7 @@
this.$calendarUtils.formatDate(d.getFullYear(), d.getMonth() + 1, 1) this.$calendarUtils.formatDate(d.getFullYear(), d.getMonth() + 1, 1)
); );
}, },
getSelectFilght() {
let item = {};
this.queryFlightAirListData.forEach(x=>{
if(x.purchaseID==this.getSelectdata){
item = x;
}
});
this.priceData.AirticketBindList.push({
AirTicketId: item.AirLineTicketId,
BindNum: 0,
ID: 0,
PurchaseId: item.purchaseID
});
return;
let msg = {
QFlightDateStart: date,
CreateBy: this.PostConfig.CreateBy?this.PostConfig.CreateBy:this.userID,
AirTicketId:this.priceData.AirTicketId
};
let that = this;
this.apipost(
"TravelAirTicket_Get_GetSelfPurchaseList",
msg,
res => {
if (res.data.resultCode == 1) {
let resultFilghtList = res.data.data;
that.selectFilghtList = [];
resultFilghtList.forEach(x => {
that.selectFilghtList.push(x);
});
//通过返回数据初始化下拉选中
that.FinfoList = [];
if (that.priceData.AirticketBindList != null) {
that.priceData.AirticketBindList.forEach(x => {
that.selectFilghtList.forEach(y => {
if (x.PurchaseId == y.Id && x.BindNum > 0) {
y.IsSelected = true;
y.BindNum = x.BindNum;
that.FinfoList.push({
name: y.AlName,
date: y.FlightDate
});
}
});
});
}
that.$forceUpdate();
} else {
this.$message({
type: "error",
message: res.data.message
});
}
},
err => {
}
);
},
compareDay(day) { compareDay(day) {
var _string = this.getDayStr(day); var _string = this.getDayStr(day);
if (_string == this.chooseDay) { if (_string == this.chooseDay) {
...@@ -1228,7 +1163,7 @@ ...@@ -1228,7 +1163,7 @@
}, },
setDisDirectFlight(obj) { setDisDirectFlight(obj) {
this.priceData.PriceFlight = JSON.parse(JSON.stringify(obj.priceFlight)); this.priceData.PriceFlight = JSON.parse(JSON.stringify(obj.priceFlight));
this.priceData.DeleteAirticketIds=obj.DeleteAirticketIdArray.join(','); this.priceData.DeleteAirticketIds = obj.DeleteAirticketIdArray.join(',');
}, },
//删除标签 //删除标签
delDateList(item) { delDateList(item) {
...@@ -1286,7 +1221,6 @@ ...@@ -1286,7 +1221,6 @@
item.Checked = true; item.Checked = true;
this.priceData = item; this.priceData = item;
this.queryPriceOffer(item.StartDate); this.queryPriceOffer(item.StartDate);
// this.getSelectFilght(this.priceData.StartDate);
}, },
//左移动获取展示的团期 //左移动获取展示的团期
priceLeftMove() { priceLeftMove() {
...@@ -1333,8 +1267,8 @@ ...@@ -1333,8 +1267,8 @@
}); });
return isExit; return isExit;
}, },
//出团公司
getCompanyList() { getCompanyList() {
//出团公司
this.apipost( this.apipost(
"sellorder_post_GetBranchList", {}, "sellorder_post_GetBranchList", {},
res => { res => {
...@@ -1343,83 +1277,26 @@ ...@@ -1343,83 +1277,26 @@
this.$forceUpdate() this.$forceUpdate()
} }
}, },
err => { err => {}
}
); );
}, },
//选中航班选择框
getSelect(item) {
item.IsSelected = !item.IsSelected;
this.FinfoList = [];
this.selectFilghtList.forEach(x => {
if (x.IsSelected) {
this.FinfoList.push({
name: x.AlName,
date: x.FlightDate
});
var isExsit = false;
this.priceData.AirticketBindList.forEach(y => {
if (x.Id == y.PurchaseId) {
isExsit = true;
y.BindNum = x.BindNum;
}
});
if (!isExsit) {
this.priceData.AirticketBindList.push({
AirTicketId: x.AirticketId,
BindNum: x.BindNum,
ID: 0,
PurchaseId: x.Id
});
}
} else {
var flag = true;
for (var i = 0; i < this.priceData.AirticketBindList.length; i++) {
if (
this.priceData.AirticketBindList[i].PurchaseId === x.Id &&
flag
) {
flag = false;
this.priceData.AirticketBindList.splice(i, 1);
}
}
}
});
},
//改变输入框的值
getFlightBindNum() {
var TotalSeat =
parseInt(this.priceData.YSeat) +
parseInt(this.priceData.CSeat) +
parseInt(this.priceData.FSeat);
this.selectFilghtList.forEach((x, index) => {
if (x.IsSelected) {
this.priceData.AirticketBindList.forEach(y => {
if (x.Id == y.PurchaseId) {
y.BindNum = x.BindNum;
}
});
}
});
},
//获取所有小包团 //获取所有小包团
getAllTeamTips(){ getAllTeamTips() {
let msg = { let msg = {
name:'theme', name: 'theme',
code:'1' code: '1'
} }
this.apipost("travel_get_GetTravelPriceTag", msg, res => { this.apipost("travel_get_GetTravelPriceTag", msg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.teamTips = res.data.data; this.teamTips = res.data.data;
}else{ } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
},err => {} }, err => {});
);
}, },
},created(){ },
localStorage.removeItem('queryFlightAirMsg'); created() {
if(this.TeamType==1){ if (this.TeamType == 1) {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.priceData.OutBranchId = userInfo.RB_Branch_id; this.priceData.OutBranchId = userInfo.RB_Branch_id;
this.userID = userInfo.EmployeeId; this.userID = userInfo.EmployeeId;
...@@ -1430,6 +1307,7 @@ ...@@ -1430,6 +1307,7 @@
var dateObj = this.$calendarUtils.getCurrentDate(); var dateObj = this.$calendarUtils.getCurrentDate();
this.currentYear = dateObj.CurrentYear; this.currentYear = dateObj.CurrentYear;
this.currentMonth = dateObj.CurrentMonth; this.currentMonth = dateObj.CurrentMonth;
this.queryFlightAir();
this.initCalendar(); this.initCalendar();
this.getCompanyList(); this.getCompanyList();
this.getAllTeamTips(); this.getAllTeamTips();
...@@ -1458,10 +1336,9 @@ ...@@ -1458,10 +1336,9 @@
this.returnPriceList.forEach((x, index) => { this.returnPriceList.forEach((x, index) => {
if (index == 0) { if (index == 0) {
this.priceData = this.returnPriceList[index]; this.priceData = this.returnPriceList[index];
console.log(this.priceData,'刚进来。。。');
x["Checked"] = true; x["Checked"] = true;
this.chooseDay = this.priceData.StartDate; this.chooseDay = this.priceData.StartDate;
//this.getSelectFilght(this.priceData.StartDate);
} else { } else {
x["Checked"] = false; x["Checked"] = false;
} }
...@@ -1471,13 +1348,10 @@ ...@@ -1471,13 +1348,10 @@
}, },
deep: true deep: true
}, },
priceData: { priceData: {
handler:function(val,oldVal){ handler: function (val, oldVal) {},
}, deep: true
deep:true
}, },
returnPriceList: { returnPriceList: {
//深度监听,可监听到对象、数组的变化 //深度监听,可监听到对象、数组的变化
handler: function (val, oldVal) { handler: function (val, oldVal) {
...@@ -1498,19 +1372,10 @@ ...@@ -1498,19 +1372,10 @@
PostDaysTrip: { PostDaysTrip: {
handler: function (val, oldVal) { handler: function (val, oldVal) {
// 行程天数 // 行程天数
if(oldVal==="") if (oldVal === "")
return; return;
this.queryPriceOffer(); this.queryPriceOffer();
this.queryFlightAir(); this.queryFlightAir();
// 监听天数 酒店 餐饮 景点 交通 变化
// if(val.DayNum!==oldVal.DayNum
// || val.DinnerList.equals(oldVal.DinnerList) === false
// || val.HotelList.equals(oldVal.HotelList) === false
// || val.ScenicList.equals(oldVal.ScenicList) === false
// || val.TrafficList.equals(oldVal.TrafficList) === false){
// this.queryPriceOffer();
// }
}, },
deep: true deep: true
} }
...@@ -1519,5 +1384,4 @@ ...@@ -1519,5 +1384,4 @@
TravelPriceFlightList: TravelPriceFlightList TravelPriceFlightList: TravelPriceFlightList
} }
}; };
</script>
</script> \ No newline at end of file
...@@ -195,7 +195,7 @@ ...@@ -195,7 +195,7 @@
PostFeature: '', //行程特色信息 PostFeature: '', //行程特色信息
PostNotice: '', //行程特色其他内容 PostNotice: '', //行程特色其他内容
//配置信息 //配置信息
PostDaysTrip: '', //每天的行程 PostDaysTrip: {}, //每天的行程
PriceList: [], PriceList: [],
//所有的城市数据 //所有的城市数据
AllCityList: [], AllCityList: [],
...@@ -698,7 +698,13 @@ ...@@ -698,7 +698,13 @@
this.journeyList.NightNum = tempData.NightNum this.journeyList.NightNum = tempData.NightNum
this.journeyList.ReturnArriveCityId = tempData.ReturnArriveCityId this.journeyList.ReturnArriveCityId = tempData.ReturnArriveCityId
this.journeyList.StartCityId = tempData.StartCityId this.journeyList.StartCityId = tempData.StartCityId
this.journeyList.DayList = tempData.DayList this.journeyList.DayList = tempData.DayList;
this.PostDaysTrip.TrafficList=[];
tempData.DayList2.forEach(item=>{
this.PostDaysTrip.TrafficList.push(item.TrafficObj);
})
this.journeyList.DayList.forEach(x => { this.journeyList.DayList.forEach(x => {
x['HotelChooseArray'] = [] x['HotelChooseArray'] = []
x['ChooseScenicArray'] = [] x['ChooseScenicArray'] = []
......
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