Skip to content

S
SuperMan
Commit 5b76737e authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent e5d0cf64
Hide whitespace changes
Inline Side-by-side
Showing with 376 additions and 96 deletions
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 5b76737e
......@@ -253,7 +253,6 @@
</el-checkbox-group>
</span>
</div>
<!-- <div class="comSearchDiv" v-if="queryCommonData.showPlatForm"> -->
<div class="comSearchDiv">
<span>{{$t('Airticket.Air_salesPlatform')}}</span>
<span>
......@@ -457,17 +456,32 @@
</tr>
</table>
<div class="FlightDiv-TCL" slot="reference">
<div v-for="subItem in item.flightList" slot="reference" :key="subItem.subCode"
class="TCL-flighInfoList">
<span class="travelnowrap">
<span class="TCL-FlightNumber">{{subItem.Flight_number}}</span>
({{subItem.DIATA}}){{subItem.DepartureName}}
{{subItem.StopoverName==''?'':'-('+subItem.StopoverIATA+')'+subItem.StopoverName}}
{{subItem.ArrivalCityName==''?'':'-('+subItem.AIATA+')'+subItem.ArrivalCityName}}
<span v-if="subItem.FlightState==1" class="TCL-greenType">【OK】</span>
<span v-else class="TCL-redType">【{{$t('visa.v_zanding')}}】</span>
</span>
</div>
<template v-if="item.UseFlightType==0">
<div v-for="subItem in item.flightList" slot="reference" :key="subItem.subCode"
class="TCL-flighInfoList">
<span class="travelnowrap">
<span class="TCL-FlightNumber">{{subItem.Flight_number}}</span>
({{subItem.DIATA}}){{subItem.DepartureName}}
{{subItem.StopoverName==''?'':'-('+subItem.StopoverIATA+')'+subItem.StopoverName}}
{{subItem.ArrivalCityName==''?'':'-('+subItem.AIATA+')'+subItem.ArrivalCityName}}
<span v-if="subItem.FlightState==1" class="TCL-greenType">【OK】</span>
<span v-else class="TCL-redType">【{{$t('visa.v_zanding')}}】</span>
</span>
</div>
</template>
<template v-else>
<div v-for="subItem in item.flightList" slot="reference" :key="subItem.subCode"
class="TCL-flighInfoList">
<span class="travelnowrap">
<span class="TCL-FlightNumber">{{subItem.Flight_number}}</span>
{{subItem.aName}} {{subItem.Departure_time}}
-
{{subItem.dName}} {{subItem.Arrival_time}}
</span>
</div>
</template>
</div>
</el-popover>
</div>
......@@ -922,7 +936,8 @@
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-button v-if="CurrentUserInfo.RB_Group_id==2" @click='goUrlMake("GroupAdvertising",item.LineID,item.TCID,"团期广告")' type="primary"
<el-button v-if="CurrentUserInfo.RB_Group_id==2"
@click='goUrlMake("GroupAdvertising",item.LineID,item.TCID,"团期广告")' type="primary"
style="background:#67c23a; border-color:#67c23a">
{{$t('Operation.Op_advertising')}}&nbsp;{{item.AdvertCount}}
</el-button>
......@@ -938,11 +953,12 @@
v-if="item.b2b&&item.GroupRecommendType==0&&CurrentUserInfo.RB_Group_id==2">
{{$t('op.Setjingpin')}}
</el-dropdown-item>
<el-dropdown-item @click.native="SetGroupRecommendType(item,0)"
<el-dropdown-item @click.native="SetGroupRecommendType(item,0)"
v-if="item.b2b&&item.GroupRecommendType==1&&CurrentUserInfo.RB_Group_id==2">
{{$t('op.CancelSetjp')}}
</el-dropdown-item>
<el-dropdown-item v-if="CurrentUserInfo.RB_Group_id==2||TeamShouZhi" @click.native="goTeamBalance(item.TCID,item.OutBranchId)">
<el-dropdown-item v-if="CurrentUserInfo.RB_Group_id==2||TeamShouZhi"
@click.native="goTeamBalance(item.TCID,item.OutBranchId)">
{{$t('Operation.Op_shouzhiDetail')}}
</el-dropdown-item>
<el-dropdown-item @click.native="goUrlR('confirmationOrderDownLoad',item)">
......@@ -956,7 +972,8 @@
{{$t('Operation.Op_xiajia')}}
</el-dropdown-item>
<!--酒店下架-->
<el-dropdown-item v-if="item.LineID==14&&(CurrentUserInfo.RB_Group_id==2||OutHotel)" @click.native="RemoveHotelJourneyOrder(item.TCID)">
<el-dropdown-item v-if="item.LineID==14&&(CurrentUserInfo.RB_Group_id==2||OutHotel)"
@click.native="RemoveHotelJourneyOrder(item.TCID)">
{{$t('op.HotelXJ')}}
</el-dropdown-item>
<el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)">
......@@ -977,17 +994,20 @@
直客版预览
</el-dropdown-item>
<el-dropdown-item v-if="CurrentUserInfo.RB_Group_id==2||FenXiaoLianYun" @click.native='goUrl("DistributionTransport",item.ID,"分销联运")'>
<el-dropdown-item v-if="CurrentUserInfo.RB_Group_id==2||FenXiaoLianYun"
@click.native='goUrl("DistributionTransport",item.ID,"分销联运")'>
{{$t('Operation.Op_salelianyun')}}
</el-dropdown-item>
<el-dropdown-item @click.native='ckSellPoint(item)'>{{$t('Operation.Op_bentuanMaidian')}}
</el-dropdown-item>
<el-dropdown-item v-if="CurrentUserInfo.RB_Group_id==2||ShangChuanFenFangbiao" @click.native='ShowUploadWord(item,1)'>{{$t('Operation.Op_wordTrip')}}
<el-dropdown-item v-if="CurrentUserInfo.RB_Group_id==2||ShangChuanFenFangbiao"
@click.native='ShowUploadWord(item,1)'>{{$t('Operation.Op_wordTrip')}}
</el-dropdown-item>
<el-dropdown-item v-if="CurrentUserInfo.RB_Group_id==2||ShangChuanFenFangbiao" @click.native='ShowUploadWord(item,2)'>{{$t('op.UploadFFB')}}
<el-dropdown-item v-if="CurrentUserInfo.RB_Group_id==2||ShangChuanFenFangbiao"
@click.native='ShowUploadWord(item,2)'>{{$t('op.UploadFFB')}}
</el-dropdown-item>
<el-dropdown-item v-if="CurrentUserInfo.RB_Group_id==2||ChaKanGuest" >
<el-dropdown-item v-if="CurrentUserInfo.RB_Group_id==2||ChaKanGuest">
<div v-if="item.ScoreNum >= 0" @click='goInvetig("investigationList", item.TCID, 0)'>
{{$t('op.LookPassengerSurvey')}}
</div>
......
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ 5b76737e
......@@ -699,6 +699,7 @@
} else {
this.FeatureData.Title = tempData.Title;
}
console.log("price",JSON.parse(JSON.stringify(tempData.PriceList)))
if (tempData.PriceList != null) {
this.PriceList = tempData.PriceList;
}
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ 5b76737e
......@@ -453,17 +453,17 @@
:false-label="UnCheckedLessPrice">{{$t('op.CanLessPrice')}}
</el-checkbox>
<template v-if="CurrentUserInfo.RB_Group_id==2">
<input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true"
v-if="(PostConfig.LineId==14 || PostConfig.LineId==131) && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" />
<input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true"
v-if="(PostConfig.LineId==14 || PostConfig.LineId==131) && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" />
</template>
<template v-else>
<input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true"
v-if="IsDirect==1 && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" />
<input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true"
v-if="IsDirect==1 && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" />
</template>
</div>
<el-form-item prop="B2BMemberPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.B2BMemberPrice"
@keyup.native="checkPrice(priceData,'B2BMemberPrice')">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.B2BMemberPrice" @keyup.native="checkPrice(priceData,'B2BMemberPrice')">
<template slot="prepend">{{$t('Operation.Op_fellowMember')}}</template>
</el-input>
</el-form-item>
......@@ -474,8 +474,8 @@
</el-input>
</el-form-item>
<el-form-item prop="B2CMemberPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.B2CMemberPrice"
@keyup.native="checkPrice(priceData,'B2CMemberPrice')">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.B2CMemberPrice" @keyup.native="checkPrice(priceData,'B2CMemberPrice')">
<template slot="prepend">{{$t('Operation.Op_directMember')}}</template>
</el-input>
</el-form-item>
......@@ -492,18 +492,18 @@
</el-input>
</el-form-item>
<el-form-item>
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.SingleDMCPrice"
@keyup.native="checkPrice(priceData,'SingleDMCPrice')">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.SingleDMCPrice" @keyup.native="checkPrice(priceData,'SingleDMCPrice')">
<template slot="prepend">{{$t('salesModule.SingleJ')}}</template>
</el-input>
</el-form-item>
<el-form-item>
<el-form-item>
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.TipAmount"
@keyup.native="checkPrice(priceData,'TipAmount')">
<template slot="prepend">{{$t('op.RTXF')}}</template>
</el-input>
</el-form-item>
</div>
</div>
<div class="clearfix">
......@@ -513,20 +513,20 @@
</div>
<div class="TPright">
<el-form-item prop="ChildNeedPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.ChildNeedPrice"
@keyup.native="checkInteger(priceData,'ChildNeedPrice')">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.ChildNeedPrice" @keyup.native="checkInteger(priceData,'ChildNeedPrice')">
<template slot="prepend">{{$t('Operation.Op_childBed')}}</template>
</el-input>
</el-form-item>
<el-form-item prop="BabyChargePrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.BabyChargePrice"
@keyup.native="checkPrice(priceData,'BabyChargePrice')">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.BabyChargePrice" @keyup.native="checkPrice(priceData,'BabyChargePrice')">
<template slot="prepend">{{$t('Operation.Op_childSurcharge')}}</template>
</el-input>
</el-form-item>
<el-form-item prop="OldManChargePrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.OldManChargePrice"
@keyup.native="checkPrice(priceData,'OldManChargePrice')">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.OldManChargePrice" @keyup.native="checkPrice(priceData,'OldManChargePrice')">
<template slot="prepend">{{$t('Operation.Op_oldmanSurcharge')}}</template>
</el-input>
</el-form-item>
......@@ -537,8 +537,8 @@
</el-input>
</el-form-item>
<el-form-item prop="SingleRoomPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.SingleRoomPrice"
@keyup.native="checkPrice(priceData,'SingleRoomPrice')">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.SingleRoomPrice" @keyup.native="checkPrice(priceData,'SingleRoomPrice')">
<template slot="prepend">{{$t('Operation.Op_singleRoomcha')}}</template>
</el-input>
</el-form-item>
......@@ -563,7 +563,8 @@
</div>
<div class="TPright">
<el-form-item prop="ForeignPassportPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w300 ComSeat" v-model="priceData.ForeignPassportPrice"
<el-input :placeholder="$t('pub.pleaseImport')" class="w300 ComSeat"
v-model="priceData.ForeignPassportPrice"
@keyup.native="checkPrice(priceData,'ForeignPassportPrice')">
<template slot="prepend">非中国大陆护照报价</template>
</el-input>
......@@ -577,14 +578,15 @@
</div>
<div class="TPright">
<el-form-item prop="ChildNoNeedPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.ChildNoNeedPrice"
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.ChildNoNeedPrice"
@keyup.native="checkInteger(priceData,'ChildNoNeedPrice',true)">
<template slot="prepend">{{$t('Operation.Op_childNobed')}}</template>
</el-input>
</el-form-item>
<el-form-item prop="BackVisaPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.BackVisaPrice"
@keyup.native="checkInteger(priceData,'BackVisaPrice')">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.BackVisaPrice" @keyup.native="checkInteger(priceData,'BackVisaPrice')">
<template slot="prepend">{{$t('Operation.Op_visafeeBack')}}</template>
</el-input>
</el-form-item>
......@@ -596,8 +598,8 @@
</el-input>
</el-form-item>
<el-form-item style="display:none;">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.DiscountPrice"
@keyup.native="checkPrice(priceData,'DiscountPrice')">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.DiscountPrice" @keyup.native="checkPrice(priceData,'DiscountPrice')">
<template slot="prepend">{{$t('sm.zaoniaoyouhui')}}</template>
</el-input>
</el-form-item>
......@@ -610,14 +612,15 @@
</div>
<div class="TPright clearfix">
<el-form-item prop="ClearOrderHour">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.ClearOrderHour"
@keyup.native="checkInteger(priceData,'ClearOrderHour')"
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.ClearOrderHour" @keyup.native="checkInteger(priceData,'ClearOrderHour')"
@blur="checkInteger(priceData,'ClearOrderHour')">
<template slot="prepend">{{$t('sm.zidongqingwei')}}</template>
</el-input>
</el-form-item>
<el-form-item>
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.SaleClearOrderHour"
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.SaleClearOrderHour"
@keyup.native="checkInteger(priceData,'SaleClearOrderHour')"
@blur="checkInteger(priceData,'SaleClearOrderHour')">
<template slot="prepend">{{$t('salesModule.XSQW')}}</template>
......@@ -667,8 +670,8 @@
</el-input>
</el-form-item>
<el-form-item>
<el-input :placeholder="$t('op.CanSallTicketNum')" class="w290" v-model="priceData.CanSellTicketNum" maxlength="2"
@keyup.native="checkInteger(priceData,'CanSellTicketNum')"
<el-input :placeholder="$t('op.CanSallTicketNum')" class="w290" v-model="priceData.CanSellTicketNum"
maxlength="2" @keyup.native="checkInteger(priceData,'CanSellTicketNum')"
@change="CheckSellTicketNum(priceData)">
<template slot="prepend">{{$t('op.CanSallTicketNum')}}</template>
</el-input>
......@@ -681,7 +684,8 @@
</el-input>
</el-form-item>
<el-form-item prop="GatherAddress">
<el-input :placeholder="$t('pub.pleaseImport')" class="w460 ComSeat" v-model="priceData.GatherAddress">
<el-input :placeholder="$t('pub.pleaseImport')" class="w460 ComSeat"
v-model="priceData.GatherAddress">
<template slot="prepend">{{$t('sm.jihedidian')}}</template>
</el-input>
</el-form-item>
......@@ -734,7 +738,8 @@
</div>
</el-popover>
<el-form-item style="margin-top:1px;">
<el-input :placeholder="$t('pub.pleaseImport')" class="w460 ComSeat" v-model="priceData.AirportService">
<el-input :placeholder="$t('pub.pleaseImport')" class="w460 ComSeat"
v-model="priceData.AirportService">
<template slot="prepend">{{$t('op.AirSupplier')}}</template>
</el-input>
</el-form-item>
......@@ -765,7 +770,9 @@
<tr>
<td class="_color_666">{{$t('fnc.xuanze')}}</td>
<td class="_color_666">{{$t('fnc.jpbianhao')}}/{{$t('op.Tickets')}}</td>
<td class="_color_666">{{$t('system.query_flightNum')}}/{{$t('system.query_airCompanyName')}}/{{$t('Airticket.Air_segment')}}</td>
<td class="_color_666">
{{$t('system.query_flightNum')}}/{{$t('system.query_airCompanyName')}}/{{$t('Airticket.Air_segment')}}
</td>
<td class="_color_666">{{$t('adm.adm_time')}}</td>
<td class="_color_666">PNR</td>
<td class="_color_666">{{$t('visa.v_xcdays')}}</td>
......@@ -789,8 +796,8 @@
<td>{{fitem.DayNum}}</td>
<td>{{fitem.TicketNum}} / {{fitem.UseAmount}}</td>
<td>
<el-input class="w69" :placeholder="$t('salesModule.AirNum')" @keyup.native="getFlightBindNum(fitem)"
v-model="fitem.BindNum"></el-input>
<el-input class="w69" :placeholder="$t('salesModule.AirNum')"
@keyup.native="getFlightBindNum(fitem)" v-model="fitem.BindNum"></el-input>
</td>
</tr>
</table>
......@@ -875,9 +882,16 @@
<div class="TPNotice">{{$t('sm.ysbjchajiacl')}}</div>
</div>
</div>
<TravelPriceFlightList @headCallBack="setDisDirectFlight" ref="TravelFlightList" :priceData="priceData"
:AirTicketId="priceData.AirTicketId" :DeleteAirticketIds="priceData.DeleteAirticketIds"
:selectFilghtList="selectFilghtList"></TravelPriceFlightList>
<template v-if="CurrentUserInfo.UseFlightType==0">
<TravelPriceFlightList @headCallBack="setDisDirectFlight" ref="TravelFlightList" :priceData="priceData"
:AirTicketId="priceData.AirTicketId" :DeleteAirticketIds="priceData.DeleteAirticketIds"
:selectFilghtList="selectFilghtList"></TravelPriceFlightList>
</template>
<template v-else>
<TravelPriceFlightListSelf @headCallBack="setDisDirectFlight" ref="TravelFlightList" :priceData="priceData"
:AirTicketId="priceData.AirTicketId" :DeleteAirticketIds="priceData.DeleteAirticketIds"
:selectFilghtList="selectFilghtList"></TravelPriceFlightListSelf>
</template>
</div>
<el-dialog custom-class='Tp_hotelDialog' title="酒店使用情况" :visible.sync="outerVisible" center>
<table class="TphotelTable" border="0" cellspacing='1' v-if="priceData.TCID>0">
......@@ -898,27 +912,29 @@
</td>
<td style="text-align:left;padding-left:3px;">
<span v-if="childItem.UseCount>0 && subItem.SubList.length==1">
<template v-if="childItem.OPState==1&&childItem.HotelName!='温馨的家'&&childItem.HotelName!='机场附近酒店'">
<a style="color:green">【{{$t('salesModule.OPZD')}}】</a>
<template v-if="childItem.OPState==1&&childItem.HotelName!='温馨的家'&&childItem.HotelName!='机场附近酒店'">
<a style="color:green">【{{$t('salesModule.OPZD')}}】</a>
</template>
<template
v-else-if="childItem.OPState==2&&childItem.DMCState==0&&childItem.HotelName!='温馨的家'&&childItem.HotelName!='机场附近酒店'">
<a style="color:red">【{{$t('salesModule.OPZD')}}】</a>
</template>
<template v-else>
<template v-if="childItem.DMCState==1&&childItem.HotelName!='温馨的家'&&childItem.HotelName!='机场附近酒店'">
<a style="color:green">【{{$t('salesModule.DJOK')}}】</a>
</template>
<template v-else-if="childItem.OPState==2&&childItem.DMCState==0&&childItem.HotelName!='温馨的家'&&childItem.HotelName!='机场附近酒店'">
<a style="color:red">【{{$t('salesModule.OPZD')}}】</a>
<template v-if="childItem.DMCState==2&&childItem.HotelName!='温馨的家'&&childItem.HotelName!='机场附近酒店'">
<a style="color:red">【{{$t('salesModule.DJZK')}}】</a>
</template>
<template v-else>
<template v-if="childItem.DMCState==1&&childItem.HotelName!='温馨的家'&&childItem.HotelName!='机场附近酒店'">
<a style="color:green">【{{$t('salesModule.DJOK')}}】</a>
</template>
<template v-if="childItem.DMCState==2&&childItem.HotelName!='温馨的家'&&childItem.HotelName!='机场附近酒店'">
<a style="color:red">【{{$t('salesModule.DJZK')}}】</a>
</template>
<template v-if="childItem.DMCState==0&&childItem.HotelName!='温馨的家'&&childItem.HotelName!='机场附近酒店'">
<a style="color:red">【{{$t('salesModule.DJWCZ')}}】</a>
</template>
<template v-if="childItem.DMCState==0&&childItem.HotelName!='温馨的家'&&childItem.HotelName!='机场附近酒店'">
<a style="color:red">【{{$t('salesModule.DJWCZ')}}】</a>
</template>
</template>
【<span style="color:green">{{$t('op.btsy')}}：{{childItem.UseCount}}
{{childItem.CostPrice!=0?"价格:"+childItem.CostPrice:""}}</span>】
</span>
<span style="color:#E95252;" v-if="childItem.HotelName!='温馨的家'&&childItem.HotelName!='机场附近酒店'"> 【{{$t('hotel.hotel_remainList')}}：{{childItem.RemainingInventory}}】
<span style="color:#E95252;" v-if="childItem.HotelName!='温馨的家'&&childItem.HotelName!='机场附近酒店'">
【{{$t('hotel.hotel_remainList')}}：{{childItem.RemainingInventory}}】
</span>
</td>
<td>
......@@ -932,13 +948,16 @@
<el-option v-for="hotelItem in subItem.HotelList" :key="hotelItem.ID" :label="hotelItem.Name"
:value="hotelItem.ID">
<span style="float:left">{{hotelItem.Name}}</span>
<span style="float:right;color:red;font-size:13px">{{$t('hotel.hotel_remainList')}}:{{hotelItem.Inventory}}/{{$t('Operation.Op_price')}}:{{hotelItem.CostPrice}}{{hotelItem.PriceTaxTypeStr}} </span>
<span
style="float:right;color:red;font-size:13px">{{$t('hotel.hotel_remainList')}}:{{hotelItem.Inventory}}/{{$t('Operation.Op_price')}}:{{hotelItem.CostPrice}}{{hotelItem.PriceTaxTypeStr}}
</span>
</el-option>
</el-select>
</td>
<td>
<span v-if="childItem.UseCount>0 && subItem.SubList.length==1">
<span style="color:red;white-space:nowrap;cursor:pointer;" @click="DeleteStock(subItem)">{{$t('system.ph_shanchu')}}</span>
<span style="color:red;white-space:nowrap;cursor:pointer;"
@click="DeleteStock(subItem)">{{$t('system.ph_shanchu')}}</span>
</span>
<span>
<el-popover width="700" trigger="click" popper-class="DMC_HotelPop">
......@@ -977,15 +996,18 @@
</tr>
<tr v-for="item in lessPriceData">
<td>
<span v-if="item.LessMoney!=null" style="margin-right:30px;">{{item.LessMoney}}{{$t('hotel.hotel_yuan')}}</span><span
<span v-if="item.LessMoney!=null"
style="margin-right:30px;">{{item.LessMoney}}{{$t('hotel.hotel_yuan')}}</span><span
v-if="item.LessPercent!=null">{{item.LessPercent}}%</span>
</td>
<td>
<span v-if="item.DeptLessMoney!=null" style="margin-right:30px;">{{item.DeptLessMoney}}{{$t('hotel.hotel_yuan')}}</span><span
<span v-if="item.DeptLessMoney!=null"
style="margin-right:30px;">{{item.DeptLessMoney}}{{$t('hotel.hotel_yuan')}}</span><span
v-if="item.DeptLessPercent!=null">{{item.DeptLessPercent}}%</span>
</td>
<td>
<span v-if="item.FilialeLessMoney!=null" style="margin-right:30px;">{{item.FilialeLessMoney}}{{$t('hotel.hotel_yuan')}}</span><span
<span v-if="item.FilialeLessMoney!=null"
style="margin-right:30px;">{{item.FilialeLessMoney}}{{$t('hotel.hotel_yuan')}}</span><span
v-if="item.FilialeLessPercent!=null">{{item.FilialeLessPercent}}%</span>
</td>
</tr>
......@@ -1004,8 +1026,11 @@
<script>
import commonPHlInfo from "../../commonPage/commonPriceHotelInfo.vue";
import TravelPriceFlightList from "../TravelGroupControl/TravelPriceFlightList.vue";
import TravelPriceFlightList_Self from "../TravelGroupControl/TravelPriceFlightList_Self.vue";
export default {
props: ["priceList", "priceIsDirect", "OfferList", "PostConfig", "modifyTcid", "TeamType","CurrentUserInfo","IsDirect"],
props: ["priceList", "priceIsDirect", "OfferList", "PostConfig", "modifyTcid", "TeamType", "CurrentUserInfo",
"IsDirect"
],
data() {
return {
outerVisible: false,
......@@ -1150,6 +1175,8 @@
objItem.PriceFlight = JSON.parse(
JSON.stringify(this.PostConfig.FlightList)
);
//自定义航班列表
objItem.SelfPriceFlight = [];
} else {
objItem = {
TCID: 0,
......@@ -1207,6 +1234,8 @@
PriceFlight: JSON.parse(
JSON.stringify(this.PostConfig.FlightList)
),
//自定义航班列表
SelfPriceFlight: [],
//删除的绑定的航班编号
DeleteAirticketIds: "",
GatherTag: "", //集合标识
......@@ -1225,9 +1254,10 @@
SaleClearOrderHour: 0,
//可退景点下拉列表
ScenicBackList: [],
TipAmount:0,//人头小费金额
TipAmount: 0, //人头小费金额
//非中国大陆护照报价
ForeignPassportPrice:0
ForeignPassportPrice: 0,
UseFlightType: this.CurrentUserInfo.UseFlightType,
};
}
this.returnPriceList.push(objItem);
......@@ -1409,7 +1439,7 @@
this.isNullOrEmpty(quotationPrice.ChildNoNeedPrice) ||
this.isNullOrEmpty(quotationPrice.OldManChargePrice) ||
this.isNullOrEmpty(quotationPrice.OtherPrice) ||
this.isNullOrEmpty(quotationPrice.ForeignPassportPrice)||
this.isNullOrEmpty(quotationPrice.ForeignPassportPrice) ||
this.isNullOrEmpty(quotationPrice.SingleRoomPrice) ||
this.isNullOrEmpty(quotationPrice.VisaPrice) ||
this.isNullOrEmpty(quotationPrice.SingleDMCPrice) ||
......@@ -1437,8 +1467,18 @@
return _string;
},
setDisDirectFlight(obj) {
this.priceData.PriceFlight = JSON.parse(JSON.stringify(obj.priceFlight));
this.priceData.DeleteAirticketIds = obj.DeleteAirticketIdArray.join(',');
if (this.CurrentUserInfo.UseFlightType == 0) {
if (obj.priceFlight && obj.priceFlight.length > 0) {
this.priceData.PriceFlight = JSON.parse(JSON.stringify(obj.priceFlight));
}
} else {
if (obj.priceFlight && obj.priceFlight.length > 0) {
this.priceData.SelfPriceFlight = JSON.parse(JSON.stringify(obj.priceFlight));
}
}
if (obj.DeleteAirticketIdArray && obj.DeleteAirticketIdArray.length > 0) {
this.priceData.DeleteAirticketIds = obj.DeleteAirticketIdArray.join(',');
}
},
//删除标签
delDateList(item) {
......@@ -1799,11 +1839,11 @@
});
},
//根据日期返回星期几
getDayByDate(dateString){
if(dateString){
getDayByDate(dateString) {
if (dateString) {
var date;
var dateArray = dateString.split("-");
date = new Date(dateArray[0], parseInt(dateArray[1] - 1), dateArray[2]);
date = new Date(dateArray[0], parseInt(dateArray[1] - 1), dateArray[2]);
return "日一二三四五六".charAt(date.getDay());
}
}
......@@ -1870,7 +1910,8 @@
},
components: {
TravelPriceFlightList: TravelPriceFlightList,
commonPHInfo: commonPHlInfo
commonPHInfo: commonPHlInfo,
TravelPriceFlightListSelf: TravelPriceFlightList_Self,
}
};
......
src/components/newTravelmanager/TravelGroupControl/TravelPriceFlightList_Self.vue 0 → 100644
View file @ 5b76737e
<style>
.TravelFlightList {
width: 100%;
background-color: #fff;
}
.TFflightName {
padding: 3px 5px;
display: inline-block;
background-color: #ff9c00;
color: #fff;
border-radius: 4px;
margin-left: 10px;
}
.TFTable .el-form-item {
margin: 10px;
}
.TFTable i {
font-size: 14px;
}
.TFTable .el-input--prefix .el-input__inner {
padding-right: 0;
}
</style>
<template>
<div>
<div class="TravelFlightList">
<el-form label-width="0">
<table class="TFTable">
<tr>
<th>{{$t('sm.hangkonggs')}}</th>
<th>{{$t('visa.v_hangban')}}</th>
<th>{{$t('system.query_flightAir')}}</th>
<th>{{$t('system.ph_flightTime')}}</th>
<th>{{$t('system.query_arrivalAir')}}</th>
<th>{{$t('system.query_arrivalTime')}}</th>
<th>{{$t('Airticket.Air_StartTime')}}</th>
<th>{{$t('Airticket.Air_TicketType')}}</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="(priceFlight,index) in priceFlightList" :key="priceFlight.code">
<td>
<el-input v-model="priceFlight.AirLineName"> </el-input>
</td>
<td>
<el-input v-model="priceFlight.FlightNum"> </el-input>
</td>
<td>
<el-input v-model="priceFlight.StartAirport"></el-input>
</td>
<td>
<el-input v-model="priceFlight.StartTime"> </el-input>
</td>
<td>
<el-input v-model="priceFlight.ArrivalAirport"> </el-input>
</td>
<td>
<el-input v-model="priceFlight.ArrivalTime"> </el-input>
</td>
<td>
<el-date-picker class="w110" :clearable="false" v-model="priceFlight.FlightDate" type="date"
value-format="yyyy-MM-dd"></el-date-picker>
</td>
<td>
<el-select v class="w80" :placeholder="$t('pub.pleaseSel')" v-model="priceFlight.FlightType">
<el-option v-for="item in ticketTypeList" :label="item.Name" :value="item.Id" :key="item.Id">
</el-option>
</el-select>
</td>
<td>
<el-tooltip class="item" effect="dark" :content="$t('Operation.Op_hide')" placement="top-start">
<el-button type="danger" icon="el-icon-delete" @click="removePriceFlight(index,priceFlight)"
circle></el-button>
</el-tooltip>
</td>
</tr>
</table>
</el-form>
<div class="TFAddFlight" v-if="!IsBindFlight" @click="addFlight()">
<i class="iconfont icon-img_haha"></i>{{$t('fnc.tianjia')}}
</div>
</div>
</div>
</template>
<script>
export default {
props: ['priceData', 'AirTicketId', 'selectFilghtList', 'DeleteAirticketIds'],
data() {
var AirLineIdValidate = (rule, value, callback) => {
if (value === 0) {
callback(new Error(this.$t('system.ph_choiceAir')))
} else {
callback()
}
}
var FlightIdValidate = (rule, value, callback) => {
if (value === 0) {
callback(new Error(this.$t('sm.qxzhangban')))
} else {
callback()
}
}
var TicketTypeValidate = (rule, value, callback) => {
if (value === 0) {
callback(new Error(this.$t('sm.qxzjplx')))
} else {
callback()
}
}
return {
//航班列表
priceFlightList: [],
//是否绑定航班
IsBindFlight: false,
//类型
ticketTypeList: [{
Id: 1,
Name: this.$t('Airticket.Air_go')
},
{
Id: 2,
Name: this.$t('Airticket.Air_returnTrip')
}
],
defaultSelectValue: 0,
rules: {
AirLineId: [{
validator: AirLineIdValidate,
trigger: 'change'
}],
FlightId: [{
validator: FlightIdValidate,
trigger: 'change'
}],
StartDate: [{
required: true,
message: '请选择日期',
trigger: 'change'
}],
TicketType: [{
validator: TicketTypeValidate,
trigger: 'change'
}]
}
}
},
methods: {
//新增航班
addFlight() {
var obj = {
AirLineName: '',
FlightNum: '',
StartAirport: '',
StartTime: '',
ArrivalAirport: '',
ArrivalTime: '',
FlightDate: '',
FlightType: 1,
}
this.priceFlightList.push(obj)
},
//删除航班信息
removePriceFlight(index, item) {
var that = this
var msg = that.$t('sm.shanchuhangbbnhf')
that.Confirm(msg, function () {
if (index > -1) {
that.priceFlightList.splice(index, 1)
}
that.headCallBack()
})
},
headCallBack() {
var obj = {
pricesFlight: this.priceFlightList,
DeleteAirticketIdArray: []
}
this.$emit('headCallBack', obj)
},
},
mounted() {
},
watch: {
priceData: {
//深度监听，可监听到对象、数组的变化
handler: function (val, oldVal) {
if (val != oldVal) {
if (this.priceData.SelfPriceFlight) {
this.priceFlightList = this.priceData.SelfPriceFlight;
this.headCallBack()
}
}
},
deep: true
},
priceFlightList: {
//深度监听，可监听到对象、数组的变化
handler: function (val, oldVal) {
if (val != oldVal) {
this.headCallBack()
}
},
deep: true
},
}
}
</script>
src/components/platformModule/groupManagement.vue
View file @ 5b76737e
......@@ -221,8 +221,7 @@
<el-input type="text" v-model="addMsg.MaxDepartmentTier" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
<el-form-item label='Logo'>
<el-upload class="avatar-uploader" :http-request="UploadImage" action="" :show-file-list="false"
>
<el-upload class="avatar-uploader" :http-request="UploadImage" action="" :show-file-list="false">
<img v-if="imageUrl" :src="imageUrl" class="avatar">
<i class="el-icon-upload2 avatar-uploader-icon" @click="imgType=1"></i>
<span v-if="imageUrl" class="repUp" @click="imgType=1">{{$t('system.up_againUp')}}</span>
......@@ -230,8 +229,7 @@
</el-upload>
</el-form-item>
<el-form-item label='行程特色背景图片' v-if="addMsg.IsOpenTripFeature==1">
<el-upload class="avatar-uploader" :http-request="UploadImage" action="" :show-file-list="false"
>
<el-upload class="avatar-uploader" :http-request="UploadImage" action="" :show-file-list="false">
<img v-if="tripImageUrl" :src="tripImageUrl" class="avatar">
<i class="el-icon-upload2 avatar-uploader-icon" @click="imgType=2"></i>
<span v-if="tripImageUrl" class="repUp" @click="imgType=2">{{$t('system.up_againUp')}}</span>
......@@ -241,6 +239,10 @@
<el-form-item class='w400' label='状态' prop="Status">
<el-switch v-model="addMsg.Status" active-value="0" inactive-value="1"></el-switch>
</el-form-item>
<el-form-item class='w400' label='航班' prop="Status">
<el-radio v-model="addMsg.UseFlightType" :label="0">系统</el-radio>
<el-radio v-model="addMsg.UseFlightType" :label="1">自定义</el-radio>
</el-form-item>
<el-form-item class='w400' label='备注' prop="Remarks">
<el-input type="textarea" v-model="addMsg.Remarks"></el-input>
</el-form-item>
......@@ -403,6 +405,7 @@
IsOpenB2C: 0, //是否有直客网站(0-没有，1-有)
IsOpenTripFeature: 0, //是否有行程特色(0-没有，1-有)
TripFeatureImg: "", //行程特色背景图片
UseFlightType: 0, //使用航班类型(0-系统默认航班,1-自定义航班信息)
},
verSionMsg: {
Status: 0
......@@ -422,7 +425,7 @@
let newArr = [];
newArr.push(file.file);
let fileName = file.file.name;
var path = "/Upload/Temporary/";
var path = "/Upload/Temporary/";
this.UploadSelfFileT(path, newArr, x => {
if (this.imgType == 1) {
this.imageUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
......@@ -484,8 +487,6 @@
}
}, err => {})
},
getList() { //获取数据
this.loading = true
this.apipost('admin_get_GroupGetPageList', this.msg, res => {
......
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