页面修改

src/components/SalesModule/enrollTotal.vue

@@ -617,7 +617,10 @@
               <span style="color: red;">{{ item.unionRemark }}</span>
             </div>
             <div v-if="item.flightName||item.backFlightName">
-              联运信息：<span style="color: red">已配联运{{item.configNum}}人,{{item.airticketUnionNotes}}</span>
+              联运信息：<span style="color: red">已配联运{{item.configNum}}人,{{item.airticketUnionNotes}}2
+
+                <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;">去程:

src/components/SalesModule/groupTourOrder.vue

@@ -2232,7 +2232,9 @@
               <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>
+                联运信息：<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}}

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -2434,7 +2434,9 @@
                     </div>
 
                     <div v-if="item.flightName||item.backFlightName">
-                      联运信息：<span style="color: red">已配联运{{item.configNum}}人,{{item.airticketUnionNotes}}</span>
+                      联运信息：<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}}
@@ -2443,7 +2445,8 @@
                       </template>
                       <template v-if="item.backFlightName">
                         <br />
-                        <span style="color:blue;">回程: {{item.backFlightName.startDateStr}} {{item.backFlightName.flight_number}}
+                        <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>

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -2698,16 +2698,19 @@
                     }}</span>
                   </div>
                   <div v-if="childItem.FlightName||childItem.BackFlightName">
-                    联运信息：<span style="color: red">已配联运{{childItem.ConfigNum}}人,{{childItem.AirticketUnionNotes}}</span>
+                    联运信息：<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}}
+                      <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;">回程:
+                      <span style="color:blue;">回程:
                         {{childItem.BackFlightName.StartDateStr}} {{childItem.BackFlightName.Flight_number}}
                         {{childItem.BackFlightName.DepartureTime}}-{{childItem.BackFlightName.ArrivalTime}}
                         {{childItem.BackFlightName.DName}}-{{childItem.BackFlightName.AName}}</span>