新增单机票价格

src/assets/common/lang/en.js

@@ -2171,6 +2171,7 @@ export const salesModule = {
   ChildBed: 'Baby in bed',
   ChildNoBed: 'Children dont occupy the bed',
   SingleJ: 'single ground connection',
+  SingleAirticket:'Single Ticket',
   OtherPrice: 'other price',
   VisaBack: 'Visa Fee (return fee)',
   PeoPle: 'People',

src/assets/common/lang/jp.js

@@ -2082,6 +2082,7 @@ export const salesModule={
   ChildBed:'子どもがベッドをとる',
   ChildNoBed:'子供はベッドを取らない',
   SingleJ:'単接地',
+  SingleAirticket:'シングル航空券',
   OtherPrice:'その他価格',
   VisaBack:'査証料(さいりょうりょう)',
   PeoPle:'人',

src/assets/common/lang/zh-tw.js

@@ -2156,6 +2156,7 @@ export const salesModule={
   ChildBed:'小孩占床',
   ChildNoBed:'小孩不占床',
   SingleJ:'單地接',
+  SingleAirticket:'單機票',
   OtherPrice:'其他價格',
   VisaBack:'簽證費（退簽證費）',
   PeoPle:'人',

src/assets/common/lang/zh.js

@@ -2171,6 +2171,7 @@ export const salesModule={
   ChildBed:'小孩占床',
   ChildNoBed:'小孩不占床',
   SingleJ:'单地接',
+  SingleAirticket:'单机票',
   OtherPrice:'其他价格',
   VisaBack:'签证费（退签证费）',
   PeoPle:'人',

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -743,8 +743,12 @@
                           <td>
                             <b>{{item.SingleDMCPrice|priceFormat(item.SingleDMCPrice)}}</b>
                           </td>
+                          <td class="TC_cusTitle">{{$t('salesModule.SingleAirticket')}}</td>
+                          <td>
+                            <b>{{item.AirticketMoney|priceFormat(item.AirticketMoney)}}</b>
+                          </td>
                           <td class="TC_cusTitle">{{$t('op.RTXF')}}</td>
-                          <td colspan="3">
+                          <td>
                             <b>{{item.TipAmount|priceFormat(item.TipAmount)}}</b>
                           </td>
                         </tr>

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -457,7 +457,8 @@
                       :false-label="UnCheckedLessPrice">{{$t('op.CanLessPrice')}}
                     </el-checkbox>
                     <el-checkbox v-model="priceData.IsNeedAirportShuttle" @change="IsNeedAirportShuttleChange"
-                      :true-label="CheckedVaule" :false-label="UnCheckedLessPrice">{{$t('objFill.v101.myOrdersAllType.shifouxyst')}}
+                      :true-label="CheckedVaule" :false-label="UnCheckedLessPrice">
+                      {{$t('objFill.v101.myOrdersAllType.shifouxyst')}}
                     </el-checkbox>
                     <template v-if="CurrentUserInfo.RB_Group_id==2">
                       <input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true"
@@ -519,6 +520,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')">
@@ -704,7 +711,8 @@
                     </el-input>
                   </el-form-item>
                   <el-form-item>
-                    <span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('objFill.v101.myOrdersAllType.lindudtbdt')}}</span>
+                    <span class="TP_Sendprepend"
+                      style="margin:3px -1px 0 0">{{$t('objFill.v101.myOrdersAllType.lindudtbdt')}}</span>
                     <el-select class="w180" v-model="priceData.IsLeaderDaiTuan">
                       <template v-for="item in DaiTuanList">
                         <el-option :key="item.Id" :label="item.name" :value="item.Id">
@@ -718,7 +726,8 @@
                     </el-input>
                   </el-form-item>
                   <el-form-item>
-                    <span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('objFill.v101.myOrdersAllType.daoydtbdt')}}</span>
+                    <span class="TP_Sendprepend"
+                      style="margin:3px -1px 0 0">{{$t('objFill.v101.myOrdersAllType.daoydtbdt')}}</span>
                     <el-select class="w180" v-model="priceData.IsGuideDaiTuan">
                       <template v-for="item in DaiTuanList">
                         <el-option :key="item.Id" :label="item.name" :value="item.Id">
@@ -757,8 +766,8 @@
                     </el-input>
                   </el-form-item>
                   <el-form-item prop="SendPersion">
-                    <el-input class="w260" :disabled="!priceData.IsNeedAirportShuttle" :placeholder="$t('objFill.v101.myOrdersAllType.qingsrstr')"
-                      v-model="priceData.SendPersion">
+                    <el-input class="w260" :disabled="!priceData.IsNeedAirportShuttle"
+                      :placeholder="$t('objFill.v101.myOrdersAllType.qingsrstr')" v-model="priceData.SendPersion">
                       <template slot="prepend">{{$t('objFill.v101.myOrdersAllType.shongtuanr')}}</template>
                     </el-input>
                   </el-form-item>
@@ -907,7 +916,8 @@
                       </el-select>
                     </el-form-item>
                     <el-form-item style="margin-top:1px;">
-                      <span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('objFill.v101.myOrdersAllType.baojiaddz')}}</span>
+                      <span class="TP_Sendprepend"
+                        style="margin:3px -1px 0 0">{{$t('objFill.v101.myOrdersAllType.baojiaddz')}}</span>
                       <el-upload class="upload-demo" style="display:inline-block;position:relative;top:-1px;left:3px;"
                         :http-request="uploadFileBtn" :multiple="true" :show-file-list="false" action="">
                         <el-button size="small" type="primary">{{$t('objFill.shangchuan')}}</el-button>
@@ -1814,7 +1824,8 @@
           parseInt(this.priceData.FSeat);
         if (Number(fitem.TicketNum) - Number(fitem.OtherTeamUseNum) < Number(fitem.BindNum)) {
           fitem.BindNum = 0;
-          this.Error(this.$t('objFill.v101.myOrdersAllType.zuiduoznbd') + (Number(fitem.TicketNum) - Number(fitem.OtherTeamUseNum)) + this.$t('objFill.v101.myOrdersAllType.gejiwei'));
+          this.Error(this.$t('objFill.v101.myOrdersAllType.zuiduoznbd') + (Number(fitem.TicketNum) - Number(fitem
+            .OtherTeamUseNum)) + this.$t('objFill.v101.myOrdersAllType.gejiwei'));
         }
         this.selectFilghtList.forEach((x, index) => {
           if (x.IsSelected) {
@@ -1920,9 +1931,9 @@
             that.$emit("saveMsg");
           }
           if (type == 2) {
-            that.btnTongBu = this.$t('objFill.v101.myOrdersAllType.tongbujd')+'...';
+            that.btnTongBu = this.$t('objFill.v101.myOrdersAllType.tongbujd') + '...';
           } else {
-            that.btnText = this.$t('pub.saveBtn')+'...';
+            that.btnText = this.$t('pub.saveBtn') + '...';
           }
         });
       },

src/components/orderCommon/productOrderList.vue

@@ -592,7 +592,8 @@
             <p>
               <span>{{ $t("scen.sc_cp") }}</span>{{ item.OutBranchName }}
               <span class="TC_neibu" style="float: inherit;color: #ffffff;margin-left: 5px;"
-                v-if="item.StandardCurrencyName" :class="{'TCneibu':item.StandardCurrencyName=='人民币','TCb2b':item.StandardCurrencyName=='日元',
+                v-if="item.StandardCurrencyName"
+                :class="{'TCneibu':item.StandardCurrencyName=='人民币','TCb2b':item.StandardCurrencyName=='日元',
                 'TCb2c':item.StandardCurrencyName=='新台币','AppPlat':item.StandardCurrencyName=='',
                 'otherPlat':item.StandardCurrencyName=='',}">{{item.StandardCurrencyName}}{{$t('objFill.jiesuan')}}</span>
             </p>
@@ -729,6 +730,14 @@
                         }}
                       </td>
                     </tr>
+                    <tr>
+                      <td>{{ $t("salesModule.SingleAirticket") }}</td>
+                      <td colspan="5">
+                        {{
+                          item.AirticketMoney | priceFormat(item.AirticketMoney)
+                        }}
+                      </td>
+                    </tr>
                     <tr>
                       <td>{{ $t("Operation.Op_baby") }}</td>
                       <td colspan="5">
@@ -959,7 +968,8 @@
                       " icon="iconfont icon-erweima"></el-button>
                 </el-popover>
               </el-tooltip>
-              <el-tooltip class="item" effect="dark" :content="$t('objFill.guangaosl') + item.AdvertCount" placement="top-start">
+              <el-tooltip class="item" effect="dark" :content="$t('objFill.guangaosl') + item.AdvertCount"
+                placement="top-start">
                 <el-button type="primary" style="background-color: #e95252 !important; border-color: #e95252 !important"
                   v-if="!TCIDList" icon="iconfont icon-guanggao" @click="goUrlX(item)"></el-button>
               </el-tooltip>
@@ -997,7 +1007,8 @@
       <commonTeamInfo ref="comTeam"></commonTeamInfo>
     </el-dialog>
     <!-- 行程下载 -->
-    <el-dialog custom-class="w450" :title="$t('Operation.Op_tripDownLoad')" :visible.sync="travelControlTripLayerShow" center>
+    <el-dialog custom-class="w450" :title="$t('Operation.Op_tripDownLoad')" :visible.sync="travelControlTripLayerShow"
+      center>
       <tripDownLoadCommon ref="tripDownLoadCommon" :tripObj="tripObj" @headCallBack="hideTripDown" :downType="1">
       </tripDownLoadCommon>
     </el-dialog>