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

src/components/Hotel/roomReservations.vue

@@ -201,7 +201,9 @@
           //酒店编号
           HotelId: 0,
           //日期
-          DateStr: ""
+          DateStr: "",
+          //出团公司不限
+          OutBranchId:-1,
         },
         LineList: [],
         LineTeamList: [],
@@ -337,7 +339,6 @@
       }
       let width = window.innerWidth - 50
       let height = window.innerHeight - 65 - 164
-      console.log(height)
       this.boxHeight = height;
       this.offsetwidth = width
       this.getList()