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

src/components/Hotel/HotelSalesBoard.vue

@@ -258,7 +258,9 @@
         </li>
         <li style="margin-right:50px;">
           <button class="normalBtn" type="button" @click="GetHoltelInventory()">{{$t('pub.searchBtn')}}</button>
-          <input type="button" class="normalBtn" value="下载" @click="DownLoadHotelSalesBoard()" />
+          <input type="button" class="normalBtn" value="下载(单个酒店)" @click="DownLoadHotelSalesBoard()" />
+
+          <input type="button" class="normalBtn" value="下载(全部)" @click="DownLoadAllHotelSalesBoard()" />
         </li>
       </ul>
     </div>
@@ -335,7 +337,7 @@
           loading: false,
           OutBranchId: -1,
           //供应商编号
-          Supplier:0,
+          Supplier: 0,
         },
         //分公司列表
         companyList: [],
@@ -358,7 +360,7 @@
         cityList: [],
         district: [],
         //供应商列表
-        SupplierList:[]
+        SupplierList: []
       };
     },
     methods: {
@@ -546,7 +548,20 @@
           this.Info("请选择要下载的酒店!");
         }
       },
-          // 获取供应商
+      //全部下载
+      DownLoadAllHotelSalesBoard() {
+        this.msg.loading = true;
+        let qMsg = {
+          queryMsg: this.msg,
+          uid: this.getLocalStorage().EmployeeId
+        };
+        let fileName = "酒店统计" + this.$commonUtils.getCurrentDate() + ".xls";
+        this.GetLocalFile("hotel_get_downloadAllHotel", qMsg, fileName,
+          res => {
+            this.msg.loading = false;
+          });
+      },
+      // 获取供应商
       initSupplier() {
         this.apipost("supplier_post_GetAllList", {
           Type: 1