Skip to content

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

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

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