From 7d5328858acf40cce39d0b434fdca7cefe49e5fd Mon Sep 17 00:00:00 2001
From: "HK\\Administrator" <461671400@qq.com>
Date: Mon, 19 Jun 2023 16:44:50 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/SalesModule/enrollTotal.vue | 21 +++++++++++++++----
src/components/SalesModule/groupTourOrder.vue | 19 +++++++++++++----
.../SalesModule/groupTourOrderByTuan.vue | 16 ++++++++++++--
.../TravelList/RegistrationList.vue | 18 +++++++++++++---
4 files changed, 61 insertions(+), 13 deletions(-)
diff --git a/src/components/SalesModule/enrollTotal.vue b/src/components/SalesModule/enrollTotal.vue
index 49898b7b6..2e7eb8f90 100644
--- a/src/components/SalesModule/enrollTotal.vue
+++ b/src/components/SalesModule/enrollTotal.vue
@@ -566,7 +566,7 @@
</td>
</tr>
<tr>
- <td colspan="4" class="groupTourOrder_remarks" style="height: 40px">
+ <td colspan="4" style="height: 40px">
<div v-if="item.gatherAddress" style="font-size: 14px;">
<span style="color: rgb(26, 168, 107);">集åˆåœ°ï¼š</span>
<span style="color: rgb(26, 168, 107);">{{ item.gatherAddress }}</span>
@@ -616,9 +616,22 @@
<span style="color: red;">è”è¿å¤‡æ³¨:</span>
<span style="color: red;">{{ item.unionRemark }}</span>
</div>
- <p v-if="item.airticketUnionNotes||item.configNum>0" style="color: red;font-size:10px;margin-top:5px;">
- 票务备注：<span style="color: red">å·²é…è”è¿{{item.configNum}}人,{{item.airticketUnionNotes}}</span>
- </p>
+ <div v-if="item.flightName||item.backFlightName">
+ è”è¿ä¿¡æ¯ï¼š<span style="color: red">å·²é…è”è¿{{item.configNum}}人,{{item.airticketUnionNotes}}</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>
+ </div>
</td>
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px">
<div>
diff --git a/src/components/SalesModule/groupTourOrder.vue b/src/components/SalesModule/groupTourOrder.vue
index 771c6946b..ecd54a26c 100644
--- a/src/components/SalesModule/groupTourOrder.vue
+++ b/src/components/SalesModule/groupTourOrder.vue
@@ -2231,10 +2231,21 @@
</div>
<p v-if="item.unionRemark" style="color: red;font-size:10px;margin-top:5px;">è”è¿å¤‡æ³¨ï¼š{{ item.unionRemark }}
</p>
- <p v-if="item.airticketUnionNotes||item.configNum>0" style="color: red;font-size:10px;margin-top:5px;">
- 票务备注：<span style="color: red">å·²é…è”è¿{{item.configNum}}人,{{item.airticketUnionNotes}}</span>
- </p>
-
+ <div v-if="item.flightName||item.backFlightName">
+ è”è¿ä¿¡æ¯ï¼š<span style="color: red">å·²é…è”è¿{{item.configNum}}人,{{item.airticketUnionNotes}}</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>
+ </div>
</td>
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px">
<div>
diff --git a/src/components/SalesModule/groupTourOrderByTuan.vue b/src/components/SalesModule/groupTourOrderByTuan.vue
index 6caec4a9c..3d05512f8 100644
--- a/src/components/SalesModule/groupTourOrderByTuan.vue
+++ b/src/components/SalesModule/groupTourOrderByTuan.vue
@@ -2433,8 +2433,20 @@
<span>è”è¿å¤‡æ³¨ï¼š{{ item.unionRemark }}</span>
</div>
- <div v-if="item.airticketUnionNotes||item.configNum>0" style="color: red">
- 票务备注：<span style="color: red">å·²é…è”è¿{{item.configNum}}人,{{item.airticketUnionNotes}}</span>
+ <div v-if="item.flightName||item.backFlightName">
+ è”è¿ä¿¡æ¯ï¼š<span style="color: red">å·²é…è”è¿{{item.configNum}}人,{{item.airticketUnionNotes}}</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>
</div>
</div>
<div style="
diff --git a/src/components/TravelManager/TravelList/RegistrationList.vue b/src/components/TravelManager/TravelList/RegistrationList.vue
index 9554db000..3052d6e58 100644
--- a/src/components/TravelManager/TravelList/RegistrationList.vue
+++ b/src/components/TravelManager/TravelList/RegistrationList.vue
@@ -2697,8 +2697,21 @@
childItem.UnionRemark
}}</span>
</div>
- <div v-if="childItem.AirticketUnionNotes||childItem.ConfigNum>0">
+ <div v-if="childItem.FlightName||childItem.BackFlightName">
è”è¿ä¿¡æ¯ï¼š<span style="color: red">å·²é…è”è¿{{childItem.ConfigNum}}人,{{childItem.AirticketUnionNotes}}</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>
</div>
</div>
</td>
@@ -4900,7 +4913,7 @@
this.$message.success("å–消æˆåŠŸï¼");
this.getList();
} else {
- this.$message.error(res.data.message)
+ this.$message.error(res.data.message)
}
},
(err) => {}
@@ -5921,7 +5934,6 @@
"sellorder_get_GetOrderListByTCID",
msg,
(res) => {
- console.log("sellorder_get_GetOrderListByTCID",res);
this.loading = false;
if (res.data.resultCode == 1) {
this.OrderDataList = res.data.data;
--
2.18.1