页面修改

src/components/SalesModule/groupTourOrder.vue

@@ -2236,26 +2236,19 @@
               </div>
               <p v-if="item.unionRemark" style="color: red;font-size:10px;margin-top:5px;">联运备注：{{ item.unionRemark }}
               </p>
-              <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 v-if="item.orderGuestFlightList&&item.orderGuestFlightList.length>0">
+                <template v-for="(uItem,uIndex) in item.orderGuestFlightList">
+                  <div :key="uIndex+20000">
+                    {{uItem.guestNames}} 航班信息：
+                    <span v-if="uItem.isSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span v-else>【暂定】</span>
+                    <br />
+                    <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>
+                      <br :key="sfIndex+40000" />
                     </template>
                   </div>
                 </template>

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -2436,32 +2436,24 @@
                     <div v-if="item.unionRemark" style="color: red">
                       <span>联运备注：{{ item.unionRemark }}</span>
                     </div>
-                    <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>
+                   <template v-if="item.orderGuestFlightList&&item.orderGuestFlightList.length>0">
+                    <template v-for="(uItem,uIndex) in item.orderGuestFlightList">
+                      <div :key="uIndex+20000">
+                        {{uItem.guestNames}} 航班信息：
+                        <span v-if="uItem.isSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span
+                          v-else>【暂定】</span>
+                        <br />
+                        <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>
-                          <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>
+                          <br :key="sfIndex+40000" />
+                        </template>
+                      </div>
                     </template>
+                  </template>
                   </div>
                   <div style="
                       float: right;