Skip to content

S
SuperMan
Commit 2528cf8b authored by youjie's avatar youjie
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 3729cd23 364aa26f
Hide whitespace changes
Inline Side-by-side
Showing with 169 additions and 101 deletions
src/components/FinancialModule/HandFee/HandFeeStatistics.vue
View file @ 2528cf8b
...@@ -25,6 +25,14 @@ ...@@ -25,6 +25,14 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4">
<el-form-item label="收入类型">
<el-select filterable v-model='msg.ImportType' class="">
<el-option label='手配+R' :value='1' :key='1'></el-option>
<el-option label='转账手续费' :value='2' :key='2'></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="$t('sm.company')"> <el-form-item :label="$t('sm.company')">
<el-select filterable v-model='msg.RB_Branch_Id'> <el-select filterable v-model='msg.RB_Branch_Id'>
...@@ -67,7 +75,7 @@ ...@@ -67,7 +75,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<template v-if="heightQueryBox"></template> <template v-if="heightQueryBox"></template>
<el-col :span="6"> <el-col :span="5">
<el-form-item :label="$t('fnc.zdriqi')"> <el-form-item :label="$t('fnc.zdriqi')">
<!-- <el-date-picker class="h34" @change="timeAdd(1)" v-model="productionDate" type="daterange" <!-- <el-date-picker class="h34" @change="timeAdd(1)" v-model="productionDate" type="daterange"
value-format="yyyy-MM-dd"> value-format="yyyy-MM-dd">
...@@ -75,14 +83,14 @@ ...@@ -75,14 +83,14 @@
<StartDateLimit :clearable="false" :dateTime="productionDate" @change="(startDate,endDate)=>{msg.sDate=startDate,msg.eDate=endDate}"></StartDateLimit> <StartDateLimit :clearable="false" :dateTime="productionDate" @change="(startDate,endDate)=>{msg.sDate=startDate,msg.eDate=endDate}"></StartDateLimit>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="5">
<el-form-item :label="$t('fnc.jiaoyiriqi')"> <el-form-item :label="$t('fnc.jiaoyiriqi')">
<el-date-picker class="h34" v-model="transactionDate" @change="timeAdd(3)" type="daterange" <el-date-picker class="h34" v-model="transactionDate" @change="timeAdd(3)" type="daterange"
value-format="yyyy-MM-dd"> value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="5">
<el-form-item :label="$t('scen.sc_ftTime')"> <el-form-item :label="$t('scen.sc_ftTime')">
<el-date-picker class="h34" v-model="missionDate" @change="timeAdd(4)" type="daterange" <el-date-picker class="h34" v-model="missionDate" @change="timeAdd(4)" type="daterange"
value-format="yyyy-MM-dd"> value-format="yyyy-MM-dd">
...@@ -293,6 +301,7 @@ ...@@ -293,6 +301,7 @@
Status: '-1', //状态 Status: '-1', //状态
KingdeeBranchId: 0, //当前登录人的公司 KingdeeBranchId: 0, //当前登录人的公司
HandFeeFrId: 0, HandFeeFrId: 0,
ImportType:1
}, },
isRB_Depart_Id: false, isRB_Depart_Id: false,
getCompanyMsg: { // 公司 getCompanyMsg: { // 公司
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 2528cf8b
...@@ -587,74 +587,82 @@ ...@@ -587,74 +587,82 @@
</p> </p>
<el-popover width="900" trigger="click" popper-class="TC_tripDetails"> <el-popover width="900" trigger="click" popper-class="TC_tripDetails">
<table width="100%" border="0" cellspacing="0" cellpadding="0"> <table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr class="_color_666" style="text-align: center"> <template v-for="(nItem,newIndex) in item.newFlightList">
<th width="60">{{ $t("Airticket.Air_segment") }}</th> <tr class="_color_666" style="text-align: center" :key="`hf_`+newIndex">
<th width="80">{{ $t("system.query_flightNum") }}</th> <th width="60">{{ $t("Airticket.Air_segment") }}</th>
<th width="150">{{ $t("system.ph_flightTime") }}</th> <th width="80">{{ $t("system.query_flightNum") }}</th>
<th width="80">{{ $t("system.query_arrivalTime") }}</th> <th width="150">{{ $t("system.ph_flightTime") }}</th>
<th width="100">{{ $t("system.query_stopCity") }}</th> <th width="80">{{ $t("system.query_arrivalTime") }}</th>
</tr> <th width="100">{{ $t("system.query_stopCity") }}</th>
<tr v-for="(fItem, fIndex) in item.flightList" :key="fIndex" style="text-align: center"> </tr>
<td class="_d_name _color_666"> <tr v-for="(fItem, fIndex) in nItem.flightList" :key="`hd_`+newIndex+`d_`+fIndex" style="text-align: center">
<span v-if="fIndex == 0">{{ $t("Airticket.Air_go") }}</span> <td class="_d_name _color_666">
<span v-else-if="fIndex == item.flightList.length - 1">{{ <span v-if="fIndex == 0">{{ $t("Airticket.Air_go") }}</span>
<span v-else-if="fIndex == item.flightList.length - 1">{{
$t("Airticket.Air_returnTrip") $t("Airticket.Air_returnTrip")
}}</span> }}</span>
<span <span
v-else-if="fIndex > 0 && fIndex != item.flightList.length - 1">{{ $t("Airticket.Air_transit") }}</span> v-else-if="fIndex > 0 && fIndex != item.flightList.length - 1">{{ $t("Airticket.Air_transit") }}</span>
</td> </td>
<td> <td>
<div>{{ fItem.Flight_number }}</div> <div>{{ fItem.Flight_number }}</div>
<div style="margin-top: 5px">{{ fItem.AlName }}</div> <div style="margin-top: 5px">{{ fItem.AlName }}</div>
</td> </td>
<td> <td>
<div>{{ fItem.FlightDate }} {{ fItem.Departure_time }}</div> <div>{{ fItem.FlightDate }} {{ fItem.Departure_time }}</div>
<div style="margin-top: 5px"> <div style="margin-top: 5px">
<span v-if="fItem.DIATA">({{ fItem.DIATA }})</span> <span v-if="fItem.DIATA">({{ fItem.DIATA }})</span>
{{ fItem.dName }} {{ fItem.dName }}
</div> </div>
</td> </td>
<td> <td>
<div> <div>
{{ fItem.FlightArrivalTime }} {{ fItem.Arrival_time }} {{ fItem.FlightArrivalTime }} {{ fItem.Arrival_time }}
</div> </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 }}
</div> </div>
</td> </td>
<td> <td>
<template <template
v-if="fItem.StopoverIATA">({{ fItem.StopoverIATA }})</template>{{ fItem.StopoverName }} v-if="fItem.StopoverIATA">({{ fItem.StopoverIATA }})</template>{{ fItem.StopoverName }}
</td> </td>
</tr> </tr>
</template>
</table> </table>
<div class="FlightDiv-TCL" slot="reference"> <div class="FlightDiv-TCL" slot="reference">
<template v-if="item.UseFlightType == 0"> <template v-if="item.UseFlightType == 0">
<div v-for="subItem in item.flightList" slot="reference" :key="subItem.subCode" <template v-for="(nItem,newIndex) in item.newFlightList">
class="TCL-flighInfoList"> <div v-for="(subItem) in nItem.flightList" slot="reference" :key="`f_`+newIndex+`_`+subItem.ID"
<span class="travelnowrap"> class="TCL-flighInfoList">
<span class="TCL-FlightNumber">{{ <span class="travelnowrap">
<span class="TCL-FlightNumber">{{
subItem.Flight_number subItem.Flight_number
}}</span> }}</span>
<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 }}
{{ {{
subItem.StopoverName == "" subItem.StopoverName == ""
? "" ? ""
: "-(" + subItem.StopoverIATA + ")" + subItem.StopoverName : "-(" + subItem.StopoverIATA + ")" + subItem.StopoverName
}} }}
<template v-if="subItem.ArrivalCityName"> <template v-if="subItem.ArrivalCityName">
<span v-if="subItem.AIATA"> -({{ subItem.AIATA }}) </span> <span v-if="subItem.AIATA"> -({{ subItem.AIATA }}) </span>
<span v-else>-</span> <span v-else>-</span>
{{ 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-if="subItem.FlightState == 1" class="TCL-greenType">【OK】</span>
<span v-else class="TCL-redType">【{{ $t("visa.v_zanding") }}】</span> <span v-else class="TCL-redType">【{{ $t("visa.v_zanding") }}】</span>
</span> </span>
</div> </div>
<template v-if="newIndex!=item.newFlightList.length-1">
<div slot="reference" class="TCL-flighInfoList" style="border-bottom:1px solid #e5e5e5">
</div>
</template>
</template>
</template> </template>
<template v-else> <template v-else>
<div v-for="subItem in item.flightList" slot="reference" :key="subItem.subCode" <div v-for="subItem in item.flightList" slot="reference" :key="subItem.subCode"
...@@ -1660,7 +1668,7 @@ ...@@ -1660,7 +1668,7 @@
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="CopyTripAndFeature(item,3)"> <el-dropdown-item @click.native="CopyTripAndFeature(item,3)">
机票转团 机票转团
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="ckChangePrice(item,1)"> <el-dropdown-item @click.native="ckChangePrice(item,1)">
价格变更 价格变更
</el-dropdown-item> </el-dropdown-item>
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 2528cf8b
...@@ -450,49 +450,100 @@ ...@@ -450,49 +450,100 @@
<p class="TCLflight_GO"> <p class="TCLflight_GO">
<i class="iconfont icon-hangban1"></i>{{$t('visa.v_hangban')}} <i class="iconfont icon-hangban1"></i>{{$t('visa.v_hangban')}}
</p> </p>
<el-popover width="900" trigger="click" popper-class="TC_tripDetails"> <el-popover width="900" trigger="click" popper-class="TC_tripDetails">
<table width="100%" border="0" cellspacing="0" cellpadding="0"> <table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr class="_color_666" style="text-align:center;"> <template v-for="(nItem,newIndex) in item.newFlightList">
<th width="60">{{$t('Airticket.Air_segment')}}</th> <tr class="_color_666" style="text-align: center" :key="`hf_`+newIndex">
<th width="80">{{$t('system.query_flightNum')}}</th> <th width="60">{{ $t("Airticket.Air_segment") }}</th>
<th width="150">{{$t('system.ph_flightTime')}}</th> <th width="80">{{ $t("system.query_flightNum") }}</th>
<th width="80">{{$t('system.query_arrivalTime')}}</th> <th width="150">{{ $t("system.ph_flightTime") }}</th>
<th width="100">{{$t('system.query_stopCity')}}</th> <th width="80">{{ $t("system.query_arrivalTime") }}</th>
</tr> <th width="100">{{ $t("system.query_stopCity") }}</th>
<tr v-for="(ds,din) in item.flightList" :key="din" style="text-align:center;"> </tr>
<td class="_d_name _color_666"> <tr v-for="(fItem, fIndex) in nItem.flightList" :key="`hd_`+newIndex+`d_`+fIndex" style="text-align: center">
<span v-if="din==0">{{$t('Airticket.Air_go')}}</span> <td class="_d_name _color_666">
<span v-else-if="din==item.flightList.length-1">{{$t('Airticket.Air_returnTrip')}}</span> <span v-if="fIndex == 0">{{ $t("Airticket.Air_go") }}</span>
<span <span v-else-if="fIndex == item.flightList.length - 1">{{
v-else-if="din>0 && din!=item.flightList.length-1">{{$t('Airticket.Air_transit')}}</span> $t("Airticket.Air_returnTrip")
</td> }}</span>
<td> <span
<div>{{ds.Flight_number}}</div> v-else-if="fIndex > 0 && fIndex != item.flightList.length - 1">{{ $t("Airticket.Air_transit") }}</span>
<div style="margin-top:5px;">{{ds.AlName}}</div> </td>
</td> <td>
<td> <div>{{ fItem.Flight_number }}</div>
<div>{{ds.FlightDate}} {{ds.Departure_time}}</div> <div style="margin-top: 5px">{{ fItem.AlName }}</div>
<div style="margin-top:5px;">{{ds.dName}}</div> </td>
</td> <td>
<td> <div>{{ fItem.FlightDate }} {{ fItem.Departure_time }}</div>
<div>{{ds.FlightArrivalTime}} {{ds.Arrival_time}}</div> <div style="margin-top: 5px">
<div style="margin-top:5px;">{{ds.aName}}</div> <span v-if="fItem.DIATA">({{ fItem.DIATA }})</span>
</td> {{ fItem.dName }}
<td>{{ds.StopoverName}}</td> </div>
</tr> </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>
<td>
<template
v-if="fItem.StopoverIATA">({{ fItem.StopoverIATA }})</template>{{ fItem.StopoverName }}
</td>
</tr>
</template>
</table> </table>
<div class="FlightDiv-TCL" slot="reference"> <div class="FlightDiv-TCL" slot="reference">
<div v-for="subItem in item.flightList" slot="reference" :key="subItem.subCode" <template v-if="item.UseFlightType == 0">
class="TCL-flighInfoList"> <template v-for="(nItem,newIndex) in item.newFlightList">
<span class="travelnowrap"> <div v-for="(subItem) in nItem.flightList" slot="reference" :key="`f_`+newIndex+`_`+subItem.ID"
<span class="TCL-FlightNumber">{{subItem.Flight_number}}</span> class="TCL-flighInfoList">
{{subItem.DepartureName}} <span class="travelnowrap">
{{subItem.StopoverName==""?"":"-"+subItem.StopoverName}} <span class="TCL-FlightNumber">{{
{{subItem.ArrivalCityName==""?"":"-"+subItem.ArrivalCityName}} subItem.Flight_number
<span v-if="subItem.FlightState==1" class="TCL-greenType">【OK】</span> }}</span>
<span v-else class="TCL-redType">【{{$t('visa.v_zanding')}}】</span> <span><template v-if="subItem.DIATA">({{ subItem.DIATA }})</template>
</span> <template v-else>({{ subItem.dName }})</template></span>
</div> {{ subItem.DepartureName }}
{{
subItem.StopoverName == ""
? ""
: "-(" + subItem.StopoverIATA + ")" + subItem.StopoverName
}}
<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>
</div>
<template v-if="newIndex!=item.newFlightList.length-1">
<div slot="reference" class="TCL-flighInfoList" style="border-bottom:1px solid #e5e5e5">
</div>
</template>
</template>
</template>
<template v-else>
<div v-for="subItem in item.flightList" 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> </div>
</el-popover> </el-popover>
</div> </div>
......
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