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

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -450,7 +450,7 @@
                   <p class="TCLflight_GO">
                     <i class="iconfont icon-hangban1"></i>{{$t('visa.v_hangban')}}
                   </p>
-               <el-popover width="900" trigger="click" popper-class="TC_tripDetails">
+                  <el-popover width="900" trigger="click" popper-class="TC_tripDetails">
                     <table width="100%" border="0" cellspacing="0" cellpadding="0">
                       <template v-for="(nItem,newIndex) in item.newFlightList">
                         <tr class="_color_666" style="text-align: center" :key="`hf_`+newIndex">
@@ -460,7 +460,8 @@
                           <th width="80">{{ $t("system.query_arrivalTime") }}</th>
                           <th width="100">{{ $t("system.query_stopCity") }}</th>
                         </tr>
-                        <tr v-for="(fItem, fIndex) in nItem.flightList" :key="`hd_`+newIndex+`d_`+fIndex" style="text-align: center">
+                        <tr v-for="(fItem, fIndex) in nItem.flightList" :key="`hd_`+newIndex+`d_`+fIndex"
+                          style="text-align: center">
                           <td class="_d_name _color_666">
                             <span v-if="fIndex == 0">{{ $t("Airticket.Air_go") }}</span>
                             <span v-else-if="fIndex == item.flightList.length - 1">{{
@@ -499,8 +500,8 @@
                     <div class="FlightDiv-TCL" slot="reference">
                       <template v-if="item.UseFlightType == 0">
                         <template v-for="(nItem,newIndex) in item.newFlightList">
-                          <div v-for="(subItem) in nItem.flightList" slot="reference" :key="`f_`+newIndex+`_`+subItem.ID"
-                            class="TCL-flighInfoList">
+                          <div v-for="(subItem) in nItem.flightList" slot="reference"
+                            :key="`f_`+newIndex+`_`+subItem.ID" class="TCL-flighInfoList">
                             <span class="travelnowrap">
                               <span class="TCL-FlightNumber">{{
                               subItem.Flight_number
@@ -702,9 +703,17 @@
                           <td class="TC_cusTitle">{{$t('Operation.Op_baby')}}</td>
                           <td><b>{{item.BabyPrice|priceFormat(item.BabyPrice)}}</b></td>
                           <td class="TC_cusTitle">{{$t('Operation.Op_spickupPrice')}}</td>
-                          <td colspan="5">
+                          <td>
                             <b>{{item.SingleDMCPrice|priceFormat(item.SingleDMCPrice)}}</b>
                           </td>
+                          <td class="TC_cusTitle">
+                            {{ $t("salesModule.SingleAirticket") }}
+                          </td>
+                          <td colspan="3">
+                            <b>{{
+                              item.AirticketMoney | priceFormat(item.AirticketMoney)
+                            }}</b>
+                          </td>
                         </tr>
                         <tr>
                           <td rowspan="2" style="text-align:center">

src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue

@@ -512,7 +512,8 @@
                   </el-form-item> -->
                   <el-form-item prop="B2BPrice">
                     <el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.B2BPrice"
-                      @keyup.native="checkPrice(priceData,'B2BPrice')" :disabled="CurrentUserInfo.RB_Group_id==2&&priceData.TCID>0">
+                      @keyup.native="checkPrice(priceData,'B2BPrice')"
+                      :disabled="CurrentUserInfo.RB_Group_id==2&&priceData.TCID>0">
                       <template slot="prepend">{{$t('Operation.Op_fellow')}}</template>
                     </el-input>
                   </el-form-item>
@@ -524,7 +525,8 @@
                   </el-form-item> -->
                   <el-form-item prop="B2CPrice">
                     <el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.B2CPrice"
-                      @keyup.native="checkPrice(priceData,'B2CPrice')" :disabled="CurrentUserInfo.RB_Group_id==2&&priceData.TCID>0">
+                      @keyup.native="checkPrice(priceData,'B2CPrice')"
+                      :disabled="CurrentUserInfo.RB_Group_id==2&&priceData.TCID>0">
                       <template slot="prepend">{{$t('Operation.Op_direct')}}</template>
                     </el-input>
                     <!--印象票务-->
@@ -583,6 +585,12 @@
                       <template slot="prepend">{{$t('salesModule.SingleJ')}}</template>
                     </el-input>
                   </el-form-item>
+                  <el-form-item>
+                    <el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
+                      v-model="priceData.AirticketMoney" @keyup.native="checkPrice(priceData,'AirticketMoney')">
+                      <template slot="prepend">{{$t('salesModule.SingleAirticket')}}</template>
+                    </el-input>
+                  </el-form-item>
                   <el-form-item>
                     <el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.TipAmount"
                       @keyup.native="checkPrice(priceData,'TipAmount')">