Commit be9a6ff5 authored by 黄奎's avatar 黄奎

PAK航班,票务,平台筛选

parent a62d5b04
...@@ -1674,7 +1674,7 @@ ...@@ -1674,7 +1674,7 @@
<el-form-item :label="$t('salesModule.CustomFrom')" prop="ClientSource"> <el-form-item :label="$t('salesModule.CustomFrom')" prop="ClientSource">
<!--票务修改平台 --> <!--票务修改平台 -->
<el-select v-model="addMsg.ClientSource" filterable :placeholder="$t('pub.pleaseSel')" <el-select v-model="addMsg.ClientSource" filterable :placeholder="$t('pub.pleaseSel')"
@change="getTotalPrice()" :disabled="addMsg.OutBranchId&&addMsg.OutBranchId!=1245" > @change="gettypechange(),getTotalPrice()" :disabled="addMsg.OutBranchId&&addMsg.OutBranchId!=1245" >
<el-option v-for="item in ddlyList" :label="item.Name" :value="item.Id" :key="item.Id"> <el-option v-for="item in ddlyList" :label="item.Name" :value="item.Id" :key="item.Id">
</el-option> </el-option>
</el-select> </el-select>
...@@ -5518,7 +5518,7 @@ ...@@ -5518,7 +5518,7 @@
return; return;
} }
} }
var oldUnitPrice=this.addMsg.TC_Price;
if (this.addMsg.GroupType != 5) { if (this.addMsg.GroupType != 5) {
//印象票务 //印象票务
if (this.addMsg.OutBranchId&&this.addMsg.OutBranchId == 1245) { if (this.addMsg.OutBranchId&&this.addMsg.OutBranchId == 1245) {
...@@ -6883,7 +6883,6 @@ ...@@ -6883,7 +6883,6 @@
this.addMsg.TC_Price = this.addObj.B2CPrice; this.addMsg.TC_Price = this.addObj.B2CPrice;
this.addMsg.Unit_Price = this.addObj.B2CPrice; this.addMsg.Unit_Price = this.addObj.B2CPrice;
} }
this.addMsg.CustomerId = "0"; this.addMsg.CustomerId = "0";
this.addMsg.CommissionShareMoney = "0"; this.addMsg.CommissionShareMoney = "0";
} }
......
...@@ -3481,6 +3481,7 @@ ...@@ -3481,6 +3481,7 @@
"】" + "】" +
this.$t("objFill.v101.dictriqiwei") + this.$t("objFill.v101.dictriqiwei") +
this.CopyTripAndFeatureMsg.StartDate; this.CopyTripAndFeatureMsg.StartDate;
tipMsg+=",变更日期,会删除地接酒店。";
} }
that.Confirm(tipMsg, function () { that.Confirm(tipMsg, function () {
that.saveLoading = true; that.saveLoading = true;
......
...@@ -1869,6 +1869,7 @@ ...@@ -1869,6 +1869,7 @@
cmdStr = "travel_post_SetTCStartDate"; cmdStr = "travel_post_SetTCStartDate";
tipMsg = this.$t('objFill.v101.shifouxiiug') + "【" + this.CopyTripAndFeatureMsg.CurrentTCNUM + "】" + this.$t( tipMsg = this.$t('objFill.v101.shifouxiiug') + "【" + this.CopyTripAndFeatureMsg.CurrentTCNUM + "】" + this.$t(
'objFill.v101.dictriqiwei') + this.CopyTripAndFeatureMsg.StartDate; 'objFill.v101.dictriqiwei') + this.CopyTripAndFeatureMsg.StartDate;
tipMsg+=",变更日期后,请重新同步酒店信息。";
} }
that.Confirm(tipMsg, function () { that.Confirm(tipMsg, function () {
that.saveLoading = true; that.saveLoading = true;
......
...@@ -700,7 +700,7 @@ ...@@ -700,7 +700,7 @@
@keyup.native="checkPrice(subItem,'B2CSalePrice')" maxlength="8"></el-input> @keyup.native="checkPrice(subItem,'B2CSalePrice')" maxlength="8"></el-input>
<!--印象票务--> <!--印象票务-->
<template v-if="postConfig.OutBranchId==1245"> <template v-if="postConfig.OutBranchId==1245">
<el-select v-model="changePlat" @change="getChangePlat(subItem)"> <el-select v-model="changePlat" @change="getChangePlat(subItem)" filterable>
<el-option v-for="(pItem,pIndex) in platformList" :key="pIndex" :value="pItem.Id" <el-option v-for="(pItem,pIndex) in platformList" :key="pIndex" :value="pItem.Id"
:label="pItem.Name"></el-option> :label="pItem.Name"></el-option>
</el-select> </el-select>
......
...@@ -508,14 +508,23 @@ ...@@ -508,14 +508,23 @@
style="border:1px solid #C0C4CC;margin-bottom:2px;border-radius:5px;"> style="border:1px solid #C0C4CC;margin-bottom:2px;border-radius:5px;">
<table class="tFlightTab"> <table class="tFlightTab">
<tr> <tr>
<td>
<el-form-item :label="$t('system.query_type')">
<el-select v-model="fItem.FlightType">
<el-option :key="1" :value="1" :label="$t('Airticket.Air_go')"></el-option>
<el-option :key="2" :value="2" :label="$t('Airticket.Air_returnTrip')"></el-option>
<el-option :key="3" :value="3" :label="$t('Airticket.Air_transit')"></el-option>
</el-select>
</el-form-item>
</td>
<td> <td>
<el-form-item :label="$t('system.query_airCompanyName')"> <el-form-item :label="$t('system.query_airCompanyName')">
<el-input v-model="fItem.AlName" style="width:120px;"></el-input> <el-input v-model="fItem.AlName" style="width:85px;"></el-input>
</el-form-item> </el-form-item>
</td> </td>
<td> <td>
<el-form-item :label="$t('system.query_flightNum')"> <el-form-item :label="$t('system.query_flightNum')">
<el-input v-model="fItem.Flight_number" style="width:85px;"></el-input> <el-input v-model="fItem.Flight_number" style="width:130px;"></el-input>
</el-form-item> </el-form-item>
</td> </td>
<td> <td>
...@@ -523,10 +532,6 @@ ...@@ -523,10 +532,6 @@
<el-date-picker value-format="yyyy-MM-dd" v-model="fItem.FlightDate" type="date" size="mini" <el-date-picker value-format="yyyy-MM-dd" v-model="fItem.FlightDate" type="date" size="mini"
:placeholder="$t('admin.admin_choDate')" style="width:130px;"> :placeholder="$t('admin.admin_choDate')" style="width:130px;">
</el-date-picker> </el-date-picker>
</el-form-item>
</td>
<td style="text-align:right;">
<el-form-item style="padding-right:10px;">
<el-button type="danger" icon="el-icon-delete" @click="deleteSelfFlight(fIndex)" circle size="small"> <el-button type="danger" icon="el-icon-delete" @click="deleteSelfFlight(fIndex)" circle size="small">
</el-button> </el-button>
</el-form-item> </el-form-item>
...@@ -1059,6 +1064,7 @@ ...@@ -1059,6 +1064,7 @@
//添加自定义航班 //添加自定义航班
addSelfFlight() { addSelfFlight() {
var seleFObj = { var seleFObj = {
FlightType:1,//1-去程,2-回程
AlName: "", //航空公司名称 AlName: "", //航空公司名称
AIATA: "", //到达机场三码 AIATA: "", //到达机场三码
ArrivalCityName: "", //到达城市名称 ArrivalCityName: "", //到达城市名称
...@@ -1252,10 +1258,6 @@ ...@@ -1252,10 +1258,6 @@
addAward() { addAward() {
this.editForm.TravelTeamFlightList = this.addMsg.flightList; this.editForm.TravelTeamFlightList = this.addMsg.flightList;
this.editForm.TravelTeamPartnerList = this.friendList; this.editForm.TravelTeamPartnerList = this.friendList;
// if (!this.editForm.TravelTeamPartnerList.length) {
// this.Warning(this.$t('objFill.v101.qingxzhezhb'));
// return;
// }
this.saveLoading = true; this.saveLoading = true;
this.apipost( this.apipost(
"post_SetTeavelTeam", "post_SetTeavelTeam",
......
...@@ -626,10 +626,9 @@ ...@@ -626,10 +626,9 @@
</tr> </tr>
<tr v-for="(fItem,fIndex) in item.SelfFlightList" :key="fIndex" style="text-align:center;"> <tr v-for="(fItem,fIndex) in item.SelfFlightList" :key="fIndex" style="text-align:center;">
<td class="_d_name _color_666"> <td class="_d_name _color_666">
<span v-if="fIndex==0">{{$t('Airticket.Air_go')}}</span> <span v-if="fItem.FlightType==1">{{$t('Airticket.Air_go')}}</span>
<span v-else-if="fIndex==item.SelfFlightList.length-1">{{$t('Airticket.Air_returnTrip')}}</span> <span v-else-if="fItem.FlightType==2">{{$t('Airticket.Air_returnTrip')}}</span>
<span <span v-else-if="fItem.FlightType==3">{{$t('Airticket.Air_transit')}}</span>
v-else-if="fIndex>0 && fIndex!=item.SelfFlightList.length-1">{{$t('Airticket.Air_transit')}}</span>
</td> </td>
<td> <td>
<div>{{fItem.Flight_number}}</div> <div>{{fItem.Flight_number}}</div>
......
...@@ -195,11 +195,9 @@ ...@@ -195,11 +195,9 @@
</tr> </tr>
<tr v-for="(fItem,fIndex) in item.SelfFlightList" :key="fIndex" style="text-align:center;"> <tr v-for="(fItem,fIndex) in item.SelfFlightList" :key="fIndex" style="text-align:center;">
<td class="_d_name _color_666"> <td class="_d_name _color_666">
<span v-if="fIndex==0">{{$t('Airticket.Air_go')}}</span> <span v-if="fItem.FlightType==1">{{$t('Airticket.Air_go')}}</span>
<span <span v-else-if="fItem.FlightType==2">{{$t('Airticket.Air_returnTrip')}}</span>
v-else-if="fIndex==item.SelfFlightList.length-1">{{$t('Airticket.Air_returnTrip')}}</span> <span v-else-if="fItem.FlightType==3">{{$t('Airticket.Air_transit')}}</span>
<span
v-else-if="fIndex>0 && fIndex!=item.SelfFlightList.length-1">{{$t('Airticket.Air_transit')}}</span>
</td> </td>
<td> <td>
<div>{{fItem.Flight_number}}</div> <div>{{fItem.Flight_number}}</div>
...@@ -546,7 +544,7 @@ ...@@ -546,7 +544,7 @@
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
<el-dialog class="app-attachment-dialog" width="900" :title="dialogTitle" :visible.sync="isShowEditTeamDialog" <el-dialog class="app-attachment-dialog" width="1000" :title="dialogTitle" :visible.sync="isShowEditTeamDialog"
:close-on-click-modal="false"> :close-on-click-modal="false">
<editTeamInfo v-if="isShowEditTeamDialog" :Q_GTeamId="GTeamId" @success="refreshPage"></editTeamInfo> <editTeamInfo v-if="isShowEditTeamDialog" :Q_GTeamId="GTeamId" @success="refreshPage"></editTeamInfo>
</el-dialog> </el-dialog>
......
...@@ -542,7 +542,7 @@ ...@@ -542,7 +542,7 @@
</th> </th>
<th> <th>
<el-select v-model="changePlat" @change="getChangePlat(priceData.ExtPriceInfo)" <el-select v-model="changePlat" @change="getChangePlat(priceData.ExtPriceInfo)"
class="w150"> class="w150" filterable>
<el-option v-for="(pItem,pIndex) in platformList" :key="pIndex" :value="pItem.Id" <el-option v-for="(pItem,pIndex) in platformList" :key="pIndex" :value="pItem.Id"
:label="pItem.Name"></el-option> :label="pItem.Name"></el-option>
</el-select> </el-select>
......
...@@ -538,7 +538,7 @@ ...@@ -538,7 +538,7 @@
</th> </th>
<th> <th>
<el-select v-model="changePlat" @change="getChangePlat(priceData.ExtPriceInfo)" <el-select v-model="changePlat" @change="getChangePlat(priceData.ExtPriceInfo)"
class="w150"> class="w150" filterable>
<el-option v-for="(pItem,pIndex) in platformList" :key="pIndex" :value="pItem.Id" <el-option v-for="(pItem,pIndex) in platformList" :key="pIndex" :value="pItem.Id"
:label="pItem.Name"></el-option> :label="pItem.Name"></el-option>
</el-select> </el-select>
......
...@@ -499,7 +499,7 @@ ...@@ -499,7 +499,7 @@
</th> </th>
<th> <th>
<el-select v-model="changePlat" @change="getChangePlat(priceData.ExtPriceInfo)" <el-select v-model="changePlat" @change="getChangePlat(priceData.ExtPriceInfo)"
class="w150"> class="w150" filterable>
<el-option v-for="(pItem,pIndex) in platformList" :key="pIndex" :value="pItem.Id" <el-option v-for="(pItem,pIndex) in platformList" :key="pIndex" :value="pItem.Id"
:label="pItem.Name"></el-option> :label="pItem.Name"></el-option>
</el-select> </el-select>
......
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