Skip to content

S
SuperMan
Commit 4097af95 authored by 黄奎's avatar 黄奎
Browse files
Options

11

parent 6f6336f9
Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 59 deletions
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 4097af95
...@@ -187,6 +187,14 @@ ...@@ -187,6 +187,14 @@
:picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker> :picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
</span> </span>
</li> </li>
<li>
<span><em>团队类型</em></span>
<el-select class="w150" v-model="queryMsg.QTeamType" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" value=""></el-option>
<el-option label="常规团" :value="0" :key="0"></el-option>
<el-option label="切位团" :value="5" :key="5"></el-option>
</el-select>
</li>
<li class="advancedLi" style="height: 34px"> <li class="advancedLi" style="height: 34px">
<el-popover popper-class="advanceQueryList" v-model="queryCommonData.showHigradeSearch" trigger="click"> <el-popover popper-class="advanceQueryList" v-model="queryCommonData.showHigradeSearch" trigger="click">
<div> <div>
...@@ -491,8 +499,12 @@ ...@@ -491,8 +499,12 @@
<span v-if="item.Status == 1" :title="$t('visaT.sale')">{{ <span v-if="item.Status == 1" :title="$t('visaT.sale')">{{
$t("visaT.sale") $t("visaT.sale")
}}</span> }}</span>
<span v-if="item.IsNewArrival == 1" title="新品上市">新</span>
<span v-if="item.GroupRecommendType == 1" <span v-if="item.GroupRecommendType == 1"
:title="$t('objFill.jingping')">{{ $t("objFill.jing") }}</span> :title="$t('objFill.jingping')">{{ $t("objFill.jing") }}</span>
<label
style="display: inline-block; margin: 5px 0 0 5px; font-size: 12px;color:red;font-weight:bold;">{{ item.TeamTypeName }}</label>
<label <label
style="display: inline-block; margin: 5px 0 0 5px; font-size: 12px">{{ item.PriceTeamTypeName }}</label> style="display: inline-block; margin: 5px 0 0 5px; font-size: 12px">{{ item.PriceTeamTypeName }}</label>
</div> </div>
...@@ -515,7 +527,9 @@ ...@@ -515,7 +527,9 @@
: $t("objFill.v101.baozhangzhong") : $t("objFill.v101.baozhangzhong")
}}</span> }}</span>
</div> </div>
<div class="TCL-TOPTCNUM">({{ item.TCID }}) {{ item.TCNUM }}</div> <div class="TCL-TOPTCNUM">({{ item.TCID }}) {{ item.TCNUM }}
</div>
<div class="d12" style="float: none; margin: 3px auto"> <div class="d12" style="float: none; margin: 3px auto">
<p> <p>
<i class="iconfont icon-biaoti1"></i> <i class="iconfont icon-biaoti1"></i>
...@@ -670,7 +684,8 @@ ...@@ -670,7 +684,8 @@
</p> </p>
<p class="travelnowrap"> <p class="travelnowrap">
<span>{{ $t("Airticket.Air_StartTime") }}</span> <span>{{ $t("Airticket.Air_StartTime") }}</span>
<span class="go_date">{{ item.StartDate }}(<font style="color:red;font-weight:bold;">{{item.StartDateWeekStr}}</font>)</span> <span class="go_date">{{ item.StartDate }}(<font style="color:red;font-weight:bold;">
{{item.StartDateWeekStr}}</font>)</span>
<template v-if="item.RelationPriceList && item.RelationPriceList.length > 0"> <template v-if="item.RelationPriceList && item.RelationPriceList.length > 0">
<el-tooltip class="item" effect="dark" :content="$t('objFill.xilietdate')"> <el-tooltip class="item" effect="dark" :content="$t('objFill.xilietdate')">
<el-popover width="350" trigger="click" popper-class="TC_HotelPop"> <el-popover width="350" trigger="click" popper-class="TC_HotelPop">
...@@ -836,12 +851,12 @@ ...@@ -836,12 +851,12 @@
</p> </p>
<p class="travelprice"> <p class="travelprice">
{{ $t("Operation.Op_tradePrice") }}：￥{{ {{ $t("Operation.Op_tradePrice") }}：￥{{
item.B2BMemberPrice | priceFormat(item.B2BMemberPrice) item.B2BPrice | priceFormat(item.B2BPrice)
}} }}
</p> </p>
<p class="travelprice"> <p class="travelprice">
{{ $t("Operation.Op_directPrice") }}：￥{{ {{ $t("Operation.Op_directPrice") }}：￥{{
item.B2CMemberPrice | priceFormat(item.B2CMemberPrice) item.B2CPrice | priceFormat(item.B2CPrice)
}} }}
</p> </p>
<p> <p>
...@@ -851,26 +866,26 @@ ...@@ -851,26 +866,26 @@
<td rowspan="3" style="text-align: center" width="60"> <td rowspan="3" style="text-align: center" width="60">
<i>{{ $t("Operation.Op_standard") }}</i> <i>{{ $t("Operation.Op_standard") }}</i>
</td> </td>
<td class="TC_cusTitle"> <!-- <td class="TC_cusTitle">
{{ $t("Operation.Op_fellowMember") }} {{ $t("Operation.Op_fellowMember") }}
</td> </td>
<td> <td>
<b>{{ <b>{{
item.B2BMemberPrice | priceFormat(item.B2BMemberPrice) item.B2BMemberPrice | priceFormat(item.B2BMemberPrice)
}}</b> }}</b>
</td> </td> -->
<td class="TC_cusTitle">{{ $t("Operation.Op_fellow") }}</td> <td class="TC_cusTitle">{{ $t("Operation.Op_fellow") }}</td>
<td> <td>
<b>{{ item.B2BPrice | priceFormat(item.B2BPrice) }}</b> <b>{{ item.B2BPrice | priceFormat(item.B2BPrice) }}</b>
</td> </td>
<td class="TC_cusTitle"> <!-- <td class="TC_cusTitle">
{{ $t("Operation.Op_directMember") }} {{ $t("Operation.Op_directMember") }}
</td> </td>
<td> <td>
<b>{{ <b>{{
item.B2CMemberPrice | priceFormat(item.B2CMemberPrice) item.B2CMemberPrice | priceFormat(item.B2CMemberPrice)
}}</b> }}</b>
</td> </td> -->
<td class="TC_cusTitle">{{ $t("Operation.Op_direct") }}</td> <td class="TC_cusTitle">{{ $t("Operation.Op_direct") }}</td>
<td> <td>
<b>{{ item.B2CPrice | priceFormat(item.B2CPrice) }}</b> <b>{{ item.B2CPrice | priceFormat(item.B2CPrice) }}</b>
...@@ -1978,6 +1993,7 @@ ...@@ -1978,6 +1993,7 @@
QBusNumber: "", QBusNumber: "",
PriceTeamType: "", //团队类型 PriceTeamType: "", //团队类型
Title: "", //团名 Title: "", //团名
QTeamType: "",
}, },
TeamListArr: [], //团队类型 TeamListArr: [], //团队类型
//报价单查询条件 //报价单查询条件
......
src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
View file @ 4097af95
...@@ -67,6 +67,7 @@ ...@@ -67,6 +67,7 @@
font-weight: bold; font-weight: bold;
color: #f12a2a; color: #f12a2a;
} }
</style> </style>
<template> <template>
<div class="DirectQuotation clearfix" v-loading="loading"> <div class="DirectQuotation clearfix" v-loading="loading">
...@@ -203,7 +204,7 @@ ...@@ -203,7 +204,7 @@
getLineList() { getLineList() {
var chooseLineList = []; var chooseLineList = [];
//散拼 //散拼
if (this.postData.TeamType == 0) { if (this.postData.TeamType == 0 || this.postData.TeamType == 5) {
chooseLineList = this.LineList.filter(qItem => qItem.LineDirection == 2); chooseLineList = this.LineList.filter(qItem => qItem.LineDirection == 2);
} //小包团 } //小包团
else if (this.postData.TeamType == 1) { else if (this.postData.TeamType == 1) {
...@@ -633,4 +634,5 @@ ...@@ -633,4 +634,5 @@
this.getPostData(); this.getPostData();
} }
}; };
</script>
\ No newline at end of file </script>
src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue
View file @ 4097af95
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
v-bind:CountryID="PostConfig.CountryID"></TravelNotice> v-bind:CountryID="PostConfig.CountryID"></TravelNotice>
<div id="fiveAnchor"> <div id="fiveAnchor">
<!--常规团--> <!--常规团-->
<TravelPrice v-show="PostConfig.TeamType==0" @saveMsg="SaveData(1)" ref="TravelPrice1" @headCallBack="getPrice" <TravelPrice v-show="PostConfig.TeamType==0||PostConfig.TeamType==5" @saveMsg="SaveData(1)" ref="TravelPrice1" @headCallBack="getPrice"
:priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid" :CurrentUserInfo="CurrentUserInfo" :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid" :CurrentUserInfo="CurrentUserInfo"
:IsDirect="PostConfig.IsDirect"></TravelPrice> :IsDirect="PostConfig.IsDirect"></TravelPrice>
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ 4097af95
...@@ -447,6 +447,9 @@ ...@@ -447,6 +447,9 @@
</div> </div>
<div class="TPright"> <div class="TPright">
<div class="TP_noneed"> <div class="TP_noneed">
<el-checkbox v-model="priceData.IsNewArrival" :true-label="CheckedVaule"
:false-label="UnCheckedVaule">新品上市
</el-checkbox>
<el-checkbox v-model="priceData.IsSupportChildren" :true-label="CheckedVaule" <el-checkbox v-model="priceData.IsSupportChildren" :true-label="CheckedVaule"
:false-label="UnCheckedVaule">{{$t('op.SupportChild')}} :false-label="UnCheckedVaule">{{$t('op.SupportChild')}}
</el-checkbox> </el-checkbox>
...@@ -456,10 +459,10 @@ ...@@ -456,10 +459,10 @@
<el-checkbox v-model="priceData.IsLessPrice" :true-label="CheckedVaule" <el-checkbox v-model="priceData.IsLessPrice" :true-label="CheckedVaule"
:false-label="UnCheckedLessPrice">{{$t('op.CanLessPrice')}} :false-label="UnCheckedLessPrice">{{$t('op.CanLessPrice')}}
</el-checkbox> </el-checkbox>
<el-checkbox v-model="priceData.IsNeedAirportShuttle" @change="IsNeedAirportShuttleChange" <!-- <el-checkbox v-model="priceData.IsNeedAirportShuttle" @change="IsNeedAirportShuttleChange"
:true-label="CheckedVaule" :false-label="UnCheckedLessPrice"> :true-label="CheckedVaule" :false-label="UnCheckedLessPrice">
{{$t('objFill.v101.myOrdersAllType.shifouxyst')}} {{$t('objFill.v101.myOrdersAllType.shifouxyst')}}
</el-checkbox> </el-checkbox> -->
<template v-if="CurrentUserInfo.RB_Group_id==2"> <template v-if="CurrentUserInfo.RB_Group_id==2">
<input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true" <input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true"
v-if="(PostConfig.LineId==14 || PostConfig.LineId==131|| PostConfig.LineId==90||PostConfig.LineId==168||PostConfig.LineId==118) " /> v-if="(PostConfig.LineId==14 || PostConfig.LineId==131|| PostConfig.LineId==90||PostConfig.LineId==168||PostConfig.LineId==118) " />
...@@ -469,7 +472,7 @@ ...@@ -469,7 +472,7 @@
v-if="IsDirect==1 && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" /> v-if="IsDirect==1 && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" />
</template> </template>
</div> </div>
<div style="margin:0 0 20px 10px;height:34px;"> <!-- <div style="margin:0 0 20px 10px;height:34px;">
<div style="display:inline-block;height:34px;line-height:34px;"> <div style="display:inline-block;height:34px;line-height:34px;">
<el-checkbox v-model="priceData.IsUseCompanyBus" :true-label="CheckedVaule" <el-checkbox v-model="priceData.IsUseCompanyBus" :true-label="CheckedVaule"
:false-label="UnCheckedLessPrice" :label="$t('objFill.v101.myOrdersAllType.gongsichel')"> :false-label="UnCheckedLessPrice" :label="$t('objFill.v101.myOrdersAllType.gongsichel')">
...@@ -483,25 +486,25 @@ ...@@ -483,25 +486,25 @@
</el-option> </el-option>
</el-select> </el-select>
</template> </template>
</div> </div> -->
<el-form-item prop="B2BMemberPrice"> <!-- <el-form-item prop="B2BMemberPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" <el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.B2BMemberPrice" @keyup.native="checkPrice(priceData,'B2BMemberPrice')"> v-model="priceData.B2BMemberPrice" @keyup.native="checkPrice(priceData,'B2BMemberPrice')">
<template slot="prepend">{{$t('Operation.Op_fellowMember')}}</template> <template slot="prepend">{{$t('Operation.Op_fellowMember')}}</template>
</el-input> </el-input>
</el-form-item> </el-form-item> -->
<el-form-item prop="B2BPrice"> <el-form-item prop="B2BPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.B2BPrice" <el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.B2BPrice"
@keyup.native="checkPrice(priceData,'B2BPrice')"> @keyup.native="checkPrice(priceData,'B2BPrice')">
<template slot="prepend">{{$t('Operation.Op_fellow')}}</template> <template slot="prepend">{{$t('Operation.Op_fellow')}}</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="B2CMemberPrice"> <!-- <el-form-item prop="B2CMemberPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" <el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.B2CMemberPrice" @keyup.native="checkPrice(priceData,'B2CMemberPrice')"> v-model="priceData.B2CMemberPrice" @keyup.native="checkPrice(priceData,'B2CMemberPrice')">
<template slot="prepend">{{$t('Operation.Op_directMember')}}</template> <template slot="prepend">{{$t('Operation.Op_directMember')}}</template>
</el-input> </el-input>
</el-form-item> </el-form-item> -->
<el-form-item prop="B2CPrice"> <el-form-item prop="B2CPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.B2CPrice" <el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.B2CPrice"
@keyup.native="checkPrice(priceData,'B2CPrice')"> @keyup.native="checkPrice(priceData,'B2CPrice')">
...@@ -904,7 +907,7 @@ ...@@ -904,7 +907,7 @@
</div> </div>
<div class="clearfix"> <div class="clearfix">
<div class="TPright clearfix"> <div class="TPright clearfix">
<el-form-item style="margin-top:1px;"> <el-form-item style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('objFill.tuanduilx')}}</span> <span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('objFill.tuanduilx')}}</span>
<el-select class="w180" v-model="priceData.PriceTeamType"> <el-select class="w180" v-model="priceData.PriceTeamType">
<template v-for="item in TeamListArr"> <template v-for="item in TeamListArr">
...@@ -1422,6 +1425,7 @@ ...@@ -1422,6 +1425,7 @@
GuideNum: 0, //导游人数 GuideNum: 0, //导游人数
IsLeaderDaiTuan: 1, //领队带团/不带团 IsLeaderDaiTuan: 1, //领队带团/不带团
IsGuideDaiTuan: 1, //导游带团/不带团 IsGuideDaiTuan: 1, //导游带团/不带团
IsNewArrival: 0, //是否新品
}; };
} }
this.returnPriceList.push(objItem); this.returnPriceList.push(objItem);
...@@ -1593,9 +1597,7 @@ ...@@ -1593,9 +1597,7 @@
//数据验证 //数据验证
validateTeamQuot(quotationPrice) { validateTeamQuot(quotationPrice) {
if ( if (
this.isNullOrEmpty(quotationPrice.B2BMemberPrice) ||
this.isNullOrEmpty(quotationPrice.B2BPrice) || this.isNullOrEmpty(quotationPrice.B2BPrice) ||
this.isNullOrEmpty(quotationPrice.B2CMemberPrice) ||
this.isNullOrEmpty(quotationPrice.B2CPrice) || this.isNullOrEmpty(quotationPrice.B2CPrice) ||
this.isNullOrEmpty(quotationPrice.BabyChargePrice) || this.isNullOrEmpty(quotationPrice.BabyChargePrice) ||
this.isNullOrEmpty(quotationPrice.BabyPrice) || this.isNullOrEmpty(quotationPrice.BabyPrice) ||
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue
View file @ 4097af95
...@@ -446,6 +446,9 @@ ...@@ -446,6 +446,9 @@
</div> </div>
<div class="TPright"> <div class="TPright">
<div class="TP_noneed"> <div class="TP_noneed">
<el-checkbox v-model="priceData.IsNewArrival" :true-label="CheckedVaule"
:false-label="UnCheckedVaule">新品上市
</el-checkbox>
<el-checkbox v-model="priceData.IsSupportChildren" :true-label="CheckedVaule" <el-checkbox v-model="priceData.IsSupportChildren" :true-label="CheckedVaule"
:false-label="UnCheckedVaule">{{$t('op.SupportChild')}} :false-label="UnCheckedVaule">{{$t('op.SupportChild')}}
</el-checkbox> </el-checkbox>
...@@ -456,7 +459,8 @@ ...@@ -456,7 +459,8 @@
:false-label="UnCheckedLessPrice">{{$t('op.CanLessPrice')}} :false-label="UnCheckedLessPrice">{{$t('op.CanLessPrice')}}
</el-checkbox> </el-checkbox>
<el-checkbox v-model="priceData.IsNeedAirportShuttle" @change="IsNeedAirportShuttleChange" <el-checkbox v-model="priceData.IsNeedAirportShuttle" @change="IsNeedAirportShuttleChange"
:true-label="CheckedVaule" :false-label="UnCheckedLessPrice">{{$t('objFill.v101.myOrdersAllType.shifouxyst')}} :true-label="CheckedVaule" :false-label="UnCheckedLessPrice">
{{$t('objFill.v101.myOrdersAllType.shifouxyst')}}
</el-checkbox> </el-checkbox>
<template v-if="CurrentUserInfo.RB_Group_id==2"> <template v-if="CurrentUserInfo.RB_Group_id==2">
<input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true" <input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true"
...@@ -482,24 +486,24 @@ ...@@ -482,24 +486,24 @@
</el-select> </el-select>
</template> </template>
</div> </div>
<el-form-item prop="B2BMemberPrice"> <!-- <el-form-item prop="B2BMemberPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" <el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.B2BMemberPrice" @keyup.native="checkPrice(priceData,'B2BMemberPrice')"> v-model="priceData.B2BMemberPrice" @keyup.native="checkPrice(priceData,'B2BMemberPrice')">
<template slot="prepend">{{$t('Operation.Op_fellowMember')}}</template> <template slot="prepend">{{$t('Operation.Op_fellowMember')}}</template>
</el-input> </el-input>
</el-form-item> </el-form-item> -->
<el-form-item prop="B2BPrice"> <el-form-item prop="B2BPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.B2BPrice" <el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.B2BPrice"
@keyup.native="checkPrice(priceData,'B2BPrice')"> @keyup.native="checkPrice(priceData,'B2BPrice')">
<template slot="prepend">{{$t('Operation.Op_fellow')}}</template> <template slot="prepend">{{$t('Operation.Op_fellow')}}</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="B2CMemberPrice"> <!-- <el-form-item prop="B2CMemberPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" <el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.B2CMemberPrice" @keyup.native="checkPrice(priceData,'B2CMemberPrice')"> v-model="priceData.B2CMemberPrice" @keyup.native="checkPrice(priceData,'B2CMemberPrice')">
<template slot="prepend">{{$t('Operation.Op_directMember')}}</template> <template slot="prepend">{{$t('Operation.Op_directMember')}}</template>
</el-input> </el-input>
</el-form-item> </el-form-item> -->
<el-form-item prop="B2CPrice"> <el-form-item prop="B2CPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.B2CPrice" <el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.B2CPrice"
@keyup.native="checkPrice(priceData,'B2CPrice')"> @keyup.native="checkPrice(priceData,'B2CPrice')">
...@@ -710,13 +714,14 @@ ...@@ -710,13 +714,14 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('objFill.v101.myOrdersAllType.lindudtbdt')}}</span> <span class="TP_Sendprepend"
<el-select class="w180" v-model="priceData.IsLeaderDaiTuan"> style="margin:3px -1px 0 0">{{$t('objFill.v101.myOrdersAllType.lindudtbdt')}}</span>
<template v-for="item in DaiTuanList"> <el-select class="w180" v-model="priceData.IsLeaderDaiTuan">
<el-option :key="item.Id" :label="item.name" :value="item.Id"> <template v-for="item in DaiTuanList">
</el-option> <el-option :key="item.Id" :label="item.name" :value="item.Id">
</template> </el-option>
</el-select> </template>
</el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-input :placeholder="$t('op.CanSallTicketNum')" class="w290" v-model="priceData.CanSellTicketNum" <el-input :placeholder="$t('op.CanSallTicketNum')" class="w290" v-model="priceData.CanSellTicketNum"
...@@ -749,8 +754,8 @@ ...@@ -749,8 +754,8 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="SendPersion"> <el-form-item prop="SendPersion">
<el-input class="w260" :disabled="!priceData.IsNeedAirportShuttle" :placeholder="$t('objFill.v101.myOrdersAllType.qingsrstr')" <el-input class="w260" :disabled="!priceData.IsNeedAirportShuttle"
v-model="priceData.SendPersion"> :placeholder="$t('objFill.v101.myOrdersAllType.qingsrstr')" v-model="priceData.SendPersion">
<template slot="prepend">{{$t('objFill.v101.myOrdersAllType.shongtuanr')}}</template> <template slot="prepend">{{$t('objFill.v101.myOrdersAllType.shongtuanr')}}</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
...@@ -898,7 +903,8 @@ ...@@ -898,7 +903,8 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item style="margin-top:1px;"> <el-form-item style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('objFill.v101.myOrdersAllType.baojiaddz')}}</span> <span class="TP_Sendprepend"
style="margin:3px -1px 0 0">{{$t('objFill.v101.myOrdersAllType.baojiaddz')}}</span>
<el-upload class="upload-demo" style="display:inline-block;position:relative;top:-1px;left:3px;" <el-upload class="upload-demo" style="display:inline-block;position:relative;top:-1px;left:3px;"
:http-request="uploadFileBtn" :multiple="true" :show-file-list="false" action=""> :http-request="uploadFileBtn" :multiple="true" :show-file-list="false" action="">
<el-button size="small" type="primary">{{$t('objFill.shangchuan')}}</el-button> <el-button size="small" type="primary">{{$t('objFill.shangchuan')}}</el-button>
...@@ -937,7 +943,9 @@ ...@@ -937,7 +943,9 @@
<span class="TCswitch"> <span class="TCswitch">
<el-switch v-model="priceData.IsB2B" :active-value="inActive" :inactive-value="notInActive"> <el-switch v-model="priceData.IsB2B" :active-value="inActive" :inactive-value="notInActive">
</el-switch> </el-switch>
<div class="TC-config">{{$t('sm.cpjhtuiB2bzzd')}}<br/><font style="color:red;">{{$t('objFill.v101.myOrdersAllType.qieweitqgbcx')}}</font></div> <div class="TC-config">{{$t('sm.cpjhtuiB2bzzd')}}<br />
<font style="color:red;">{{$t('objFill.v101.myOrdersAllType.qieweitqgbcx')}}</font>
</div>
</span> </span>
</div> </div>
</el-form-item> </el-form-item>
...@@ -1404,8 +1412,9 @@ ...@@ -1404,8 +1412,9 @@
BusPriceId: 0, //公司车辆编号 BusPriceId: 0, //公司车辆编号
EmergencyContact: "", //紧急联系人 EmergencyContact: "", //紧急联系人
IsNeedAirportShuttle: 0, //是否需要接送服务 IsNeedAirportShuttle: 0, //是否需要接送服务
GuideNum:0,//导游人数 GuideNum: 0, //导游人数
IsLeaderDaiTuan:1,//领队带团/不带团 IsLeaderDaiTuan: 1, //领队带团/不带团
IsNewArrival: 0, //是否新品
}; };
} }
this.returnPriceList.push(objItem); this.returnPriceList.push(objItem);
...@@ -1579,9 +1588,7 @@ ...@@ -1579,9 +1588,7 @@
//数据验证 //数据验证
validateTeamQuot(quotationPrice) { validateTeamQuot(quotationPrice) {
if ( if (
this.isNullOrEmpty(quotationPrice.B2BMemberPrice) ||
this.isNullOrEmpty(quotationPrice.B2BPrice) || this.isNullOrEmpty(quotationPrice.B2BPrice) ||
this.isNullOrEmpty(quotationPrice.B2CMemberPrice) ||
this.isNullOrEmpty(quotationPrice.B2CPrice) || this.isNullOrEmpty(quotationPrice.B2CPrice) ||
this.isNullOrEmpty(quotationPrice.BabyChargePrice) || this.isNullOrEmpty(quotationPrice.BabyChargePrice) ||
this.isNullOrEmpty(quotationPrice.BabyPrice) || this.isNullOrEmpty(quotationPrice.BabyPrice) ||
...@@ -1813,7 +1820,8 @@ ...@@ -1813,7 +1820,8 @@
parseInt(this.priceData.FSeat); parseInt(this.priceData.FSeat);
if (Number(fitem.TicketNum) - Number(fitem.OtherTeamUseNum) < Number(fitem.BindNum)) { if (Number(fitem.TicketNum) - Number(fitem.OtherTeamUseNum) < Number(fitem.BindNum)) {
fitem.BindNum = 0; fitem.BindNum = 0;
this.Error(this.$t('objFill.v101.myOrdersAllType.zuiduoznbd') + (Number(fitem.TicketNum) - Number(fitem.OtherTeamUseNum)) + this.$t('objFill.v101.myOrdersAllType.gejiwei')); this.Error(this.$t('objFill.v101.myOrdersAllType.zuiduoznbd') + (Number(fitem.TicketNum) - Number(fitem
.OtherTeamUseNum)) + this.$t('objFill.v101.myOrdersAllType.gejiwei'));
} }
this.selectFilghtList.forEach((x, index) => { this.selectFilghtList.forEach((x, index) => {
if (x.IsSelected) { if (x.IsSelected) {
...@@ -1921,7 +1929,7 @@ ...@@ -1921,7 +1929,7 @@
if (type == 2) { if (type == 2) {
that.btnTongBu = that.$t('objFill.v101.myOrdersAllType.tongbujd'); that.btnTongBu = that.$t('objFill.v101.myOrdersAllType.tongbujd');
} else { } else {
that.btnText = that.$t('pub.saveBtn')+'...'; that.btnText = that.$t('pub.saveBtn') + '...';
} }
}); });
}, },
...@@ -2075,7 +2083,7 @@ ...@@ -2075,7 +2083,7 @@
priceList.push(x); priceList.push(x);
} }
}); });
if(priceList.length>0) this.returnPriceList = priceList; if (priceList.length > 0) this.returnPriceList = priceList;
} }
this.returnPriceList.sort( this.returnPriceList.sort(
this.$commonUtils.createComprisonFunction("StartDate") this.$commonUtils.createComprisonFunction("StartDate")
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue
View file @ 4097af95
...@@ -447,24 +447,24 @@ ...@@ -447,24 +447,24 @@
v-if="IsDirect==1 && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" /> v-if="IsDirect==1 && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" />
</template> </template>
</div> </div>
<el-form-item prop="B2BMemberPrice"> <!-- <el-form-item prop="B2BMemberPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" <el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.B2BMemberPrice" @keyup.native="checkPrice(priceData,'B2BMemberPrice')"> v-model="priceData.B2BMemberPrice" @keyup.native="checkPrice(priceData,'B2BMemberPrice')">
<template slot="prepend">{{$t('Operation.Op_fellowMember')}}</template> <template slot="prepend">{{$t('Operation.Op_fellowMember')}}</template>
</el-input> </el-input>
</el-form-item> </el-form-item> -->
<el-form-item prop="B2BPrice"> <el-form-item prop="B2BPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.B2BPrice" <el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.B2BPrice"
@keyup.native="checkPrice(priceData,'B2BPrice')"> @keyup.native="checkPrice(priceData,'B2BPrice')">
<template slot="prepend">{{$t('Operation.Op_fellow')}}</template> <template slot="prepend">{{$t('Operation.Op_fellow')}}</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="B2CMemberPrice"> <!-- <el-form-item prop="B2CMemberPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" <el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.B2CMemberPrice" @keyup.native="checkPrice(priceData,'B2CMemberPrice')"> v-model="priceData.B2CMemberPrice" @keyup.native="checkPrice(priceData,'B2CMemberPrice')">
<template slot="prepend">{{$t('Operation.Op_directMember')}}</template> <template slot="prepend">{{$t('Operation.Op_directMember')}}</template>
</el-input> </el-input>
</el-form-item> </el-form-item> -->
<el-form-item prop="B2CPrice"> <el-form-item prop="B2CPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.B2CPrice" <el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.B2CPrice"
@keyup.native="checkPrice(priceData,'B2CPrice')"> @keyup.native="checkPrice(priceData,'B2CPrice')">
...@@ -1180,6 +1180,7 @@ ...@@ -1180,6 +1180,7 @@
EmergencyContact: "", //紧急联系人 EmergencyContact: "", //紧急联系人
IsNeedAirportShuttle: 0, //是否需要接送服务 IsNeedAirportShuttle: 0, //是否需要接送服务
GuideNum: 0, //导游人数 GuideNum: 0, //导游人数
IsNewArrival: 0, //是否新品
}; };
} }
this.returnPriceList.push(objItem); this.returnPriceList.push(objItem);
...@@ -1434,9 +1435,7 @@ ...@@ -1434,9 +1435,7 @@
//数据验证 //数据验证
validateTeamQuot(quotationPrice) { validateTeamQuot(quotationPrice) {
if ( if (
this.isNullOrEmpty(quotationPrice.B2BMemberPrice) ||
this.isNullOrEmpty(quotationPrice.B2BPrice) || this.isNullOrEmpty(quotationPrice.B2BPrice) ||
this.isNullOrEmpty(quotationPrice.B2CMemberPrice) ||
this.isNullOrEmpty(quotationPrice.B2CPrice) || this.isNullOrEmpty(quotationPrice.B2CPrice) ||
this.isNullOrEmpty(quotationPrice.BabyChargePrice) || this.isNullOrEmpty(quotationPrice.BabyChargePrice) ||
this.isNullOrEmpty(quotationPrice.BabyPrice) || this.isNullOrEmpty(quotationPrice.BabyPrice) ||
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice4.vue
View file @ 4097af95
...@@ -457,24 +457,24 @@ ...@@ -457,24 +457,24 @@
<input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true" <input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true"
v-if="((userInfo.RB_Group_id==QjGroupId() && PostConfig.LineId==14) || userInfo.RB_Group_id!=2) && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" /> v-if="((userInfo.RB_Group_id==QjGroupId() && PostConfig.LineId==14) || userInfo.RB_Group_id!=2) && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" />
</div> </div>
<el-form-item prop="B2BMemberPrice"> <!-- <el-form-item prop="B2BMemberPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" <el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.B2BMemberPrice" @keyup.native="checkPrice(priceData,'B2BMemberPrice')"> v-model="priceData.B2BMemberPrice" @keyup.native="checkPrice(priceData,'B2BMemberPrice')">
<template slot="prepend">{{$t('Operation.Op_fellowMember')}}</template> <template slot="prepend">{{$t('Operation.Op_fellowMember')}}</template>
</el-input> </el-input>
</el-form-item> </el-form-item> -->
<el-form-item prop="B2BPrice"> <el-form-item prop="B2BPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.B2BPrice" <el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.B2BPrice"
@keyup.native="checkPrice(priceData,'B2BPrice')"> @keyup.native="checkPrice(priceData,'B2BPrice')">
<template slot="prepend">{{$t('Operation.Op_fellow')}}</template> <template slot="prepend">{{$t('Operation.Op_fellow')}}</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="B2CMemberPrice" :class="{'showOther':TeamType==3}"> <!-- <el-form-item prop="B2CMemberPrice" :class="{'showOther':TeamType==3}">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" <el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.B2CMemberPrice" @keyup.native="checkPrice(priceData,'B2CMemberPrice')"> v-model="priceData.B2CMemberPrice" @keyup.native="checkPrice(priceData,'B2CMemberPrice')">
<template slot="prepend">{{$t('Operation.Op_directMember')}}</template> <template slot="prepend">{{$t('Operation.Op_directMember')}}</template>
</el-input> </el-input>
</el-form-item> </el-form-item> -->
<el-form-item prop="B2CPrice" :class="{'showOther':TeamType==3}"> <el-form-item prop="B2CPrice" :class="{'showOther':TeamType==3}">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.B2CPrice" <el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.B2CPrice"
@keyup.native="checkPrice(priceData,'B2CPrice')"> @keyup.native="checkPrice(priceData,'B2CPrice')">
...@@ -1281,6 +1281,7 @@ ...@@ -1281,6 +1281,7 @@
EmergencyContact: "", //紧急联系人 EmergencyContact: "", //紧急联系人
IsNeedAirportShuttle: 0, //是否需要接送服务 IsNeedAirportShuttle: 0, //是否需要接送服务
GuideNum: 0, //导游人数 GuideNum: 0, //导游人数
IsNewArrival: 0, //是否新品
}; };
} }
this.returnPriceList.push(objItem); this.returnPriceList.push(objItem);
...@@ -1452,9 +1453,7 @@ ...@@ -1452,9 +1453,7 @@
//数据验证 //数据验证
validateTeamQuot(quotationPrice) { validateTeamQuot(quotationPrice) {
if ( if (
this.isNullOrEmpty(quotationPrice.B2BMemberPrice) ||
this.isNullOrEmpty(quotationPrice.B2BPrice) || this.isNullOrEmpty(quotationPrice.B2BPrice) ||
this.isNullOrEmpty(quotationPrice.B2CMemberPrice) ||
this.isNullOrEmpty(quotationPrice.B2CPrice) || this.isNullOrEmpty(quotationPrice.B2CPrice) ||
this.isNullOrEmpty(quotationPrice.BabyChargePrice) || this.isNullOrEmpty(quotationPrice.BabyChargePrice) ||
this.isNullOrEmpty(quotationPrice.BabyPrice) || this.isNullOrEmpty(quotationPrice.BabyPrice) ||
...@@ -1675,7 +1674,8 @@ ...@@ -1675,7 +1674,8 @@
parseInt(this.priceData.FSeat); parseInt(this.priceData.FSeat);
if (Number(fitem.TicketNum) - Number(fitem.OtherTeamUseNum) < Number(fitem.BindNum)) { if (Number(fitem.TicketNum) - Number(fitem.OtherTeamUseNum) < Number(fitem.BindNum)) {
fitem.BindNum = 0; fitem.BindNum = 0;
this.Error(this.$t('objFill.v101.myOrdersAllType.zuiduoznbd') + (Number(fitem.TicketNum) - Number(fitem.OtherTeamUseNum)) + this.$t('objFill.v101.myOrdersAllType.gejiwei')); this.Error(this.$t('objFill.v101.myOrdersAllType.zuiduoznbd') + (Number(fitem.TicketNum) - Number(fitem
.OtherTeamUseNum)) + this.$t('objFill.v101.myOrdersAllType.gejiwei'));
} }
this.selectFilghtList.forEach((x, index) => { this.selectFilghtList.forEach((x, index) => {
if (x.IsSelected) { if (x.IsSelected) {
...@@ -1783,7 +1783,7 @@ ...@@ -1783,7 +1783,7 @@
if (type == 2) { if (type == 2) {
that.btnTongBu = that.$t('objFill.v101.myOrdersAllType.tongbujd'); that.btnTongBu = that.$t('objFill.v101.myOrdersAllType.tongbujd');
} else { } else {
that.btnText = that.$t('pub.saveBtn')+'...'; that.btnText = that.$t('pub.saveBtn') + '...';
} }
}); });
}, },
......
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