页面修改

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>

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>

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="

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;