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

src/components/TravelManager/TravelList/TravelpassengerList.vue

@@ -100,9 +100,9 @@
           </table>
         </li>
         <li>
-          <input type="button" class="normalBtn" v-if="allDIs" :value="$t('objFill.v101.quxfxbquer')" @click="querenHotel(0)">
-          <input type="button" class="normalBtn" :value="$t('op.FFBDowmLoad')" @click="exportExcel_singleRoom()">
-          <input type="button" class="normalBtn" :value="$t('objFill.v101.lvkemdxiaz')" @click="exportExcel()">
+          <input type="button" class="normalBtn" v-if="allDIs" :value="$t('objFill.v101.quxfxbquer')" @click="querenHotel(0)" />
+          <input type="button" class="normalBtn" :value="$t('op.FFBDowmLoad')" @click="exportExcel_singleRoom()" />
+          <input type="button" class="normalBtn" :value="$t('objFill.v101.lvkemdxiaz')" @click="exportExcel()" />
         </li>
       </ul>
     </div>
@@ -140,7 +140,7 @@
       <tbody>
         <tr v-for="(subItem, subIndex) in dataList" :class="{'redTr':subItem.VisaState==1}">
           <td>{{subIndex+1}}</td>
-          <td width="80" style="padding: 3px;">
+          <td width="100" style="padding: 3px;">
             <el-select v-model="subItem.HouseNo" :placeholder="$t('pub.pleaseSel')" @change="sortNumberN(subItem, subIndex)">
               <el-option v-for="(hs, hsIndex) in numberList"
                 :disabled="(subItem.HouseType == 1 && IsLeaderGuide == 1) || hs.dis || allDIs" :key="hs.name"
@@ -469,10 +469,10 @@
           isGetZiYouXing: 0, //查询自由行
           isOnlyFenFang: 1, //只查询已分房的
         };
-        var fileName = this.$t('salesModule.LKMD')+".xls";
+        var fileName = this.$t('op.FFBDowmLoad')+".xls";
         if (this.QueryMsg.TeamInfoData != null) {
           fileName =
-            "【" + this.QueryMsg.TeamInfoData[0].TCNUM + "】"+this.$t('salesModule.LKMD')+"[" + this.getCurrentTime() + "].xls";
+            "【" + this.QueryMsg.TeamInfoData[0].TCNUM + "】"+this.$t('op.FFBDowmLoad')+'.xls';
         }
         this.GetLocalFile("travel_get_GetTravelRoomExport", msg, fileName, res => {
           this.QueryMsg.loading = false;