Skip to content

S
SuperMan
Commit 7cf1efe0 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 08845c01
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 69 deletions
src/components/SalesModule/enrollTotal.vue
View file @ 7cf1efe0
...@@ -616,24 +616,30 @@ ...@@ -616,24 +616,30 @@
<span style="color: red;">联运备注:</span> <span style="color: red;">联运备注:</span>
<span style="color: red;">{{ item.unionRemark }}</span> <span style="color: red;">{{ item.unionRemark }}</span>
</div> </div>
<div v-if="item.flightName||item.backFlightName"> <template v-if="item.orderUnionFlightList&&item.orderUnionFlightList.length>0">
联运信息：<span style="color: red">已配联运{{item.configNum}}人,{{item.airticketUnionNotes}} <template v-for="(uItem,uIndex) in item.orderUnionFlightList">
<span v-if="item.isSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span v-else>【暂定】</span> <div v-if="(uItem.flightName&&uItem.flightName.id)||(uItem.backFlightName&&uItem.backFlightName.id)"
</span> :key="uIndex">
<template v-if="item.flightName"> 联运信息：<span style="color: red">已配联运{{uItem.configNum}}人,{{uItem.airticketUnionNotes}}
<br /> <span v-if="uItem.isSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span v-else>【暂定】</span>
<span style="color:blue;">去程: </span>
{{item.flightName.startDateStr}} {{item.flightName.flight_number}} <template v-if="uItem.flightName&&uItem.flightName.id">
{{item.flightName.departureTime}}-{{item.flightName.arrivalTime}} <br />
{{item.flightName.dName}}-{{item.flightName.aName}}</span> <span style="color:blue;">去程:
</template> {{uItem.flightName.startDateStr}} {{uItem.flightName.flight_number}}
<template v-if="item.backFlightName"> {{uItem.flightName.departureTime}}-{{uItem.flightName.arrivalTime}}
<br /> {{uItem.flightName.dName}}-{{uItem.flightName.aName}}</span>
<span style="color:blue;">回程: {{item.backFlightName.startDateStr}} {{item.backFlightName.flight_number}} </template>
{{item.backFlightName.departureTime}}-{{item.backFlightName.arrivalTime}} <template v-if="uItem.backFlightName&&uItem.backFlightName.id">
{{item.backFlightName.dName}}-{{item.backFlightName.aName}}</span> <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>
</div>
</td> </td>
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px"> <td colspan="4" class="groupTourOrder_remarks" style="height: 40px">
<div> <div>
......
src/components/SalesModule/groupTourOrder.vue
View file @ 7cf1efe0
...@@ -2231,23 +2231,30 @@ ...@@ -2231,23 +2231,30 @@
</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>
<div v-if="item.flightName||item.backFlightName"> <template v-if="item.orderUnionFlightList&&item.orderUnionFlightList.length>0">
联运信息：<span style="color: red">已配联运{{item.configNum}}人,{{item.airticketUnionNotes}} <template v-for="(uItem,uIndex) in item.orderUnionFlightList">
<span v-if="item.isSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span v-else>【暂定】</span> <div v-if="(uItem.flightName&&uItem.flightName.id)||(uItem.backFlightName&&uItem.backFlightName.id)"
</span> :key="uIndex">
<template v-if="item.flightName"> 联运信息：<span style="color: red">已配联运{{uItem.configNum}}人,{{uItem.airticketUnionNotes}}
<br /> <span v-if="uItem.isSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span v-else>【暂定】</span>
<span style="color:blue;">去程: {{item.flightName.startDateStr}} {{item.flightName.flight_number}} </span>
{{item.flightName.departureTime}}-{{item.flightName.arrivalTime}} <template v-if="uItem.flightName&&uItem.flightName.id">
{{item.flightName.dName}}-{{item.flightName.aName}}</span> <br />
</template> <span style="color:blue;">去程:
<template v-if="item.backFlightName"> {{uItem.flightName.startDateStr}} {{uItem.flightName.flight_number}}
<br /> {{uItem.flightName.departureTime}}-{{uItem.flightName.arrivalTime}}
<span style="color:blue;">回程: {{item.backFlightName.startDateStr}} {{item.backFlightName.flight_number}} {{uItem.flightName.dName}}-{{uItem.flightName.aName}}</span>
{{item.backFlightName.departureTime}}-{{item.backFlightName.arrivalTime}} </template>
{{item.backFlightName.dName}}-{{item.backFlightName.aName}}</span> <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>
</div> </template>
</td> </td>
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px"> <td colspan="4" class="groupTourOrder_remarks" style="height: 40px">
<div> <div>
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 7cf1efe0
...@@ -2432,25 +2432,32 @@ ...@@ -2432,25 +2432,32 @@
<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">
<div v-if="item.flightName||item.backFlightName"> <template v-for="(uItem,uIndex) in item.orderUnionFlightList">
联运信息：<span style="color: red">已配联运{{item.configNum}}人,{{item.airticketUnionNotes}} <div
<span v-if="item.isSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span v-else>【暂定】</span> v-if="(uItem.flightName&&uItem.flightName.id)||(uItem.backFlightName&&uItem.backFlightName.id)"
</span> :key="uIndex">
<template v-if="item.flightName"> 联运信息：<span style="color: red">已配联运{{uItem.configNum}}人,{{uItem.airticketUnionNotes}}
<br /> <span v-if="uItem.isSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span
<span style="color:blue;">去程: {{item.flightName.startDateStr}} {{item.flightName.flight_number}} v-else>【暂定】</span>
{{item.flightName.departureTime}}-{{item.flightName.arrivalTime}} </span>
{{item.flightName.dName}}-{{item.flightName.aName}}</span> <template v-if="uItem.flightName&&uItem.flightName.id">
</template> <br />
<template v-if="item.backFlightName"> <span style="color:blue;">去程:
<br /> {{uItem.flightName.startDateStr}} {{uItem.flightName.flight_number}}
<span style="color:blue;">回程: {{item.backFlightName.startDateStr}} {{uItem.flightName.departureTime}}-{{uItem.flightName.arrivalTime}}
{{item.backFlightName.flight_number}} {{uItem.flightName.dName}}-{{uItem.flightName.aName}}</span>
{{item.backFlightName.departureTime}}-{{item.backFlightName.arrivalTime}} </template>
{{item.backFlightName.dName}}-{{item.backFlightName.aName}}</span> <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>
</div> </template>
</div> </div>
<div style=" <div style="
float: right; float: right;
...@@ -5486,6 +5493,7 @@ ...@@ -5486,6 +5493,7 @@
"sellorder_post_GetTCNUMOrderList", "sellorder_post_GetTCNUMOrderList",
this.tuanMsg, this.tuanMsg,
(res) => { (res) => {
console.log("sellorder_post_GetTCNUMOrderList", res);
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.loading = false; this.loading = false;
this.total = res.data.data.count; this.total = res.data.data.count;
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 7cf1efe0
...@@ -2697,25 +2697,30 @@ ...@@ -2697,25 +2697,30 @@
childItem.UnionRemark childItem.UnionRemark
}}</span> }}</span>
</div> </div>
<div v-if="childItem.FlightName||childItem.BackFlightName"> <template v-if="childItem.OrderUnionFlightList&&childItem.OrderUnionFlightList.length>0">
联运信息：<span style="color: red">已配联运{{childItem.ConfigNum}}人,{{childItem.AirticketUnionNotes}} <template v-for="(uItem,uIndex) in childItem.OrderUnionFlightList">
<span v-if="childItem.IsSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span v-else>【暂定】</span> <div v-if="(uItem.FlightName&&uItem.FlightName.ID)||(uItem.BackFlightName&&uItem.BackFlightName.ID)" :key="uIndex">
</span> 联运信息：<span style="color: red">已配联运{{uItem.ConfigNum}}人,{{uItem.AirticketUnionNotes}}
<template v-if="childItem.FlightName"> <span v-if="uItem.IsSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span
<br /> v-else>【暂定】</span>
<span style="color:blue;">去程: </span>
{{childItem.FlightName.StartDateStr}} {{childItem.FlightName.Flight_number}} <template v-if="uItem.FlightName&&uItem.FlightName.ID">
{{childItem.FlightName.DepartureTime}}-{{childItem.FlightName.ArrivalTime}} <br />
{{childItem.FlightName.DName}}-{{childItem.FlightName.AName}}</span> <span style="color:blue;">去程:
</template> {{uItem.FlightName.StartDateStr}} {{uItem.FlightName.Flight_number}}
<template v-if="childItem.BackFlightName"> {{uItem.FlightName.DepartureTime}}-{{uItem.FlightName.ArrivalTime}}
<br /> {{uItem.FlightName.DName}}-{{uItem.FlightName.AName}}</span>
<span style="color:blue;">回程: </template>
{{childItem.BackFlightName.StartDateStr}} {{childItem.BackFlightName.Flight_number}} <template v-if="uItem.BackFlightName&&uItem.BackFlightName.ID">
{{childItem.BackFlightName.DepartureTime}}-{{childItem.BackFlightName.ArrivalTime}} <br />
{{childItem.BackFlightName.DName}}-{{childItem.BackFlightName.AName}}</span> <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>
</div> </template>
</div> </div>
</td> </td>
<td colspan="3" style="height: 40px"> <td colspan="3" style="height: 40px">
......
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