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

src/components/SalesModule/BulkAirTicketOrders.vue

@@ -45,7 +45,7 @@
     <div style="width: 100%; height: auto;min-height:500px;overflow-x: auto;" class="ownScrollbarStyle">
       <table class="groupTourOrderSearchTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
         <tr class="title_tr">
-          <th>{{$t('sm.danhao')}}</th>
+          <th>{{$t('fnc.danhao')}}</th>
           <th width="70">{{$t('fnc.khxinxi')}}</th>
           <th>{{$t('sm.airbianma')}}</th>
           <th>{{$t('sm.kerenshul')}}</th>

src/components/SalesModule/ScenTicketOrderSale.vue

@@ -228,7 +228,7 @@
       <tr>
         <th>{{$t('hotel.order_Number')}}</th>
         <th>{{$t('restaurant.res_Number')}}</th>
-        <th>{{$t('salesModule.zonge')}}</th>
+        <th>{{$t('sm.zonge')}}</th>
         <th>{{$t('fnc.yishoujine')}}</th>
         <th>{{$t('fnc.tkjine')}}</th>
         <th>{{$t('Operation.Op_daishou')}}</th>

src/components/SalesModule/groupTourOrder.vue

@@ -1746,7 +1746,7 @@
               <template v-if="item.contractNum.length==0">
                 <el-upload v-if='item.confirmFileList.length==0&&item.commissionSharePeople !== userId'
                   :http-request="uploadFileBtn" :multiple="false" :show-file-list="false" action=''>
-                  <el-button size="small" type="danger" @click='getItem(item)'>{{$t('admin.adm_content')}}</el-button>
+                  <el-button size="small" type="danger" @click='getItem(item)'>{{$t('adm.adm_content')}}</el-button>
                 </el-upload>
               </template>
             </td>