Skip to content

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

11

parent 0b74ef52
Show 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 @@ ...@@ -534,20 +534,25 @@
.p20 { .p20 {
padding: 20px; padding: 20px;
} }
.item-title {
.item-title {
font-size: 12px; font-size: 12px;
font-weight: normal; font-weight: normal;
color: #666; color: #666;
} }
.bold {
.bold {
font-weight: bold; font-weight: bold;
} }
.price {
.price {
cursor: pointer; cursor: pointer;
} }
.price:hover {
.price:hover {
color: red; color: red;
} }
</style> </style>
<template> <template>
...@@ -562,8 +567,8 @@ ...@@ -562,8 +567,8 @@
</li> </li>
<li> <li>
<span><em>{{ $t("hotel.hotel_StarDate") }}</em> <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" <el-date-picker v-model="msg.StartTime" @change="dataDui()" class="w135" value-format="yyyy-MM-dd"
type="date" :picker-options="pickerBeginDateStart"></el-date-picker> :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 <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> type="date" :picker-options="pickerBeginDateAfter"></el-date-picker>
...@@ -589,15 +594,20 @@ ...@@ -589,15 +594,20 @@
<div class="TC_remarkContent"> <div class="TC_remarkContent">
<div class="el-col w_20"> <div class="el-col w_20">
<div class="p20"> <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="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
<div class="bold"><span class="item-title">{{$t('visa.v_teaminfo')}}:：</span><span>{{item.TCNUM}}({{item.TCID}})</span></div> 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> </div>
<div class="el-col w_20"> <div class="el-col w_20">
<div class="p20"> <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 class="mb" v-for="(subItem,subIndex) in item.TravelTeamFlightList" :key="subIndex+1000">
<div> {{subItem.Flight_number}} <div> {{subItem.Flight_number}}
{{subItem.DepartureAirPortName}} {{subItem.Departure_time}} {{subItem.ArrivalAirPortName}} {{subItem.DepartureAirPortName}} {{subItem.Departure_time}} {{subItem.ArrivalAirPortName}}
...@@ -631,7 +641,11 @@ ...@@ -631,7 +641,11 @@
</div> </div>
</td> </td>
<td> <td>
<div>{{fItem.FlightArrivalTime}} {{fItem.Arrival_time}}</div> <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;"> <div style="margin-top:5px;">
<span v-if="fItem.AIATA">({{fItem.AIATA}})</span> <span v-if="fItem.AIATA">({{fItem.AIATA}})</span>
{{fItem.aName}} {{fItem.aName}}
...@@ -656,8 +670,7 @@ ...@@ -656,8 +670,7 @@
{{subItem.ArrivalCityName}} {{subItem.ArrivalCityName}}
<template v-if="!subItem.DIATA">({{subItem.aName}})</template> <template v-if="!subItem.DIATA">({{subItem.aName}})</template>
</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> </span>
</div> </div>
</template> </template>
...@@ -681,13 +694,16 @@ ...@@ -681,13 +694,16 @@
<div class="el-col w_10"> <div class="el-col w_10">
<div class="p20"> <div class="p20">
<div class="mb title"><i class="iconfont icon-jiage"></i><span>{{$t('visa.v_tuanweiinfo')}}</span></div> <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}} <div class="mb bold"><span class="item-title">{{$t('visa.v_yibaoru')}}：</span>{{item.JoinNum}}
<span class="TCL-redType" <span class="TCL-redType"
v-if="item.OrderLeaderGuestNum>=1">+{{item.OrderLeaderGuestNum}}</span>{{$t('Operation.Op_people')}} v-if="item.OrderLeaderGuestNum>=1">+{{item.OrderLeaderGuestNum}}</span>{{$t('Operation.Op_people')}}
</div> </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('Operation.Op_takeSeat')}}：</span>{{item.Occupied}}
<div class="mb bold"><span class="item-title">{{$t('visa.v_houbu')}}：</span> <span v-if="item.IsSubstitution==1" </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> 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> <span v-else class="TCL-redType">{{$t('visa.v_byxhoubu')}}</span></div>
</div> </div>
...@@ -890,7 +906,8 @@ ...@@ -890,7 +906,8 @@
</div> </div>
<div class="el-col w_20"> <div class="el-col w_20">
<div class="p20"> <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"> <template v-for="(subItem,subIndex) in item.TravelTeamPartnerList">
<el-tag :key="subIndex+1000" style="margin: 0 10px 10px 0;">{{subItem.CustomerName}}</el-tag> <el-tag :key="subIndex+1000" style="margin: 0 10px 10px 0;">{{subItem.CustomerName}}</el-tag>
</template> </template>
...@@ -898,11 +915,16 @@ ...@@ -898,11 +915,16 @@
</div> </div>
<div class="el-col w_10"> <div class="el-col w_10">
<div class="p20"> <div class="p20">
<div class="mb title"><i class="iconfont icon-yuangong"></i><span>{{$t('objFill.v101.faqixinxi')}}:</span></div> <div class="mb title"><i
<div class="mb bold"><span class="item-title">{{$t('objFill.v101.faqiren')}}:：</span>{{item.OPName}}</div> class="iconfont icon-yuangong"></i><span>{{$t('objFill.v101.faqixinxi')}}:</span></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('objFill.v101.faqiren')}}:：</span>{{item.OPName}}
<div class="mb bold"><span class="item-title">{{$t('Airticket.Air_businessClass')}}: </span><span>{{item.CSeat}}</span></div> </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></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_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_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> --> <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> -->
...@@ -914,7 +936,8 @@ ...@@ -914,7 +936,8 @@
<div class="mb"> <div class="mb">
<el-button class="mb" @click.native='goBuy(item)' type="primary" size="mini" <el-button class="mb" @click.native='goBuy(item)' type="primary" size="mini"
style="background:#00C6FF; border-color:#00C6FF">{{$t('sm.xiadan')}} style="background:#00C6FF; border-color:#00C6FF">{{$t('sm.xiadan')}}
</el-button></div> </el-button>
</div>
<el-dropdown trigger="click"> <el-dropdown trigger="click">
<span class="el-dropdown-link">{{$t('pub.more')}} <span class="el-dropdown-link">{{$t('pub.more')}}
<i class="el-icon-arrow-down el-icon--right"></i> <i class="el-icon-arrow-down el-icon--right"></i>
...@@ -944,13 +967,8 @@ ...@@ -944,13 +967,8 @@
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"> layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
</el-pagination> </el-pagination>
<div class="buy-box" v-show="isShowTeamOrder"> <div class="buy-box" v-show="isShowTeamOrder">
<orderForm @success="reSearchPage" @close="closeForm" <orderForm @success="reSearchPage" @close="closeForm" :PTCID="teamInfo.TCID" :POrderId="0" :PBranchId="0"
:PTCID="teamInfo.TCID" :PProductType="2" :showCity="false" :productObj="teamInfo">
:POrderId="0"
:PBranchId="0"
:PProductType="2"
:showCity="false"
:productObj="teamInfo">
</orderForm> </orderForm>
</div> </div>
</div> </div>
......
src/components/TravelManager/TravelTeam/travelTeamList.vue
View file @ 39e914b4
...@@ -224,7 +224,6 @@ ...@@ -224,7 +224,6 @@
<span><template v-if="subItem.DIATA">({{subItem.DIATA}})</template> <span><template v-if="subItem.DIATA">({{subItem.DIATA}})</template>
<template v-else>({{subItem.dName}})</template></span> <template v-else>({{subItem.dName}})</template></span>
{{subItem.DepartureName}} {{subItem.DepartureName}}
<template v-if="subItem.ArrivalCityName"> <template v-if="subItem.ArrivalCityName">
<span v-if="subItem.AIATA"> <span v-if="subItem.AIATA">
-({{subItem.AIATA}}) -({{subItem.AIATA}})
...@@ -233,8 +232,6 @@ ...@@ -233,8 +232,6 @@
{{subItem.ArrivalCityName}} {{subItem.ArrivalCityName}}
<template v-if="!subItem.DIATA">({{subItem.aName}})</template> <template v-if="!subItem.DIATA">({{subItem.aName}})</template>
</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> </span>
</div> </div>
</template> </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