Skip to content

S
SuperMan
Commit 6170caf8 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent c94114e3
Show whitespace changes
Inline Side-by-side
Showing with 476 additions and 313 deletions
src/assets/common/lang/en.js
View file @ 6170caf8
......@@ -128,6 +128,7 @@ export const system = {
query_stopAir: 'stopover airport',
query_arrivalCity: 'Reach the city',
query_arrivalAir: 'Arriving at the airport',
query_arrivalAirThreeCode:'Three codes to the airport upon arrival',
query_arrivalTime: 'Arrival time',
quety_area: 'area',
query_workType: 'work type',
......@@ -1773,6 +1774,7 @@ export const visaT = {
sqneirong: 'Application type',
crjtime: 'entry-exit time',
cfAirport: 'Departure Airport',
cfAirportTreeCode:'Departure airport three codes',
chujingtime: 'exit time',
rujingtime: 'time of entry',
Portofentry: 'port ofentry',
......
src/assets/common/lang/jp.js
View file @ 6170caf8
......@@ -91,6 +91,7 @@ export const system = {
query_stopAir:'経由空港',
query_arrivalCity:'到着都市',
query_arrivalAir:'到着空港',
query_arrivalAirThreeCode:'空港到着3ヤード',
query_arrivalTime:'到着時間',
quety_area:'エリア',
query_workType:'仕事',
......@@ -1719,6 +1720,7 @@ export const visaT = {
sqneirong:'申請タイプ',
crjtime:'出入国時間',
cfAirport:'出発空港',
cfAirportTreeCode:'出発空港3ヤード',
chujingtime:'出国時間',
rujingtime:'入国時間',
Portofentry:'入国口岸',
......
src/assets/common/lang/zh-tw.js
View file @ 6170caf8
......@@ -126,6 +126,7 @@ export const system = {
query_stopAir:'經停機場',
query_arrivalCity:'到達城市',
query_arrivalAir:'到達機場',
query_arrivalAirThreeCode:'到達機場三碼',
query_arrivalTime:'到達時間',
quety_area:'區域',
query_workType:'工作類型',
......@@ -1759,6 +1760,7 @@ export const visaT = {
sqneirong:'申請類型',
crjtime:'出入境時間',
cfAirport:'出發機場',
cfAirportTreeCode:'出發機場三碼',
chujingtime:'出境時間',
rujingtime:'入境時間',
Portofentry:'入境口岸',
......
src/assets/common/lang/zh.js
View file @ 6170caf8
......@@ -127,6 +127,7 @@ export const system = {
query_stopAir:'经停机场',
query_arrivalCity:'到达城市',
query_arrivalAir:'到达机场',
query_arrivalAirThreeCode:'到达机场三码',
query_arrivalTime:'到达时间',
quety_area:'区域',
query_workType:'工作类型',
......@@ -1776,6 +1777,7 @@ export const visaT = {
sqneirong:'申请类型',
crjtime:'出入境时间',
cfAirport:'出发机场',
cfAirportTreeCode:'出发机场三码',
chujingtime:'出境时间',
rujingtime:'入境时间',
Portofentry:'入境口岸',
......
src/components/TravelManager/TravelTeam/editTeamInfo.vue
View file @ 6170caf8
<style scoped>
.ImpressionTicketing-msgbox{
.ImpressionTicketing-msgbox {
display: flex;
flex-direction: row;
justify-content: space-between;
margin-bottom: 20px;
}
.ImpressionTicketing-msgbox.bottom0{
.ImpressionTicketing-msgbox.bottom0 {
margin-bottom: 0;
}
.ImpressionTicketing-msgbox div{
.ImpressionTicketing-msgbox div {
flex: 1;
}
.ImpressionTicketing-msgbox div.ImpressionTicketing-msg-but{
.ImpressionTicketing-msgbox div.ImpressionTicketing-msg-but {
flex: 0 0 80px;
}
.itc-delete{
.itc-delete {
color: #E95252;
font-size: 16px;
cursor: pointer;
display: inline-block;
padding: 10px;
}
.itc-outline{
.itc-outline {
color: #409EFF;
font-size: 16px;
cursor: pointer;
display: inline-block;
padding: 10px;
}
.travelTeamInfo {
width: 100%;
background: #fff;
......@@ -221,6 +227,20 @@
white-space: nowrap;
}
.travelTeamInfo .tFlightTab {
border-collapse: collapse;
}
.travelTeamInfo .tFlightTab tr td {
line-height: 25px;
height: 25px;
}
.travelTeamInfo .el-input-number--mini {
height: 25px;
line-height: 25px;
}
</style>
<template>
<div class="travelTeamInfo">
......@@ -240,7 +260,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-row style="display:none;">
<el-col :span="24">
<el-form-item :label="$t('salesModule.FlighInfo')">
<el-radio v-model="isVirtuallyFlight" :label="0">{{$t('objFill.v101.xunihanban')}}</el-radio>
......@@ -249,7 +269,7 @@
</el-col>
</el-row>
<!--虚拟航班-->
<el-row v-if="isVirtuallyFlight==0">
<el-row v-if="isVirtuallyFlight==0" style="display:none;">
<el-col :span="12">
<!--添加修改航班-->
<ul class="_add_hangban clearfix">
......@@ -263,7 +283,8 @@
<span>{{ item.Flight_number }} {{item.Departure_time }}~{{item.Arrival_time}}</span>
<span class="iconfont icon-xingzhuang" @click="deletFlightInfo(item.ID, index)"></span>
</p>
<p class="_add_info">{{$t('op.IsTransit')}}：{{ item.IsTransfer === 1 ? $t('fnc.yes') : $t('fnc.fou') }}</p>
<p class="_add_info">
{{$t('op.IsTransit')}}：{{ item.IsTransfer === 1 ? $t('fnc.yes') : $t('fnc.fou') }}</p>
<el-tooltip class="item" effect="dark" :content="item.DepartureAirPortName" placement="top-start"
popper-class="max-w250">
<p class="_add_info">
......@@ -335,7 +356,8 @@
<span>{{ item.Flight_number }} {{item.Departure_time }}~{{item.Arrival_time}}</span>
<span class="iconfont icon-xingzhuang" @click="deletFlightInfo(item.ID, index)"></span>
</p>
<p class="_add_info">{{$t('op.IsTransit')}}：{{ item.IsTransfer === 1 ? $t('fnc.yes') : $t('fnc.fou') }}</p>
<p class="_add_info">
{{$t('op.IsTransit')}}：{{ item.IsTransfer === 1 ? $t('fnc.yes') : $t('fnc.fou') }}</p>
<el-tooltip class="item" effect="dark" :content="item.DepartureAirPortName" placement="top-start"
popper-class="max-w250">
<p class="_add_info">
......@@ -394,7 +416,7 @@
</el-col>
</el-row>
<!--真实采购机票-->
<el-row v-if="isVirtuallyFlight==1">
<el-row v-if="isVirtuallyFlight==1" style="display:none;">
<el-col :span="24">
<el-form-item :label="$t('sm.jipiaobangding')" style="padding-top:10px;">
<el-input :placeholder="$t('objFill.v101.bandinjipxx')" v-model="TicketMsg" disabled>
......@@ -457,6 +479,89 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item :label="$t('salesModule.FlighInfo')">
<span @click="addSelfFlight()" class="el-icon-circle-plus-outline itc-outline"></span>
</el-form-item>
</el-col>
</el-row>
<div v-for="(fItem,fIndex) in editForm.SelfFlightList" :key="'f_'+fIndex"
style="border:1px solid #C0C4CC;margin-bottom:2px;border-radius:5px;">
<table class="tFlightTab">
<tr>
<td>
<el-form-item :label="$t('system.query_airCompanyName')">
<el-input v-model="fItem.AlName" style="width:120px;"></el-input>
</el-form-item>
</td>
<td>
<el-form-item :label="$t('system.query_flightNum')">
<el-input v-model="fItem.Flight_number" style="width:85px;"></el-input>
</el-form-item>
</td>
<td>
<el-form-item :label="$t('hotel.hotel_StarDate')">
<el-date-picker value-format="yyyy-MM-dd" v-model="fItem.FlightDate" type="date" size="mini"
:placeholder="$t('admin.admin_choDate')" style="width:130px;">
</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>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item :label="$t('system.table_goCity')">
<el-input v-model="fItem.DepartureName" style="width:120px;"></el-input>
</el-form-item>
</td>
<td>
<el-form-item :label="$t('visaT.cfAirportTreeCode')">
<el-input v-model="fItem.DIATA" style="width:85px;"></el-input>
</el-form-item>
</td>
<td>
<el-form-item :label="$t('visaT.cfAirport')">
<el-input v-model="fItem.dName" style="width:130px;"></el-input>
</el-form-item>
</td>
<td>
<el-form-item :label="$t('Airticket.Air_StartTime')">
<el-input v-model="fItem.Departure_time" style="width:175px;"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item :label="$t('system.query_arrivalCity')">
<el-input v-model="fItem.ArrivalCityName" style="width:120px;"></el-input>
</el-form-item>
</td>
<td>
<el-form-item :label="$t('system.query_arrivalAirThreeCode')">
<el-input v-model="fItem.AIATA" style="width:85px;"></el-input>
</el-form-item>
</td>
<td>
<el-form-item :label="$t('system.query_arrivalAir')">
<el-input v-model="fItem.aName" style="width:130px;"></el-input>
</el-form-item>
</td>
<td>
<el-form-item :label="$t('system.query_arrivalTime')">
<el-input v-model="fItem.Arrival_time" style="width:80px;"></el-input>
<el-input-number size="mini" v-model="fItem.aDay" style="width:90px;">
</el-input-number>
</el-form-item>
</td>
</tr>
</table>
</div>
<el-row>
<el-col :span="24">
<span class="subTitle">{{$t('pub.date')}}&{{$t('Airticket.Air_reservation')}}</span>
......@@ -497,6 +602,16 @@
<el-input v-model="editForm.MiddlePrice"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('Operation.Op_tradePrice')" prop="B2BPrice">
<el-input v-model="editForm.B2BShowPrice"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('Operation.Op_directPrice')" prop="B2CPrice">
<el-input v-model="editForm.B2CShowPrice"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('salesModule.ChildBed')" prop="ChildNeedPrice">
<el-input v-model="editForm.ChildNeedPrice"></el-input>
......@@ -563,14 +678,11 @@
<span @click="addRule()" class="el-icon-circle-plus-outline itc-outline"></span>
</div>
<div class="ImpressionTicketing-msgbox"
v-for="(item,index) in editForm.RakeBackList" :key="index">
<div class="ImpressionTicketing-msgbox" v-for="(item,index) in editForm.RakeBackList" :key="index">
<div>
<el-form-item
:label="editForm.RakeBackList.length>0?`${$t('objFill.v102.zuixiaors')} ${index+1} `:` ` "
:prop="`RakeBackList.${index}.MinGuest`"
:rules="rules.MinGuest"
label-width="100px"
:prop="`RakeBackList.${index}.MinGuest`" :rules="rules.MinGuest" label-width="100px"
label-position="left">
<el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999"
v-model="item.MinGuest" clearable></el-input>
......@@ -579,23 +691,18 @@
<div>
<el-form-item
:label="editForm.RakeBackList.length>0?`${$t('objFill.v101.zuidarenshu')} ${index+1} `:` ` "
:prop="`RakeBackList.${index}.MaxGuest`"
:rules="rules.MaxGuest"
label-width="100px"
:prop="`RakeBackList.${index}.MaxGuest`" :rules="rules.MaxGuest" label-width="100px"
label-position="left">
<el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999"
v-model="item.MaxGuest" clearable :controls="false"></el-input>
</el-form-item>
</div>
<div>
<el-form-item
:label="editForm.RakeBackList.length>0?`${$t('objFill.fanyongje')} ${index+1} `:` ` "
:prop="`RakeBackList.${index}.Ratio`"
:rules="rules.Ratio"
label-width="100px"
<el-form-item :label="editForm.RakeBackList.length>0?`${$t('objFill.fanyongje')} ${index+1} `:` ` "
:prop="`RakeBackList.${index}.Ratio`" :rules="rules.Ratio" label-width="100px"
label-position="left">
<el-input type="number" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999"
v-model="item.Ratio" >
<el-input type="number" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0"
:max="99999999" v-model="item.Ratio">
<template #append>￥</template>
</el-input>
</el-form-item>
......@@ -608,7 +715,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-row style="display:none;">
<el-col :span="24">
<el-form-item :label="$t('objFill.v101.hezuohuoban')">
<template v-for="(subItem,subIndex) in friendList">
......@@ -638,7 +745,8 @@
<template v-if="editForm.WordUrl && editForm.WordUrl!='' ">
<a style="margin-left: 20px; color: blue; cursor: pointer" target="_blank"
@click="downloadFile(editForm.WordUrl)">{{$t('Operation.Op_downLoadword')}}</a>
<a style="margin-left: 20px; color: blue; cursor: pointer" @click="DeleteFile()">{{$t('system.table_delete')}}</a>
<a style="margin-left: 20px; color: blue; cursor: pointer"
@click="DeleteFile()">{{$t('system.table_delete')}}</a>
</template>
</el-form-item>
</el-col>
......@@ -651,8 +759,8 @@
</el-row>
</div>
</el-form>
<el-dialog class="app-attachment-dialog" width="400" :title="$t('objFill.qingxzkehu')" :visible.sync="isShowCustomerDialog"
:close-on-click-modal="false" append-to-body>
<el-dialog class="app-attachment-dialog" width="400" :title="$t('objFill.qingxzkehu')"
:visible.sync="isShowCustomerDialog" :close-on-click-modal="false" append-to-body>
<chooseCustomer v-if="isShowCustomerDialog" @success="refreshPage"></chooseCustomer>
</el-dialog>
</div>
......@@ -715,7 +823,8 @@
trigger: "blur"
}],
Ratio: [{
required: true, message: this.$t('objFill.qinshurfyje'),
required: true,
message: this.$t('objFill.qinshurfyje'),
trigger: "blur"
}],
},
......@@ -756,8 +865,11 @@
BackVisaPrice: 0, //退签证费
StartAddress: '',
RakeBackList: [],
B2CShowPrice: 0, //直客价
B2BShowPrice: 0, //同业价
SelfFlightList: [], //自定义录入航班
},
RakeBackObj:{
RakeBackObj: {
MinGuest: null,
MaxGuest: null,
Ratio: null,
......@@ -818,11 +930,11 @@
},
methods: {
// 添加规则
addRule(){
addRule() {
this.editForm.RakeBackList.push(JSON.parse(JSON.stringify(this.RakeBackObj)))
},
deleteRule(row,index){
this.editForm.RakeBackList.splice(index,1)
deleteRule(row, index) {
this.editForm.RakeBackList.splice(index, 1)
},
//查询航班列表
getSelectFilght() {
......@@ -884,6 +996,28 @@
}
});
},
//添加自定义航班
addSelfFlight() {
var seleFObj = {
AlName: "", //航空公司名称
AIATA: "", //到达机场三码
ArrivalCityName: "", //到达城市名称
aName: "", //到达机场
Arrival_time: "", //达到时间
aDay: "", //到达天数(+1)
DIATA: "", //出发机场三码
DepartureName: "", //出发城市名称
Departure_time: "", //出发时间
dName: "", //到达机场名称
FlightDate: "", //出发日期
Flight_number: "", //航班号
};
this.editForm.SelfFlightList.push(seleFObj);
},
//删除自定义航班
deleteSelfFlight(index) {
this.editForm.SelfFlightList.splice(index, 1);
},
closeForm() {
//关闭弹窗并刷新页面
this.$emit("success");
......@@ -942,7 +1076,6 @@
if (res.data.resultCode == 1) {
var tempObj = res.data.data;
this.editForm = tempObj;
console.log(tempObj,'--------');
//判断是否是虚拟航班
if (tempObj.TicketId > 0) {
this.isVirtuallyFlight = 1;
......@@ -1059,10 +1192,10 @@
addAward() {
this.editForm.TravelTeamFlightList = this.addMsg.flightList;
this.editForm.TravelTeamPartnerList = this.friendList;
if (!this.editForm.TravelTeamPartnerList.length) {
this.Warning(this.$t('objFill.v101.qingxzhezhb'));
return;
}
// if (!this.editForm.TravelTeamPartnerList.length) {
// this.Warning(this.$t('objFill.v101.qingxzhezhb'));
// return;
// }
this.saveLoading = true;
this.apipost(
"post_SetTeavelTeam",
......
src/components/TravelManager/TravelTeam/priceGroup.vue
View file @ 6170caf8
......@@ -611,14 +611,13 @@
<th width="80">{{$t('system.query_flightNum')}}</th>
<th width="150">{{$t('system.ph_flightTime')}}</th>
<th width="80">{{$t('system.query_arrivalTime')}}</th>
<th width="100">{{$t('system.query_stopCity')}}</th>
</tr>
<tr v-for="(fItem,fIndex) in item.TravelTeamFlightList" :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">
<span v-if="fIndex==0">{{$t('Airticket.Air_go')}}</span>
<span v-else-if="fIndex==item.TravelTeamFlightList.length-1">{{$t('Airticket.Air_returnTrip')}}</span>
<span v-else-if="fIndex==item.SelfFlightList.length-1">{{$t('Airticket.Air_returnTrip')}}</span>
<span
v-else-if="fIndex>0 && fIndex!=item.TravelTeamFlightList.length-1">{{$t('Airticket.Air_transit')}}</span>
v-else-if="fIndex>0 && fIndex!=item.SelfFlightList.length-1">{{$t('Airticket.Air_transit')}}</span>
</td>
<td>
<div>{{fItem.Flight_number}}</div>
......@@ -638,21 +637,17 @@
{{fItem.aName}}
</div>
</td>
<td>
<template v-if="fItem.StopoverIATA">({{fItem.StopoverIATA}})</template>{{fItem.StopoverName}}
</td>
</tr>
</table>
<div class="FlightDiv-TCL" slot="reference">
<template>
<div v-for="subItem in item.TravelTeamFlightList" slot="reference" :key="subItem.subCode"
<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}}
{{subItem.StopoverName==''?'':'-('+subItem.StopoverIATA+')'+subItem.StopoverName}}
<template v-if="subItem.ArrivalCityName">
<span v-if="subItem.AIATA">
-({{subItem.AIATA}})
......@@ -716,10 +711,20 @@
margin: 5px 0;
">
<span style="font-size: 14px;">{{ $t("objFill.v101.zhongxinjge") }}:</span>
</br>￥{{
<br />￥{{
item.B2CMemberPrice
}}
</p>
<p style="color: #47BF8C;">
{{ $t("Operation.Op_tradePrice") }}：￥{{
item.B2BShowPrice | priceFormat(item.B2BShowPrice)
}}
</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">
......@@ -739,41 +744,38 @@
<td>{{ $t("salesModule.Adult") }}</td>
<td>
{{
item.B2BMemberPrice
item.B2BShowPrice
}}
</td>
<td>{{ item.B2BPrice }}</td>
<td>{{ item.B2BShowPrice }}</td>
<td>
{{
item.B2CMemberPrice
item.B2CShowPrice
}}
</td>
<td>{{ item.B2CPrice }}</td>
<td>{{ item.B2CShowPrice }}</td>
</tr>
<tr>
<td>{{ $t("salesModule.ChildBed") }}</td>
<td>
{{
(item.B2BMemberPrice + item.ChildNeedPrice)
(item.B2BShowPrice + item.ChildNeedPrice)
}}
</td>
<td>
{{
(item.B2BPrice + item.ChildNeedPrice)
(item.B2BShowPrice + item.ChildNeedPrice)
}}
</td>
<td>
{{
(item.B2CMemberPrice + item.ChildNeedPrice)
(item.B2CShowPrice + item.ChildNeedPrice)
}}
</td>
<td>
{{
(item.B2CPrice + item.ChildNeedPrice)
(item.B2CShowPrice + item.ChildNeedPrice)
}}
</td>
</tr>
......@@ -781,24 +783,22 @@
<td>{{ $t("salesModule.ChildNoBed") }}</td>
<td>
{{
(item.B2BMemberPrice - item.ChildNoNeedPrice)
(item.B2BShowPrice - item.ChildNoNeedPrice)
}}
</td>
<td>
{{
(item.B2BPrice - item.ChildNoNeedPrice)
(item.B2BShowPrice - item.ChildNoNeedPrice)
}}
</td>
<td>
{{
(item.B2CMemberPrice - item.ChildNoNeedPrice)
(item.B2CShowPrice - item.ChildNoNeedPrice)
}}
</td>
<td>
{{
(item.B2CPrice - item.ChildNoNeedPrice)
(item.B2CShowPrice - item.ChildNoNeedPrice)
}}
</td>
</tr>
......@@ -916,7 +916,7 @@
style="background:#00C6FF; border-color:#00C6FF">{{$t('sm.xiadan')}}
</el-button></div>
<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>
</span>
<el-dropdown-menu slot="dropdown" class="travelControlDropDown">
......
src/components/TravelManager/TravelTeam/travelTeamList.vue
View file @ 6170caf8
......@@ -24,23 +24,29 @@
.p20 {
padding: 20px;
}
.pl {
padding-left: 20px;
}
.item-title {
.item-title {
font-size: 12px;
font-weight: normal;
color: #666;
}
.bold {
}
.bold {
font-weight: bold;
}
.price {
}
.price {
cursor: pointer;
}
.price:hover {
}
.price:hover {
color: red;
}
}
.PQ_detail {
width: 100%;
border-collapse: collapse;
......@@ -65,9 +71,11 @@
font-size: 12px;
border: 1px solid #e5e5e5;
}
.ml {
margin-left: 10px;
}
</style>
<template>
<div class="TC_Content">
......@@ -101,7 +109,7 @@
:picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder clearable></el-date-picker>
</span>
</li>
<li>
<!-- <li>
<span>
<em>{{$t('system.query_airCompanyName')}}</em>
<el-input maxlength="50" v-model="queryMsg.QAirlineCompany" class="permiss-input w150" clearable
......@@ -114,7 +122,7 @@
<el-input maxlength="50" v-model="queryMsg.QFlightNum" class="permiss-input w150" clearable
@keyup.native.enter="resetQuery" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
</li> -->
<li>
<span>
<em>{{$t('objFill.v101.hezuohuoban')}}:</em>
......@@ -145,16 +153,22 @@
<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.GTeamName}}</span></div>
<div class="mb"><span class="item-title">{{$t('hotel.hotel_StarDate')}}：</span><span>{{item.StartDate}}</span></div>
<div class="mb"><span class="item-title">{{$t('visa.v_teaminfo')}}:：</span><span>{{item.TCNUM}}({{item.TCID}})</span></div>
<el-button size="mini" v-if="item.WordUrl"><a :href="item.WordUrl" type="download" download="">{{$t('Operation.Op_downLoadword')}}</a></el-button>
<div class="mb"><span
class="item-title">{{$t('hotel.hotel_StarDate')}}：</span><span>{{item.StartDate}}</span></div>
<div class="mb"><span
class="item-title">{{$t('visa.v_teaminfo')}}:：</span><span>{{item.TCNUM}}({{item.TCID}})</span>
</div>
<el-button size="mini" v-if="item.WordUrl"><a :href="item.WordUrl" type="download"
download="">{{$t('Operation.Op_downLoadword')}}</a></el-button>
</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}}
......@@ -168,14 +182,14 @@
<th width="80">{{$t('system.query_flightNum')}}</th>
<th width="150">{{$t('system.ph_flightTime')}}</th>
<th width="80">{{$t('system.query_arrivalTime')}}</th>
<th width="100">{{$t('system.query_stopCity')}}</th>
</tr>
<tr v-for="(fItem,fIndex) in item.TravelTeamFlightList" :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">
<span v-if="fIndex==0">{{$t('Airticket.Air_go')}}</span>
<span v-else-if="fIndex==item.TravelTeamFlightList.length-1">{{$t('Airticket.Air_returnTrip')}}</span>
<span
v-else-if="fIndex>0 && fIndex!=item.TravelTeamFlightList.length-1">{{$t('Airticket.Air_transit')}}</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>
......@@ -189,27 +203,28 @@
</div>
</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;">
<span v-if="fItem.AIATA">({{fItem.AIATA}})</span>
{{fItem.aName}}
</div>
</td>
<td>
<template v-if="fItem.StopoverIATA">({{fItem.StopoverIATA}})</template>{{fItem.StopoverName}}
</td>
</tr>
</table>
<div class="FlightDiv-TCL" slot="reference">
<template>
<div v-for="subItem in item.TravelTeamFlightList" slot="reference" :key="subItem.subCode"
<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}}
{{subItem.StopoverName==''?'':'-('+subItem.StopoverIATA+')'+subItem.StopoverName}}
<template v-if="subItem.ArrivalCityName">
<span v-if="subItem.AIATA">
-({{subItem.AIATA}})
......@@ -223,31 +238,30 @@
</span>
</div>
</template>
<!-- <template v-else>
<div v-for="subItem in item.TravelTeamFlightList" 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 v-if="subItem.FlightState==1" class="TCL-greenType">【OK】</span>
<span v-else class="TCL-redType">【{{$t('visa.v_zanding')}}】</span>
</span>
</div>
</template> -->
</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('objFill.v101.dmc.jiweixx')}}</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>
<div class="mb bold"><span class="item-title">{{$t('leader.leader_registraNum')}}:</span><span> {{item.OrderGuestNum}} </span></div>
<div class="mb bold"><span class="item-title">{{$t('ground.lddaoyou')}}:</span><span> {{item.LeaderNum}} </span></div>
<div class="mb title"><i
class="iconfont icon-jiage"></i><span>{{$t('objFill.v101.dmc.jiweixx')}}</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>
<div class="mb bold"><span class="item-title">{{$t('leader.leader_registraNum')}}:</span><span>
{{item.OrderGuestNum}} </span></div>
<div class="mb bold"><span class="item-title">{{$t('ground.lddaoyou')}}:</span><span>
{{item.LeaderNum}} </span></div>
</div>
</div>
<div class="el-col w_10">
......@@ -269,9 +283,19 @@
margin: 5px 0;
">
<span style="font-size: 14px;">{{ $t("objFill.v101.zhongxinjge") }}:</span>
</br>
<br />
￥{{
item.B2BMemberPrice | priceFormat(item.B2BMemberPrice)
}}
</p>
<p style="color: #47BF8C;">
{{ $t("Operation.Op_tradePrice") }}：￥{{
item.B2BShowPrice | priceFormat(item.B2BShowPrice)
}}
</p>
<p style="color: #47BF8C;">
{{ $t("Operation.Op_directPrice") }}：￥{{
item.B2CShowPrice | priceFormat(item.B2CShowPrice)
}}
</p>
<p>
......@@ -293,45 +317,45 @@
<td>{{ $t("salesModule.Adult") }}</td>
<td>
{{
item.B2BMemberPrice | priceFormat(item.B2BMemberPrice)
item.B2BShowPrice | priceFormat(item.B2BShowPrice)
}}
</td>
<td>{{ item.B2BPrice | priceFormat(item.B2BPrice) }}</td>
<td>{{ item.B2BShowPrice | priceFormat(item.B2BShowPrice) }}</td>
<td>
{{
item.B2CMemberPrice | priceFormat(item.B2CMemberPrice)
item.B2CShowPrice | priceFormat(item.B2CShowPrice)
}}
</td>
<td>{{ item.B2CPrice | priceFormat(item.B2CPrice) }}</td>
<td>{{ item.B2CShowPrice | priceFormat(item.B2CShowPrice) }}</td>
</tr>
<tr>
<td>{{ $t("salesModule.ChildBed") }}</td>
<td>
{{
(item.B2BMemberPrice + item.ChildNeedPrice)
(item.B2BShowPrice + item.ChildNeedPrice)
| priceFormat(
item.B2BMemberPrice + item.ChildNeedPrice
item.B2BShowPrice + item.ChildNeedPrice
)
}}
</td>
<td>
{{
(item.B2BPrice + item.ChildNeedPrice)
| priceFormat(item.B2BPrice + item.ChildNeedPrice)
(item.B2BShowPrice + item.ChildNeedPrice)
| priceFormat(item.B2BShowPrice + item.ChildNeedPrice)
}}
</td>
<td>
{{
(item.B2CMemberPrice + item.ChildNeedPrice)
(item.B2BShowPrice + item.ChildNeedPrice)
| priceFormat(
item.B2CMemberPrice + item.ChildNeedPrice
item.B2BShowPrice + item.ChildNeedPrice
)
}}
</td>
<td>
{{
(item.B2CPrice + item.ChildNeedPrice)
| priceFormat(item.B2CPrice + item.ChildNeedPrice)
(item.B2CShowPrice + item.ChildNeedPrice)
| priceFormat(item.B2CShowPrice + item.ChildNeedPrice)
}}
</td>
</tr>
......@@ -339,41 +363,33 @@
<td>{{ $t("salesModule.ChildNoBed") }}</td>
<td>
{{
(item.B2BMemberPrice - item.ChildNoNeedPrice)
(item.B2BShowPrice - item.ChildNoNeedPrice)
| priceFormat(
item.B2BMemberPrice - item.ChildNoNeedPrice
item.B2BShowPrice - item.ChildNoNeedPrice
)
}}
</td>
<td>
{{
(item.B2BPrice - item.ChildNoNeedPrice)
| priceFormat(item.B2BPrice - item.ChildNoNeedPrice)
(item.B2BShowPrice - item.ChildNoNeedPrice)
| priceFormat(item.B2BShowPrice - item.ChildNoNeedPrice)
}}
</td>
<td>
{{
(item.B2CMemberPrice - item.ChildNoNeedPrice)
(item.B2BShowPrice - item.ChildNoNeedPrice)
| priceFormat(
item.B2CMemberPrice - item.ChildNoNeedPrice
item.B2BShowPrice - item.ChildNoNeedPrice
)
}}
</td>
<td>
{{
(item.B2CPrice - item.ChildNoNeedPrice)
| priceFormat(item.B2CPrice - item.ChildNoNeedPrice)
(item.B2CShowPrice - item.ChildNoNeedPrice)
| priceFormat(item.B2CShowPrice - item.ChildNoNeedPrice)
}}
</td>
</tr>
<!-- <tr>
<td>{{ $t("salesModule.SingleJ") }}</td>
<td colspan="4">
{{
item.SingleDMCPrice | priceFormat(item.SingleDMCPrice)
}}
</td>
</tr> -->
<tr>
<td>{{ $t("Operation.Op_baby") }}</td>
<td colspan="4">
......@@ -427,7 +443,7 @@
</el-popover>
</p>
<p v-if="item.RakeBackRatio>0">{{$t('objFill.v102.dangqianfyje')}}：
</br>
<br />
<span style="color: red;">￥{{ item.RakeBackRatio }}</span>
</p>
<p>
......@@ -457,24 +473,29 @@
</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">
<span :key="subIndex+10000">
<span v-if="subItem.SaleInfoList && subItem.SaleInfoList.length">
<el-popover
trigger="hover"
:content="subItem.SaleInfoList && subItem.SaleInfoList.length ?subItem.SaleInfoList.map(item => item.EmName).join(',') : ''"><el-tag size="mini" slot="reference" style="margin-right:10px;margin-bottom: 10px">{{subItem.CustomerName}}</el-tag>
<el-popover trigger="hover"
:content="subItem.SaleInfoList && subItem.SaleInfoList.length ?subItem.SaleInfoList.map(item => item.EmName).join(',') : ''">
<el-tag size="mini" slot="reference" style="margin-right:10px;margin-bottom: 10px">
{{subItem.CustomerName}}</el-tag>
</el-popover>
</span>
<el-tag v-else size="mini" slot="reference" style="margin-right:10px;margin-bottom: 10px">{{subItem.CustomerName}}</el-tag>
<el-tag v-else size="mini" slot="reference" style="margin-right:10px;margin-bottom: 10px">
{{subItem.CustomerName}}</el-tag>
</span>
</template>
</div>
</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"><span class="item-title">{{$t('objFill.v101.faqiren')}}:：</span>{{item.CreateByName}}</div>
<div class="mb title"><i
class="iconfont icon-yuangong"></i><span>{{$t('objFill.v101.faqixinxi')}}:</span></div>
<div class="mb"><span class="item-title">{{$t('objFill.v101.faqiren')}}:：</span>{{item.CreateByName}}
</div>
<div>{{item.CreateTime}}</div>
</div>
</div>
......@@ -483,8 +504,8 @@
<el-button class="mb" @click.native='editTeam(item)' type="primary" size="small"
style="background:#00C6FF; border-color:#00C6FF;width:80px;">{{$t('pub.updateMsg')}}
</el-button>
<el-dropdown trigger="click" >
<span class="el-dropdown-link" type="primary">{{$t('pub.more')}}:
<el-dropdown trigger="click">
<span class="el-dropdown-link" type="primary">{{$t('pub.more')}}
<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown" class="travelControlDropDown">
......@@ -492,10 +513,10 @@
{{$t('Operation.Op_registrationList')}}
</el-dropdown-item>
<el-dropdown-item @click.native="DeleteTravelTeam(item)">
{{$t('system.table_delete')}}:
{{$t('system.table_delete')}}
</el-dropdown-item>
<el-dropdown-item @click.native="gotoPay(item)">
{{$t('objFill.v101.baojijiesuan')}}:
{{$t('objFill.v101.baojijiesuan')}}
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
......@@ -550,7 +571,7 @@
QAirlineCompany: "", //航空公司名称
QFlightNum: "", //航班号
QCustomerName: "", //合作伙伴名称
StartAddress: "",//出发地
StartAddress: "", //出发地
},
queryDataObj: {
LineList: [], //线路列表
......@@ -626,7 +647,7 @@
//删除包机团
DeleteTravelTeam(item) {
var that = this;
var tipMsg = that.$t('objFill.v101.querenysc')+"【" + item.GTeamName + "】"+that.$t('objFill.v101.baojituan')
var tipMsg = that.$t('objFill.v101.querenysc') + "【" + item.GTeamName + "】" + that.$t('objFill.v101.baojituan')
that.Confirm(tipMsg, function () {
that.apipost(
"travelteam_DelTeavelTeam", {
......@@ -710,8 +731,9 @@
this.queryMsg.loading = false;
if (res.data.resultCode == 1) {
this.queryDataObj.dataList = res.data.data.pageData;
if(!this.queryDataObj.dataList.length) {
this.queryMsg.noData = true} else {
if (!this.queryDataObj.dataList.length) {
this.queryMsg.noData = true
} else {
this.queryMsg.noData = false
}
this.queryMsg.total = res.data.data.count;
......
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