Commit 93aca069 authored by 黄奎's avatar 黄奎

页面修改

parent f0106663
...@@ -2236,26 +2236,19 @@ ...@@ -2236,26 +2236,19 @@
</div> </div>
<p v-if="item.unionRemark" style="color: red;font-size:10px;margin-top:5px;">联运备注:{{ item.unionRemark }} <p v-if="item.unionRemark" style="color: red;font-size:10px;margin-top:5px;">联运备注:{{ item.unionRemark }}
</p> </p>
<template v-if="item.orderUnionFlightList&&item.orderUnionFlightList.length>0"> <template v-if="item.orderGuestFlightList&&item.orderGuestFlightList.length>0">
<template v-for="(uItem,uIndex) in item.orderUnionFlightList"> <template v-for="(uItem,uIndex) in item.orderGuestFlightList">
<div v-if="(uItem.flightName&&uItem.flightName.id)||(uItem.backFlightName&&uItem.backFlightName.id)" <div :key="uIndex+20000">
:key="uIndex"> {{uItem.guestNames}} 航班信息:
联运信息:<span style="color: red">已配联运{{uItem.configNum}}人,{{uItem.airticketUnionNotes}} <span v-if="uItem.isSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span v-else>【暂定】</span>
<span v-if="uItem.isSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span v-else>【暂定】</span> <br />
</span> <template v-for="(sfItem,sfIndex) in uItem.guestFlightList">
<template v-if="uItem.flightName&&uItem.flightName.id"> <span style="color:blue;" :key="sfIndex+30000">
<br /> {{sfItem.flightDateStr}} {{sfItem.flight_number}}
<span style="color:blue;">去程: {{sfItem.departure_time}}-{{sfItem.arrival_time}}
{{uItem.flightName.startDateStr}} {{uItem.flightName.flight_number}} {{sfItem.departureName}} ({{sfItem.diata}})-{{sfItem.arrivalCityName}}({{sfItem.aiata}})
{{uItem.flightName.departureTime}}-{{uItem.flightName.arrivalTime}} </span>
{{uItem.flightName.dName}}-{{uItem.flightName.aName}}</span> <br :key="sfIndex+40000" />
</template>
<template v-if="uItem.backFlightName&&uItem.backFlightName.id">
<br />
<span style="color:blue;">回程:
{{uItem.backFlightName.startDateStr}} {{uItem.backFlightName.flight_number}}
{{uItem.backFlightName.departureTime}}-{{uItem.backFlightName.arrivalTime}}
{{uItem.backFlightName.dName}}-{{uItem.backFlightName.aName}}</span>
</template> </template>
</div> </div>
</template> </template>
......
...@@ -2436,32 +2436,24 @@ ...@@ -2436,32 +2436,24 @@
<div v-if="item.unionRemark" style="color: red"> <div v-if="item.unionRemark" style="color: red">
<span>联运备注:{{ item.unionRemark }}</span> <span>联运备注:{{ item.unionRemark }}</span>
</div> </div>
<template v-if="item.orderUnionFlightList&&item.orderUnionFlightList.length>0"> <template v-if="item.orderGuestFlightList&&item.orderGuestFlightList.length>0">
<template v-for="(uItem,uIndex) in item.orderUnionFlightList"> <template v-for="(uItem,uIndex) in item.orderGuestFlightList">
<div <div :key="uIndex+20000">
v-if="(uItem.flightName&&uItem.flightName.id)||(uItem.backFlightName&&uItem.backFlightName.id)" {{uItem.guestNames}} 航班信息:
:key="uIndex"> <span v-if="uItem.isSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span
联运信息:<span style="color: red">已配联运{{uItem.configNum}}人,{{uItem.airticketUnionNotes}} v-else>【暂定】</span>
<span v-if="uItem.isSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span <br />
v-else>【暂定】</span> <template v-for="(sfItem,sfIndex) in uItem.guestFlightList">
<span style="color:blue;" :key="sfIndex+30000">
{{sfItem.flightDateStr}} {{sfItem.flight_number}}
{{sfItem.departure_time}}-{{sfItem.arrival_time}}
{{sfItem.departureName}} ({{sfItem.diata}})-{{sfItem.arrivalCityName}}({{sfItem.aiata}})
</span> </span>
<template v-if="uItem.flightName&&uItem.flightName.id"> <br :key="sfIndex+40000" />
<br /> </template>
<span style="color:blue;">去程: </div>
{{uItem.flightName.startDateStr}} {{uItem.flightName.flight_number}}
{{uItem.flightName.departureTime}}-{{uItem.flightName.arrivalTime}}
{{uItem.flightName.dName}}-{{uItem.flightName.aName}}</span>
</template>
<template v-if="uItem.backFlightName&&uItem.backFlightName.id">
<br />
<span style="color:blue;">回程:
{{uItem.backFlightName.startDateStr}} {{uItem.backFlightName.flight_number}}
{{uItem.backFlightName.departureTime}}-{{uItem.backFlightName.arrivalTime}}
{{uItem.backFlightName.dName}}-{{uItem.backFlightName.aName}}</span>
</template>
</div>
</template>
</template> </template>
</template>
</div> </div>
<div style=" <div style="
float: right; float: right;
......
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