Skip to content

S
SuperMan
Commit 364aa26f authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents 234b3360 cd61ae53
Show whitespace changes
Inline Side-by-side
Showing with 168 additions and 103 deletions
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 364aa26f
...@@ -587,14 +587,15 @@ ...@@ -587,14 +587,15 @@
</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">
<tr class="_color_666" style="text-align: center" :key="`hf_`+newIndex">
<th width="60">{{ $t("Airticket.Air_segment") }}</th> <th width="60">{{ $t("Airticket.Air_segment") }}</th>
<th width="80">{{ $t("system.query_flightNum") }}</th> <th width="80">{{ $t("system.query_flightNum") }}</th>
<th width="150">{{ $t("system.ph_flightTime") }}</th> <th width="150">{{ $t("system.ph_flightTime") }}</th>
<th width="80">{{ $t("system.query_arrivalTime") }}</th> <th width="80">{{ $t("system.query_arrivalTime") }}</th>
<th width="100">{{ $t("system.query_stopCity") }}</th> <th width="100">{{ $t("system.query_stopCity") }}</th>
</tr> </tr>
<tr v-for="(fItem, fIndex) in item.flightList" :key="fIndex" style="text-align: center"> <tr v-for="(fItem, fIndex) in nItem.flightList" :key="`hd_`+newIndex+`d_`+fIndex" style="text-align: center">
<td class="_d_name _color_666"> <td class="_d_name _color_666">
<span v-if="fIndex == 0">{{ $t("Airticket.Air_go") }}</span> <span v-if="fIndex == 0">{{ $t("Airticket.Air_go") }}</span>
<span v-else-if="fIndex == item.flightList.length - 1">{{ <span v-else-if="fIndex == item.flightList.length - 1">{{
...@@ -628,10 +629,12 @@ ...@@ -628,10 +629,12 @@
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">
<div v-for="(subItem) in nItem.flightList" slot="reference" :key="`f_`+newIndex+`_`+subItem.ID"
class="TCL-flighInfoList"> class="TCL-flighInfoList">
<span class="travelnowrap"> <span class="travelnowrap">
<span class="TCL-FlightNumber">{{ <span class="TCL-FlightNumber">{{
...@@ -655,6 +658,11 @@ ...@@ -655,6 +658,11 @@
<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"
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 364aa26f
...@@ -452,47 +452,98 @@ ...@@ -452,47 +452,98 @@
</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>
<th width="100">{{ $t("system.query_stopCity") }}</th>
</tr> </tr>
<tr v-for="(ds,din) in item.flightList" :key="din" style="text-align:center;"> <tr v-for="(fItem, fIndex) in nItem.flightList" :key="`hd_`+newIndex+`d_`+fIndex" style="text-align: center">
<td class="_d_name _color_666"> <td class="_d_name _color_666">
<span v-if="din==0">{{$t('Airticket.Air_go')}}</span> <span v-if="fIndex == 0">{{ $t("Airticket.Air_go") }}</span>
<span v-else-if="din==item.flightList.length-1">{{$t('Airticket.Air_returnTrip')}}</span> <span v-else-if="fIndex == item.flightList.length - 1">{{
$t("Airticket.Air_returnTrip")
}}</span>
<span <span
v-else-if="din>0 && din!=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>{{ds.Flight_number}}</div> <div>{{ fItem.Flight_number }}</div>
<div style="margin-top:5px;">{{ds.AlName}}</div> <div style="margin-top: 5px">{{ fItem.AlName }}</div>
</td> </td>
<td> <td>
<div>{{ds.FlightDate}} {{ds.Departure_time}}</div> <div>{{ fItem.FlightDate }} {{ fItem.Departure_time }}</div>
<div style="margin-top:5px;">{{ds.dName}}</div> <div style="margin-top: 5px">
<span v-if="fItem.DIATA">({{ fItem.DIATA }})</span>
{{ fItem.dName }}
</div>
</td> </td>
<td> <td>
<div>{{ds.FlightArrivalTime}} {{ds.Arrival_time}}</div> <div>
<div style="margin-top:5px;">{{ds.aName}}</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> </td>
<td>{{ds.StopoverName}}</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-for="(nItem,newIndex) in item.newFlightList">
<div v-for="(subItem) in nItem.flightList" slot="reference" :key="`f_`+newIndex+`_`+subItem.ID"
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 }}) </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" <div v-for="subItem in item.flightList" slot="reference" :key="subItem.subCode"
class="TCL-flighInfoList"> class="TCL-flighInfoList">
<span class="travelnowrap"> <span class="travelnowrap">
<span class="TCL-FlightNumber">{{subItem.Flight_number}}</span> <span class="TCL-FlightNumber">{{
{{subItem.DepartureName}} subItem.Flight_number
{{subItem.StopoverName==""?"":"-"+subItem.StopoverName}} }}</span>
{{subItem.ArrivalCityName==""?"":"-"+subItem.ArrivalCityName}} {{ subItem.aName }} {{ subItem.Departure_time }}
<span v-if="subItem.FlightState==1" class="TCL-greenType">【OK】</span> -
<span v-else class="TCL-redType">【{{$t('visa.v_zanding')}}】</span> {{ 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> </span>
</div> </div>
</template>
</div> </div>
</el-popover> </el-popover>
</div> </div>
......
src/components/cruiseShip/list/cruiseShipListConfig.js
View file @ 364aa26f
...@@ -54,7 +54,7 @@ export const spotListConfig = { ...@@ -54,7 +54,7 @@ export const spotListConfig = {
prop: 'CouponsName', prop: 'CouponsName',
minWidth: 150, minWidth: 150,
fixed: 'left', fixed: 'left',
type: 'link', // type: 'link',
slotName: 'CouponsName', slotName: 'CouponsName',
filter: { filter: {
type: 'input', type: 'input',
......
src/components/cruiseShip/list/cruiseShipOrderList.vue
View file @ 364aa26f
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
@add-click="addSpot" @add-click="addSpot"
> >
<!-- 插槽 --> <!-- 插槽 -->
<template slot="CouponsName" slot-scope="{ row }"> <!-- <template slot="CouponsName" slot-scope="{ row }">
<span class="name-link" @click="editSpot(row)"> <span class="name-link" @click="editSpot(row)">
{{ row.CouponsName }} {{ row.CouponsName }}
</span> </span>
</template> </template> -->
<template slot="profit" slot-scope="{ row }"> <template slot="profit" slot-scope="{ row }">
{{ row.Income-row.CostMoney-row.Refund>0?(row.Income-row.CostMoney-row.Refund).toFixed(2):'-' }} {{ row.Income-row.CostMoney-row.Refund>0?(row.Income-row.CostMoney-row.Refund).toFixed(2):'-' }}
</template> </template>
...@@ -114,6 +114,12 @@ ...@@ -114,6 +114,12 @@
<!-- <el-button type="text" size="mini" @click="manageData(row)">邮轮</el-button> --> <!-- <el-button type="text" size="mini" @click="manageData(row)">邮轮</el-button> -->
<!-- <el-button type="text" size="mini" @click="editSpot(row)">编辑</el-button> --> <!-- <el-button type="text" size="mini" @click="editSpot(row)">编辑</el-button> -->
<div class="row"> <div class="row">
<span v-if="row.OrderStatus == 2"
class="c059FF6 mr-xs pointer"
@click="editSpot(row)"
>{{$t('pub.edit')}}</span>
<span v-if="row.OrderStatus == 1 && row.IncomeList.length == 0 && row.RefundList.length == 0 && row.CostList.length == 0" <span v-if="row.OrderStatus == 1 && row.IncomeList.length == 0 && row.RefundList.length == 0 && row.CostList.length == 0"
class="delete-btn mr-xs pointer" class="delete-btn mr-xs pointer"
@click="cancelOrder(row)" @click="cancelOrder(row)"
...@@ -124,7 +130,7 @@ ...@@ -124,7 +130,7 @@
@click="clickOperation(row,3)" @click="clickOperation(row,3)"
>{{$t('fnc.shousun')}}</span> >{{$t('fnc.shousun')}}</span>
<!-- v-if="row.OrderStatus>1&&!row.OrderStatus!=3&&!row.OrderStatus!=4&&isOP&&userInfo.ActionMenuCode.indexOf('is_correlationOP') != -1" --> <!-- v-if="row.OrderStatus>1&&!row.OrderStatus!=3&&!row.OrderStatus!=4&&isOP&&userInfo.ActionMenuCode.indexOf('is_correlationOP') != -1" -->
<span <!-- <span
class="c059FF6 mr-xs pointer" class="c059FF6 mr-xs pointer"
@click="clickOperation(row,4)" @click="clickOperation(row,4)"
>{{$t('pub.edit')}}OP</span> >{{$t('pub.edit')}}OP</span>
...@@ -132,7 +138,7 @@ ...@@ -132,7 +138,7 @@
<span v-if="row.OrderStatus!=3" <span v-if="row.OrderStatus!=3"
class="c059FF6 mr-xs pointer" class="c059FF6 mr-xs pointer"
@click="clickOperation(row,5)" @click="clickOperation(row,5)"
>{{$t('pub.edit')}}{{$t('fnc.a_zongjine')}}</span> >{{$t('pub.edit')}}{{$t('fnc.a_zongjine')}}</span> -->
<ApplyFoInvoice class="pointer" v-if="userInfo&&userInfo.RB_Group_id==2&&userInfo.EmployeeId==row.EnterID" <ApplyFoInvoice class="pointer" v-if="userInfo&&userInfo.RB_Group_id==2&&userInfo.EmployeeId==row.EnterID"
:obj="row" :type="7"></ApplyFoInvoice> :obj="row" :type="7"></ApplyFoInvoice>
......
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