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

src/components/FinancialModule/addFinancialDocuments.vue

@@ -1210,9 +1210,6 @@ export default {
                     if(this.$route.query.InPay)
                     {
                         this.msg.Type=this.$route.query.InPay;
-                    }else
-                    {
-                        this.msg.Type=this.$route.query.Type;
                     }
                 }else{
                     this.loading=false;

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -1356,9 +1356,6 @@ export default {
                     if(this.$route.query.InPay)
                     {
                         this.msg.Type=this.$route.query.InPay;
-                    }else
-                    {
-                        this.msg.Type=this.$route.query.Type;
                     }
                 }else{
                     this.loading=false;

src/components/SalesModule/productQuery.vue

@@ -664,7 +664,7 @@
                           </td>
                           <td>{{ds.StopoverName}}</td>
                           <td>
-                            <span v-if="item.OutNotice==1" style="color: rgb(71, 191, 140)!important;">确定</span>
+                            <span v-if="ds.FlightState==1" style="color: rgb(71, 191, 140)!important;">OK</span>
                             <span v-else style="color: red !important;">暂定</span>
                           </td>
                         </tr>

src/components/Ticketing/PassengerList.vue

@@ -155,10 +155,10 @@
     </el-pagination>
 
     <el-dialog custom-class='passgenrDialog' title="航班列表" :visible.sync="outerVisible" center>
-      <div style="border-bottom:1px solid #d1d1d1;">
+      <!-- <div style="border-bottom:1px solid #d1d1d1;">
           <table border=0 class="pg_table">
               <tr>
-                  <td width="50" style="vertical-align:top;position:relative;" class="">
+                  <td width="60" style="vertical-align:top;position:relative;" class="">
                     <span class="Pgzhu">票务信息</span>
                   </td>
               
@@ -195,7 +195,7 @@
               </tr>
               
               <tr>
-                  <td width="50" style="vertical-align:top;">联运信息</td>
+                  <td width="60" style="vertical-align:top;">联运信息</td>
                   <td>
                        <div class="PgflightDiv" v-for="item in flightList" v-if="item.FlightSubType==3">
                           <p>
@@ -240,33 +240,33 @@
                   </td>
               </tr>
               <tr v-for="subItem in item.List">
-                  <td>{{subItem.CityName}}去程</td>
+                  <td width="60">{{subItem.CityName}}去程</td>
                   <td>
                       <div class="PgflightDiv" v-for="childItem in subItem.List" v-if="childItem.FlightSubType==1">
                           <p>
                             <span class="iconfont icon-hangban"></span>
                             <span>{{item.Flight_number}}</span>
                             <span>
-                                <el-input class="w60" v-model="item.TicketDepartureTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input> -
-                                <el-input class="w60" v-model="item.TicketArrivalTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input>
+                                <el-input class="w60" v-model="childItem.Departure_time" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input> -
+                                <el-input class="w60" v-model="childItem.Arrival_time" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input>
                             </span>
                           </p>
-                          <el-tooltip class="item" effect="dark" :content="item.FlightDate" placement="top-start"
+                          <el-tooltip class="item" effect="dark" :content="childItem.FlightDate" placement="top-start"
                                       popper-class="max-w250">
                             <p class="_add_info">
-                              <span>{{$t('Airticket.Air_StartTime')}}：{{item.FlightDate}}</span>
+                              <span>{{$t('Airticket.Air_StartTime')}}：{{childItem.FlightDate}}</span>
                             </p>
                           </el-tooltip>
-                          <el-tooltip class="item" effect="dark" :content="item.dName" placement="top-start"
+                          <el-tooltip class="item" effect="dark" :content="childItem.dName" placement="top-start"
                                       popper-class="max-w250">
                             <p class="_add_info">
-                              <span>{{$t('system.query_flightAir')}}：{{item.dName}}</span>
+                              <span>{{$t('system.query_flightAir')}}：{{childItem.dName}}</span>
                             </p>
                           </el-tooltip>
-                          <el-tooltip class="item" effect="dark" :content="item.aName" placement="top-start"
+                          <el-tooltip class="item" effect="dark" :content="childItem.aName" placement="top-start"
                                       popper-class="max-w250">
                             <p class="_add_info">
-                              <span>{{$t('system.query_arrivalAir')}}：{{item.aName }}</span>
+                              <span>{{$t('system.query_arrivalAir')}}：{{childItem.aName }}</span>
                             </p>
                           </el-tooltip>
                       </div>
@@ -280,7 +280,45 @@
               </tr>  
             </tbody>
           </table>
-      </div>
+      </div> -->
+      <table border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
+          <tr>
+              <th>航班号</th>
+              <th>开始时间</th>
+              <th>结束时间</th>
+              <th>出发时间</th>
+              <th>起飞机场</th>
+              <th>到达机场</th>
+          </tr>
+          <tr v-for="item in flightList">
+            <td>{{item.Flight_number}}</td>
+            <td>{{item.TicketDepartureTime}}</td>
+            <td>{{item.TicketArrivalTime}}</td>
+            <td>{{item.FlightDate}}</td>
+            <td>{{item.dName}}</td>
+            <td>{{item.aName}}</td>
+          </tr>
+      </table>
+      <table border="0" cellspacing="0" cellpadding="0" class="singeRowTable" style="margin-top:20px;">
+          <tr>
+              <th>航班号</th>
+              <th>开始时间</th>
+              <th>结束时间</th>
+              <th>出发时间</th>
+              <th>起飞机场</th>
+              <th>到达机场</th>
+          </tr>
+          <template v-for="item in combineTeamList">
+            <tr v-for="subItem in item.List">
+              <td>{{subItem.Flight_number}}</td>
+              <td>{{subItem.TicketDepartureTime}}</td>
+              <td>{{subItem.TicketArrivalTime}}</td>
+              <td>{{subItem.FlightDate}}</td>
+              <td>{{subItem.dName}}</td>
+              <td>{{subItem.aName}}</td>
+            </tr>
+          </template>
+      </table>
       <div slot="footer" class="dialog-footer">
         <button class="normalBtn" type="primary" @click="getCheckInfo()">确认航班信息</button> &nbsp;
         <button class="hollowFixedBtn" @click="outerVisible = false">{{$t('pub.cancelBtn')}}</button>

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -396,7 +396,7 @@
                           ({{subItem.DIATA}}){{subItem.DepartureName}}
                           {{subItem.StopoverName==''?'':'-('+subItem.StopoverIATA+')'+subItem.StopoverName}}
                           {{subItem.ArrivalCityName==''?'':'-('+subItem.AIATA+')'+subItem.ArrivalCityName}}
-                          <span v-if="item.OutNotice==1" class="TCL-greenType">【确定】</span>
+                          <span v-if="subItem.FlightState==1" class="TCL-greenType">【OK】</span>
                           <span v-else class="TCL-redType">【暂定】</span>
                         </span>
                       </div>

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -324,7 +324,7 @@
                           {{subItem.DepartureName}}
                           {{subItem.StopoverName==""?"":"-"+subItem.StopoverName}}
                           {{subItem.ArrivalCityName==""?"":"-"+subItem.ArrivalCityName}}
-                          <span v-if="subItem.OutNotice==1" class="TCL-greenType">【确定】</span>
+                          <span v-if="subItem.FlightState==1" class="TCL-greenType">【OK】</span>
                           <span v-else class="TCL-redType">【暂定】</span>
                         </span>
                       </div>

src/components/confirmationOrderDownLoad.vue

@@ -161,7 +161,7 @@
                   <td>{{flight.arrivalAirPortName}}<span class="citycode"></span></td>
                   <td width="18" class="gap">&nbsp;</td>
                   <td width="140">{{flight.alName}}</td>
-                  <td width="110">{{flight.flightNumber}}({{(priceList.length>0&&priceList[0].outNotice==1)?"OK":"暂定"}})</td>
+                  <td width="110">{{flight.flightNumber}}({{(flight.flightState==1)?"OK":"暂定"}})</td>
                 </tr>
               </tbody>
               <tbody v-else-if="priceList.length>0&&priceList[0].priceFlight&&priceList[0].priceFlight.length>0">
@@ -173,7 +173,7 @@
                   <td>{{flight.arrivalAirPortName}}<span class="citycode"></span></td>
                   <td width="18" class="gap">&nbsp;</td>
                   <td width="140">{{flight.alName}}</td>
-                  <td width="110">{{flight.flightNumber}}({{(priceList.length>0&&priceList[0].outNotice==1)?"OK":"暂定"}})</td>
+                  <td width="110">{{flight.flightNumber}}({{(flight.flightState==1)?"OK":"暂定"}})</td>
                 </tr>
               </tbody>
               <tbody v-else>