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

src/components/Hotel/HotelQueryList.vue

@@ -254,7 +254,7 @@
           StartDate: new Date().Format("yyyy-MM-dd"),
           EndDate: this.setEdate(),
           //只查询日本
-          Country: "651",
+          Country: "651,1252",
           Province: 0,
           City: 0,
           OutBranchId: -1,
@@ -412,7 +412,7 @@
       GetHotelList() {
         this.apipost(
           "hotel_post_GetHasStockHotelList", {
-            Country: 651,
+            QCountry: "651,1252",
             IsMoreThanZero: 1
           },
           res => {
@@ -573,8 +573,9 @@
         );
       },
       getBranchList() {
+        let UserInfo = this.getLocalStorage();
         this.apipost('admin_get_BranchGetList', {
-          RB_Group_Id: '2',
+          RB_Group_Id: UserInfo.RB_Group_id,
           Status: 0,
         }, res => {
           if (res.data.resultCode == 1) {
@@ -599,7 +600,7 @@
     mounted() {
       this.initSupplier();
       this.getBranchList();
-      this.getProvinceList(651, 1);
+      this.getProvinceList("651,1252", 1);
       this.GetHotelList();
       this.getList();
       this.GetHotelTipList();