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

src/components/FinancialModule/FinancialDocuments.vue

@@ -1338,9 +1338,6 @@
         </el-table>
 
       </div>
-      <div class="noData" v-show="noData">
-        {{$t('system.content_noData')}}
-      </div>
       <div v-if="!BOSSBtn && !BOSSBtn2">
         <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
           :current-page.sync="currentPage" layout="total,sizes,prev, pager, next, jumper" :page-size='msg.pageSize'

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -2688,8 +2688,8 @@ export default {
         handler (val, oldVal) {
           if (this.$route.query.BranchId) {
             this.msg.OutBranchId = Number(this.$route.query.BranchId)
-            this.financeinfo_post_GetList()
           }
+          this.financeinfo_post_GetList()
         },
         deep: true,
         immediate: true

src/components/Ticketing/seatStatistics.vue

@@ -242,6 +242,19 @@
             </el-select>
           </span>
         </li>
+        <li>
+          <span>
+            <em>
+              {{ $t("system.query_airCompanyName") }}
+            </em>
+          </span>
+          <el-select v-model="msg.QAirlineId" filterable :placeholder="$t('system.ph_buxian')" class="w150">
+            <el-option :label="$t('system.ph_buxian')" :value="0">
+            </el-option>
+            <el-option v-for="item in AirlineList" :key="item.AirLineId" :label="item.AlName" :value="item.AirLineId">
+            </el-option>
+          </el-select>
+        </li>
         <li>
           <span>
             <em>{{$t('admin.admin_czPerson')}}</em>
@@ -320,7 +333,8 @@
           QCityId: 0,
           //操作人
           QCreateBy: "",
-          FlightDate: ""
+          FlightDate: "",
+          QAirlineId: "", //航空公司
         },
         //线路列表
         LineList: [],
@@ -338,10 +352,24 @@
         EmployeeList: [],
         TotalCount: 0,
         TotalSeat: 0,
-        loading:false
+        loading: false,
+        //航空公司
+        AirlineList: [],
       };
     },
     methods: {
+      //获取航空公司
+      getAirlineList() {
+        this.apipost(
+          "airline_post_GetList", {},
+          (res) => {
+            if (res.data.resultCode == 1) {
+              this.AirlineList = res.data.data;
+            }
+          },
+          (err) => {}
+        );
+      },
       //获取线路列表
       GetLineList() {
         this.apipost(
@@ -410,13 +438,13 @@
       },
       //点击获取机票库存数据
       GetHoltelInventory() {
-        this.loading=true;
+        this.loading = true;
         this.msg.FlightDate = this.currentYear + "-" + this.currentMonth + "-01";
         this.apipost(
           "AirTicket_get_GetMonthAirticketFlight",
           this.msg,
           res => {
-            this.loading=false;
+            this.loading = false;
             this.DayData = res.data.data;
             this.TotalCount = 0;
             this.TotalSeat = 0;
@@ -488,6 +516,7 @@
       let myDate = new Date();
       this.currentYear = myDate.getFullYear();
       this.currentMonth = myDate.getMonth() + 1;
+      this.getAirlineList();
       this.getEmployeeList();
       this.getCityList();
       this.GetLineList();

src/components/scenicSpot/scenicSpotSalesBoard.vue

@@ -205,7 +205,7 @@
           <span>
             <em>{{$t('commonPickUp.Pick_attractions')}}</em>
             <el-select v-model="msg.CouponsIdList" :placeholder="$t('pub.pleaseSel')" multiple collapse-tags filterable
-              @change="getMultipleChoice" @clear="getMultipleChoice">
+              :remote-method="getSecnicData" remote reserve-keyword>
               <el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option>
               <el-option v-for="item in ScenicList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
             </el-select>
@@ -264,7 +264,8 @@
         <div>
           <p v-for="(item,subIndex) in dayItem.dayValue" :key="`d_`+index+`s_`+subIndex" style="padding-bottom:10px;">
             <el-tooltip class="item" effect="dark"
-              :content="`地接团号:`+item.BookGroup+`,公司团号:`+item.TCNUM+`(`+item.TCID+`),总机位:`+item.TotalSeatNum" placement="top">
+              :content="`地接团号:`+item.BookGroup+`,公司团号:`+item.TCNUM+`(`+item.TCID+`),总机位:`+item.TotalSeatNum"
+              placement="top">
               <span class="text_underLine">
                 {{item.TicketName}}（{{item.TicketNum}}）
               </span>
@@ -283,9 +284,7 @@
         msg: {
           Year: 0,
           Month: 0,
-          CouponsId: 0,
           CouponsIdList: [],
-          CouponsIds: '',
           QStatus: 0,
           loading: false,
           uid: 0,
@@ -303,27 +302,6 @@
       };
     },
     methods: {
-      // 多选
-      getMultipleChoice() {
-        this.msg.CouponsId = 0;
-        if (this.msg.CouponsIdList.length > 1) {
-          if (this.msg.CouponsIdList.at(-1) == 0) {
-            this.msg.CouponsIdList = [0]
-          } else if (this.msg.CouponsIdList.at(-1) != 0) {
-            this.msg.CouponsIdList.forEach((x, index) => {
-              if (x == 0) {
-                this.msg.CouponsIdList.splice(index, 1)
-              }
-            })
-          }
-          this.msg.CouponsId = 0;
-          this.msg.CouponsIds = this.msg.CouponsIdList.join(',')
-        }
-        if (this.msg.CouponsIdList.length == 1) {
-          this.msg.CouponsId = this.msg.CouponsIdList[0]
-          this.msg.CouponsIds = ''
-        }
-      },
       stockColor: function (type) {
         if (type === 1) {
           return 'hasStock_1'
@@ -412,43 +390,37 @@
         );
       },
       //获取酒店列表
-      GetScenicList() {
+      getSecnicData(keyWords) {
+        this.ScenicList = [];
         var postMsg = {
           QCountrys: "",
           IsFree: 1,
+          Name: "",
         };
+        if (keyWords && keyWords != '') {
+          postMsg.Name = keyWords;
+        }
         if (this.userInfo.RB_Group_id == 2) {
           postMsg.QCountrys = "651";
         }
+        console.log("getSecnicData", postMsg);
         this.apipost(
           "ticketcoupons_post_GetList", postMsg,
           res => {
             if (res.data.resultCode == 1) {
               this.ScenicList = res.data.data;
             }
-          },
-          err => {}
+          }
         );
       },
       //下载餐厅统计
       DownLoadDinnerSalesBoard() {
-        if (this.msg.CouponsId <= 0 && !this.msg.CouponsIds) {
-          this.Info(this.$t('sm.qxzjingdian'));
-          return;
-        }
-        let url = "";
-        //单门票下载
-        if (this.msg.CouponsId > 0) {
-          url = 'ticketcouponsorder_post_DownLoadScenicMonthStatistics'
-        }
-        //多门票下载 
-        else {
-          url = 'ticketcouponsorder_post_DownLoadScenicMonthStatisticsNew'
-        }
+        let cmdStr = "";
+        cmdStr = 'ticketcouponsorder_post_DownLoadScenicMonthStatisticsNew'
         this.msg.loading = true;
         this.msg.uid = this.userInfo.EmployeeId;
         let fileName = "门票下载" + this.$commonUtils.getCurrentDate() + ".xls";
-        this.GetLocalFile(url, this.msg, fileName,
+        this.GetLocalFile(cmdStr, this.msg, fileName,
           res => {
             this.msg.loading = false;
           });
@@ -463,7 +435,7 @@
       this.msg.Year = this.currentYear;
       this.msg.Month = this.currentDay;
 
-      this.GetScenicList();
+      this.getSecnicData();
       this.initCalendar();
       this.GetHoltelInventory();
     }