Skip to content

S
SuperMan
Commit 39e914b4 authored by 黄奎's avatar 黄奎
Browse files
Options

11

parent 0b74ef52
Hide whitespace changes
Inline Side-by-side
Showing with 251 additions and 236 deletions
src/components/TravelManager/TravelTeam/priceGroup.vue
View file @ 39e914b4
......@@ -534,20 +534,25 @@
.p20 {
padding: 20px;
}
.item-title {
font-size: 12px;
font-weight: normal;
color: #666;
}
.bold {
font-weight: bold;
}
.price {
cursor: pointer;
}
.price:hover {
color: red;
}
.item-title {
font-size: 12px;
font-weight: normal;
color: #666;
}
.bold {
font-weight: bold;
}
.price {
cursor: pointer;
}
.price:hover {
color: red;
}
</style>
<template>
......@@ -562,8 +567,8 @@
</li>
<li>
<span><em>{{ $t("hotel.hotel_StarDate") }}</em>
<el-date-picker v-model="msg.StartTime" @change="dataDui()" class="w135" value-format="yyyy-MM-dd" :clearable="false"
type="date" :picker-options="pickerBeginDateStart"></el-date-picker>
<el-date-picker v-model="msg.StartTime" @change="dataDui()" class="w135" value-format="yyyy-MM-dd"
:clearable="false" type="date" :picker-options="pickerBeginDateStart"></el-date-picker>
-
<el-date-picker v-model="msg.EndTime" @change="dataDui()" class="w135" value-format="yyyy-MM-dd" clearable
type="date" :picker-options="pickerBeginDateAfter"></el-date-picker>
......@@ -589,79 +594,87 @@
<div class="TC_remarkContent">
<div class="el-col w_20">
<div class="p20">
<div class="mb title"><i class="iconfont icon-biaoti1"></i><span>{{$t('objFill.v101.baojixinx')}}</span></div>
<div class="mb title"><i class="iconfont icon-biaoti1"></i><span>{{$t('objFill.v101.baojixinx')}}</span>
</div>
<div class="mb"><span>{{item.Title}}</span></div>
<div class="bold"><span class="item-title">{{$t('hotel.hotel_StarDate')}}：</span><span>{{item.StartDate}}</span></div>
<div class="bold"><span class="item-title">{{$t('visa.v_teaminfo')}}:：</span><span>{{item.TCNUM}}({{item.TCID}})</span></div>
<div class="bold"><span
class="item-title">{{$t('hotel.hotel_StarDate')}}：</span><span>{{item.StartDate}}</span></div>
<div class="bold"><span
class="item-title">{{$t('visa.v_teaminfo')}}:：</span><span>{{item.TCNUM}}({{item.TCID}})</span>
</div>
</div>
</div>
<div class="el-col w_20">
<div class="p20">
<div class="mb title"><i class="iconfont icon-hangban1"></i><span>{{$t('salesModule.FlighInfo')}}</span></div>
<div class="mb title"><i class="iconfont icon-hangban1"></i><span>{{$t('salesModule.FlighInfo')}}</span>
</div>
<!-- <div class="mb" v-for="(subItem,subIndex) in item.TravelTeamFlightList" :key="subIndex+1000">
<div> {{subItem.Flight_number}}
{{subItem.DepartureAirPortName}} {{subItem.Departure_time}} {{subItem.ArrivalAirPortName}}
{{subItem.Arrival_time}}</div>
</div> -->
<el-popover width="900" trigger="click" popper-class="TC_tripDetails">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr class="_color_666" style="text-align:center;">
<th width="60">{{$t('Airticket.Air_segment')}}</th>
<th width="80">{{$t('system.query_flightNum')}}</th>
<th width="150">{{$t('system.ph_flightTime')}}</th>
<th width="80">{{$t('system.query_arrivalTime')}}</th>
</tr>
<tr v-for="(fItem,fIndex) in item.SelfFlightList" :key="fIndex" style="text-align:center;">
<td class="_d_name _color_666">
<span v-if="fIndex==0">{{$t('Airticket.Air_go')}}</span>
<span v-else-if="fIndex==item.SelfFlightList.length-1">{{$t('Airticket.Air_returnTrip')}}</span>
<span
v-else-if="fIndex>0 && fIndex!=item.SelfFlightList.length-1">{{$t('Airticket.Air_transit')}}</span>
</td>
<td>
<div>{{fItem.Flight_number}}</div>
<div style="margin-top:5px;">{{fItem.AlName}}</div>
</td>
<td>
<div>{{fItem.FlightDate.slice(0,10)}} {{fItem.Departure_time}}</div>
<div style="margin-top:5px;">
<span v-if="fItem.DIATA">({{fItem.DIATA}})</span>
{{fItem.dName}}
</div>
</td>
<td>
<div>{{fItem.FlightArrivalTime}} {{fItem.Arrival_time}}</div>
<div style="margin-top:5px;">
<span v-if="fItem.AIATA">({{fItem.AIATA}})</span>
{{fItem.aName}}
</div>
</td>
</tr>
</table>
<div class="FlightDiv-TCL" slot="reference">
<template>
<div v-for="subItem in item.SelfFlightList" slot="reference" :key="subItem.subCode"
class="TCL-flighInfoList">
<span class="travelnowrap">
<span class="TCL-FlightNumber">{{subItem.Flight_number}}</span>
<span><template v-if="subItem.DIATA">({{subItem.DIATA}})</template>
<template v-else>({{subItem.dName}})</template></span>
{{subItem.DepartureName}}
<template v-if="subItem.ArrivalCityName">
<span v-if="subItem.AIATA">
-({{subItem.AIATA}})
</span>
<span v-else>-</span>
{{subItem.ArrivalCityName}}
<template v-if="!subItem.DIATA">({{subItem.aName}})</template>
</template>
<span v-if="subItem.FlightState==1" class="TCL-greenType">【OK】</span>
<span v-else class="TCL-redType">【{{$t('visa.v_zanding')}}】</span>
</span>
<el-popover width="900" trigger="click" popper-class="TC_tripDetails">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr class="_color_666" style="text-align:center;">
<th width="60">{{$t('Airticket.Air_segment')}}</th>
<th width="80">{{$t('system.query_flightNum')}}</th>
<th width="150">{{$t('system.ph_flightTime')}}</th>
<th width="80">{{$t('system.query_arrivalTime')}}</th>
</tr>
<tr v-for="(fItem,fIndex) in item.SelfFlightList" :key="fIndex" style="text-align:center;">
<td class="_d_name _color_666">
<span v-if="fIndex==0">{{$t('Airticket.Air_go')}}</span>
<span v-else-if="fIndex==item.SelfFlightList.length-1">{{$t('Airticket.Air_returnTrip')}}</span>
<span
v-else-if="fIndex>0 && fIndex!=item.SelfFlightList.length-1">{{$t('Airticket.Air_transit')}}</span>
</td>
<td>
<div>{{fItem.Flight_number}}</div>
<div style="margin-top:5px;">{{fItem.AlName}}</div>
</td>
<td>
<div>{{fItem.FlightDate.slice(0,10)}} {{fItem.Departure_time}}</div>
<div style="margin-top:5px;">
<span v-if="fItem.DIATA">({{fItem.DIATA}})</span>
{{fItem.dName}}
</div>
</template>
<!-- <template v-else>
</td>
<td>
<div>{{fItem.FlightArrivalTime}} {{fItem.Arrival_time}}
<template v-if="fItem.aDay&&fItem.aDay!=''&&fItem.aDay!='0'">
(+{{fItem.aDay}})
</template>
</div>
<div style="margin-top:5px;">
<span v-if="fItem.AIATA">({{fItem.AIATA}})</span>
{{fItem.aName}}
</div>
</td>
</tr>
</table>
<div class="FlightDiv-TCL" slot="reference">
<template>
<div v-for="subItem in item.SelfFlightList" slot="reference" :key="subItem.subCode"
class="TCL-flighInfoList">
<span class="travelnowrap">
<span class="TCL-FlightNumber">{{subItem.Flight_number}}</span>
<span><template v-if="subItem.DIATA">({{subItem.DIATA}})</template>
<template v-else>({{subItem.dName}})</template></span>
{{subItem.DepartureName}}
<template v-if="subItem.ArrivalCityName">
<span v-if="subItem.AIATA">
-({{subItem.AIATA}})
</span>
<span v-else>-</span>
{{subItem.ArrivalCityName}}
<template v-if="!subItem.DIATA">({{subItem.aName}})</template>
</template>
</span>
</div>
</template>
<!-- <template v-else>
<div v-for="subItem in item.TravelTeamFlightList" slot="reference" :key="subItem.subCode"
class="TCL-flighInfoList">
<span class="travelnowrap">
......@@ -674,20 +687,23 @@
</span>
</div>
</template> -->
</div>
</el-popover>
</div>
</el-popover>
</div>
</div>
<div class="el-col w_10">
<div class="p20">
<div class="mb title"><i class="iconfont icon-jiage"></i><span>{{$t('visa.v_tuanweiinfo')}}</span></div>
<div class="mb bold"><span class="item-title">{{$t('visa.v_currentseat')}}：</span>{{item.SurplusSeat}}</div>
<div class="mb bold"><span class="item-title">{{$t('visa.v_currentseat')}}：</span>{{item.SurplusSeat}}
</div>
<div class="mb bold"><span class="item-title">{{$t('visa.v_yibaoru')}}：</span>{{item.JoinNum}}
<span class="TCL-redType"
v-if="item.OrderLeaderGuestNum>=1">+{{item.OrderLeaderGuestNum}}</span>{{$t('Operation.Op_people')}}
</div>
<div class="mb bold"><span class="item-title">{{$t('Operation.Op_takeSeat')}}：</span>{{item.Occupied}}</div>
<div class="mb bold"><span class="item-title">{{$t('visa.v_houbu')}}：</span> <span v-if="item.IsSubstitution==1"
<div class="mb bold"><span class="item-title">{{$t('Operation.Op_takeSeat')}}：</span>{{item.Occupied}}
</div>
<div class="mb bold"><span class="item-title">{{$t('visa.v_houbu')}}：</span> <span
v-if="item.IsSubstitution==1"
class="TCL-greenType">{{$t('visa.v_yxhoubu')}}（{{$t('visa.v_houbu')}}{{item.HBNum}}{{$t('Operation.Op_people')}}）</span>
<span v-else class="TCL-redType">{{$t('visa.v_byxhoubu')}}</span></div>
</div>
......@@ -700,109 +716,109 @@
<div class="mb"><span>婴儿: {{item.BabyPrice}}&nbsp; 婴儿附加费: {{item.BabyChargePrice}}</span></div>
<div class="mb"><span>老人附加费: {{item.OldManChargePrice}} &nbsp;签证: {{item.VisaPrice}}</span></div> -->
<div>
<p>
<i class="iconfont icon-jiage"></i>{{ $t("Operation.Op_PriceInfo") }}
</p>
<p style="
<div>
<p>
<i class="iconfont icon-jiage"></i>{{ $t("Operation.Op_PriceInfo") }}
</p>
<p style="
color: #47bf8c;
font-size: 16px;
font-weight: bold;
margin: 5px 0;
">
<span style="font-size: 14px;">{{ $t("objFill.v101.zhongxinjge") }}:</span>
<br />￥{{
<span style="font-size: 14px;">{{ $t("objFill.v101.zhongxinjge") }}:</span>
<br />￥{{
item.B2CMemberPrice
}}
</p>
<p style="color: #47BF8C;">
{{ $t("Operation.Op_tradePrice") }}：￥{{
</p>
<p style="color: #47BF8C;">
{{ $t("Operation.Op_tradePrice") }}：￥{{
item.B2BShowPrice | priceFormat(item.B2BShowPrice)
}}
</p>
<p style="color: #47BF8C;">
{{ $t("Operation.Op_directPrice") }}：￥{{
</p>
<p style="color: #47BF8C;">
{{ $t("Operation.Op_directPrice") }}：￥{{
item.B2CShowPrice | priceFormat(item.B2CShowPrice)
}}
</p>
<p>
<el-popover width="630" trigger="click">
<table class="PQ_detail">
<tr>
<td colspan="5" style="text-align: left; padding-left: 10px">
{{ $t("salesModule.BasePrice") }}
</td>
</tr>
<tr>
<th>{{ $t("advmanager.v_type") }}</th>
<th>{{ $t("salesModule.HYTHJ") }}</th>
<th>{{ $t("salesModule.PTTHJ") }}</th>
<th>{{ $t("salesModule.ZKHYJ") }}</th>
<th>{{ $t("salesModule.PTZKJ") }}</th>
</tr>
<tr>
<td>{{ $t("salesModule.Adult") }}</td>
<td>
{{
</p>
<p>
<el-popover width="630" trigger="click">
<table class="PQ_detail">
<tr>
<td colspan="5" style="text-align: left; padding-left: 10px">
{{ $t("salesModule.BasePrice") }}
</td>
</tr>
<tr>
<th>{{ $t("advmanager.v_type") }}</th>
<th>{{ $t("salesModule.HYTHJ") }}</th>
<th>{{ $t("salesModule.PTTHJ") }}</th>
<th>{{ $t("salesModule.ZKHYJ") }}</th>
<th>{{ $t("salesModule.PTZKJ") }}</th>
</tr>
<tr>
<td>{{ $t("salesModule.Adult") }}</td>
<td>
{{
item.B2BShowPrice
}}
</td>
<td>{{ item.B2BShowPrice }}</td>
<td>
{{
</td>
<td>{{ item.B2BShowPrice }}</td>
<td>
{{
item.B2CShowPrice
}}
</td>
<td>{{ item.B2CShowPrice }}</td>
</tr>
<tr>
<td>{{ $t("salesModule.ChildBed") }}</td>
<td>
{{
</td>
<td>{{ item.B2CShowPrice }}</td>
</tr>
<tr>
<td>{{ $t("salesModule.ChildBed") }}</td>
<td>
{{
(item.B2BShowPrice + item.ChildNeedPrice)
}}
</td>
<td>
{{
</td>
<td>
{{
(item.B2BShowPrice + item.ChildNeedPrice)
}}
</td>
<td>
{{
</td>
<td>
{{
(item.B2CShowPrice + item.ChildNeedPrice)
}}
</td>
<td>
{{
</td>
<td>
{{
(item.B2CShowPrice + item.ChildNeedPrice)
}}
</td>
</tr>
<tr>
<td>{{ $t("salesModule.ChildNoBed") }}</td>
<td>
{{
</td>
</tr>
<tr>
<td>{{ $t("salesModule.ChildNoBed") }}</td>
<td>
{{
(item.B2BShowPrice + item.ChildNoNeedPrice)
}}
</td>
<td>
{{
</td>
<td>
{{
(item.B2BShowPrice + item.ChildNoNeedPrice)
}}
</td>
<td>
{{
</td>
<td>
{{
(item.B2CShowPrice + item.ChildNoNeedPrice)
}}
</td>
<td>
{{
</td>
<td>
{{
(item.B2CShowPrice + item.ChildNoNeedPrice)
}}
</td>
</tr>
<!-- <tr>
</td>
</tr>
<!-- <tr>
<td>{{ $t("salesModule.SingleJ") }}</td>
<td colspan="4">
{{
......@@ -810,87 +826,88 @@
}}
</td>
</tr> -->
<tr>
<td>{{ $t("Operation.Op_baby") }}</td>
<td colspan="4">
{{ item.BabyPrice }}
</td>
</tr>
<tr>
<td colspan="5" style="text-align: left; padding-left: 10px">
{{ $t("salesModule.OtherPrice") }}
</td>
</tr>
<tr>
<th>{{ $t("Operation.Op_oldmanSurcharge") }}</th>
<th>{{ $t("Operation.Op_childSurcharge") }}</th>
<th>{{ $t("salesModule.VisaBack") }}</th>
<th>{{ $t("Operation.Op_singleRoomcha") }}</th>
<th>{{ $t("Operation.Op_zafei") }}</th>
</tr>
<tr>
<td>
{{
<tr>
<td>{{ $t("Operation.Op_baby") }}</td>
<td colspan="4">
{{ item.BabyPrice }}
</td>
</tr>
<tr>
<td colspan="5" style="text-align: left; padding-left: 10px">
{{ $t("salesModule.OtherPrice") }}
</td>
</tr>
<tr>
<th>{{ $t("Operation.Op_oldmanSurcharge") }}</th>
<th>{{ $t("Operation.Op_childSurcharge") }}</th>
<th>{{ $t("salesModule.VisaBack") }}</th>
<th>{{ $t("Operation.Op_singleRoomcha") }}</th>
<th>{{ $t("Operation.Op_zafei") }}</th>
</tr>
<tr>
<td>
{{
item.OldManChargePrice
}}
</td>
<td>
{{
</td>
<td>
{{
item.BabyChargePrice
}}
</td>
<td>
{{ item.VisaPrice }}（-{{
</td>
<td>
{{ item.VisaPrice }}（-{{
item.BackVisaPrice
}}）
</td>
<td>
{{
</td>
<td>
{{
item.SingleRoomPrice
}}
</td>
<td>
{{ item.OtherPrice }}
</td>
</tr>
</table>
<span slot="reference" class="price">{{
</td>
<td>
{{ item.OtherPrice }}
</td>
</tr>
</table>
<span slot="reference" class="price">{{
$t("Operation.Op_priceDetail")
}}</span>
</el-popover>
</p>
<p v-if="item.RakeBackRatio>0">{{$t('objFill.v102.dangqianfyje')}}：
</br>
<span style="color: red;">￥{{ item.RakeBackRatio }}</span>
</p>
<p>
<el-popover width="300" trigger="click">
<table class="PQ_detail">
<tr>
<td colspan="5" style="text-align: left; padding-left: 10px">
PAK{{ $t("hotel.hotel_commission") }}
</td>
</tr>
<tr>
<th>{{ $t('admin.admin_personNumber') }}</th>
<th>{{ $t('objFill.fanyongje') }}</th>
</tr>
<tr v-for="(item,index) in item.RakeBackList" :key="index">
<td>{{ item.MinGuest }}~{{ item.MaxGuest }}</td>
<td>￥{{ item.Ratio }}</td>
</tr>
</table>
<span slot="reference" class="price" style="color: red;">{{
</el-popover>
</p>
<p v-if="item.RakeBackRatio>0">{{$t('objFill.v102.dangqianfyje')}}：
</br>
<span style="color: red;">￥{{ item.RakeBackRatio }}</span>
</p>
<p>
<el-popover width="300" trigger="click">
<table class="PQ_detail">
<tr>
<td colspan="5" style="text-align: left; padding-left: 10px">
PAK{{ $t("hotel.hotel_commission") }}
</td>
</tr>
<tr>
<th>{{ $t('admin.admin_personNumber') }}</th>
<th>{{ $t('objFill.fanyongje') }}</th>
</tr>
<tr v-for="(item,index) in item.RakeBackList" :key="index">
<td>{{ item.MinGuest }}~{{ item.MaxGuest }}</td>
<td>￥{{ item.Ratio }}</td>
</tr>
</table>
<span slot="reference" class="price" style="color: red;">{{
$t("objFill.v102.chakpakfy")
}}</span>
</el-popover>
</p>
</div>
</el-popover>
</p>
</div>
</div>
</div>
<div class="el-col w_20">
<div class="p20">
<div class="mb title"><i class="iconfont icon-tuandui"></i><span>{{$t('objFill.v101.hezuohuoban')}}:</span></div>
<div class="mb title"><i
class="iconfont icon-tuandui"></i><span>{{$t('objFill.v101.hezuohuoban')}}:</span></div>
<template v-for="(subItem,subIndex) in item.TravelTeamPartnerList">
<el-tag :key="subIndex+1000" style="margin: 0 10px 10px 0;">{{subItem.CustomerName}}</el-tag>
</template>
......@@ -898,11 +915,16 @@
</div>
<div class="el-col w_10">
<div class="p20">
<div class="mb title"><i class="iconfont icon-yuangong"></i><span>{{$t('objFill.v101.faqixinxi')}}:</span></div>
<div class="mb bold"><span class="item-title">{{$t('objFill.v101.faqiren')}}:：</span>{{item.OPName}}</div>
<div class="mb bold"><span class="item-title">{{$t('Airticket.Air_EconomyClass')}}: </span><span>{{item.YSeat}}</span></div>
<div class="mb bold"><span class="item-title">{{$t('Airticket.Air_businessClass')}}: </span><span>{{item.CSeat}}</span></div>
<div class="mb bold"><span class="item-title">{{$t('Airticket.Air_firstClass')}}: </span><span>{{item.FSeat}}</span></div>
<div class="mb title"><i
class="iconfont icon-yuangong"></i><span>{{$t('objFill.v101.faqixinxi')}}:</span></div>
<div class="mb bold"><span class="item-title">{{$t('objFill.v101.faqiren')}}:：</span>{{item.OPName}}
</div>
<div class="mb bold"><span class="item-title">{{$t('Airticket.Air_EconomyClass')}}:
</span><span>{{item.YSeat}}</span></div>
<div class="mb bold"><span class="item-title">{{$t('Airticket.Air_businessClass')}}:
</span><span>{{item.CSeat}}</span></div>
<div class="mb bold"><span class="item-title">{{$t('Airticket.Air_firstClass')}}:
</span><span>{{item.FSeat}}</span></div>
<!-- <div class="mb bold"><span class="item-title">{{$t('Airticket.Air_EconomyClass')}}:</span><span>{{item.YSeat}} <span class="item-title ml">{{$t('hotel.hotel_remainList')}}:</span>{{item.SurplusYSeatNum}}</span></div>
<div class="mb bold"><span class="item-title">{{$t('Airticket.Air_businessClass')}}:</span><span> {{item.CSeat}} <span class="item-title ml">{{$t('hotel.hotel_remainList')}}:</span>{{item.SurplusCSeatNum}}</span></div>
<div class="mb bold"><span class="item-title">{{$t('Airticket.Air_firstClass')}}:</span><span> {{item.FSeat}} <span class="item-title ml">{{$t('hotel.hotel_remainList')}}:</span>{{item.SurplusFSeatNum}}</span></div> -->
......@@ -912,9 +934,10 @@
<div class="el-col w_10">
<div class="p20">
<div class="mb">
<el-button class="mb" @click.native='goBuy(item)' type="primary" size="mini"
style="background:#00C6FF; border-color:#00C6FF">{{$t('sm.xiadan')}}
</el-button></div>
<el-button class="mb" @click.native='goBuy(item)' type="primary" size="mini"
style="background:#00C6FF; border-color:#00C6FF">{{$t('sm.xiadan')}}
</el-button>
</div>
<el-dropdown trigger="click">
<span class="el-dropdown-link">{{$t('pub.more')}}
<i class="el-icon-arrow-down el-icon--right"></i>
......@@ -944,13 +967,8 @@
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
</el-pagination>
<div class="buy-box" v-show="isShowTeamOrder">
<orderForm @success="reSearchPage" @close="closeForm"
:PTCID="teamInfo.TCID"
:POrderId="0"
:PBranchId="0"
:PProductType="2"
:showCity="false"
:productObj="teamInfo">
<orderForm @success="reSearchPage" @close="closeForm" :PTCID="teamInfo.TCID" :POrderId="0" :PBranchId="0"
:PProductType="2" :showCity="false" :productObj="teamInfo">
</orderForm>
</div>
</div>
......
src/components/TravelManager/TravelTeam/travelTeamList.vue
View file @ 39e914b4
......@@ -224,7 +224,6 @@
<span><template v-if="subItem.DIATA">({{subItem.DIATA}})</template>
<template v-else>({{subItem.dName}})</template></span>
{{subItem.DepartureName}}
<template v-if="subItem.ArrivalCityName">
<span v-if="subItem.AIATA">
-({{subItem.AIATA}})
......@@ -233,8 +232,6 @@
{{subItem.ArrivalCityName}}
<template v-if="!subItem.DIATA">({{subItem.aName}})</template>
</template>
<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>
......
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