酒店统计新增公司查询项

src/components/Hotel/HotelSalesBoard.vue

@@ -188,15 +188,17 @@
 
   .hotelSalesBoard .hasStock_3 {
     background-color: #bcd6ee;
-  
+
   }
 
   .hotelSalesBoard .hasStock_4 {
     background-color: #DDDDDD;
   }
- .hotelSalesBoard .hasStock_5 {
+
+  .hotelSalesBoard .hasStock_5 {
     background-color: #02F78E;
   }
+
   /* 日期样式结束*/
 
 </style>
@@ -218,6 +220,16 @@
             </el-select>
           </span>
         </li>
+        <li>
+          <span><em>{{$t('admin.admin_company')}}</em>
+            <el-select filterable v-model='msg.OutBranchId'
+              :placeholder="$t('pub.unlimitedSel')">
+              <el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
+              <el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key="item.Id">
+              </el-option>
+            </el-select>
+          </span>
+        </li>
         <li>
           <span>
             <em>酒店</em>
@@ -237,11 +249,11 @@
       <span class="Owe_Room">{{TotalInventory}}</span> 间, 使用
       <span class="Owe_Room">{{UseInventory}}</span>间
       &nbsp;&nbsp;
-      <span class="hasStock_1" style="padding:2px 4px;border-radius:5px" >红日</span> 
-      <span class="hasStock_2" style="padding:2px 4px;border-radius:5px">旺季</span> 
-      <span class="hasStock_3" style="padding:2px 4px;border-radius:5px">平季</span> 
-      <span class="hasStock_4" style="padding:2px 4px;border-radius:5px">淡季</span> 
-      <span class="hasStock_5" style="padding:2px 4px;border-radius:5px">特别价</span> 
+      <span class="hasStock_1" style="padding:2px 4px;border-radius:5px">红日</span>
+      <span class="hasStock_2" style="padding:2px 4px;border-radius:5px">旺季</span>
+      <span class="hasStock_3" style="padding:2px 4px;border-radius:5px">平季</span>
+      <span class="hasStock_4" style="padding:2px 4px;border-radius:5px">淡季</span>
+      <span class="hasStock_5" style="padding:2px 4px;border-radius:5px">特别价</span>
     </div>
     <div class="month">
       <ul>
@@ -273,11 +285,13 @@
       <li v-for="(dayItem,index) in days" :key="dayItem.index">
         <p class="ckStyle" :class="{ckStyleOther:dayItem.day.getMonth()+1 != currentMonth}">{{dayItem.day.getDate()}}
         </p>
-        <div v-if="dayItem.dayValue" >
+        <div v-if="dayItem.dayValue">
           <p style="word-break:breakall;" :class="stockColor(subItem.InventoryType)"
             v-for="subItem in dayItem.dayValue">{{subItem.HotelName}}
             (总: {{subItem.Inventory}} &nbsp;&nbsp;
-            <a title="点击跳转到订房管理" v-if="subItem.UseInventory>0" @click="goUrl('roomReservations',subItem,dayItem.DayStr,'订房管理')" style="cursor:pointer;text-decoration:underline;color:red;">已用:{{subItem.UseInventory}}</a>
+            <a title="点击跳转到订房管理" v-if="subItem.UseInventory>0"
+              @click="goUrl('roomReservations',subItem,dayItem.DayStr,'订房管理')"
+              style="cursor:pointer;text-decoration:underline;color:red;">已用:{{subItem.UseInventory}}</a>
             <span v-else>已用:{{subItem.UseInventory}}</span>
             )
           </p>
@@ -296,10 +310,13 @@
           HotelId: 0,
           //只查询日本
           Country: "651",
-          Province:0,
-          City:0,
+          Province: 0,
+          City: 0,
           loading: false,
+          OutBranchId:0,
         },
+        //分公司列表
+        companyList: [],
         //酒店列表
         HotelList: [],
         defaultSelectValue: 0,
@@ -321,34 +338,44 @@
       };
     },
     methods: {
+      getBranchList() {
+        this.apipost('admin_get_BranchGetList', {
+          RB_Group_Id: '2',
+          Status: 0,
+        }, res => {
+          if (res.data.resultCode == 1) {
+            this.companyList = res.data.data;
+          }
+        }, err => {})
+      },
       stockColor: function (type) {
         //红日
         if (type === 1) {
           return 'hasStock_1'
         }
         //旺季
-         else if (type === 2) {
+        else if (type === 2) {
           return 'hasStock_2'
         }
         //平季
-         else if (type === 3) {
+        else if (type === 3) {
           return 'hasStock_3'
-        }//淡季 
+        } //淡季 
         else if (type === 4) {
           return 'hasStock_4'
         }
         //特别价
-         else if (type === 5) {
+        else if (type === 5) {
           return 'hasStock_5'
         }
       },
       //调整到订房管理
-      goUrl(path, obj,dateStr, name) {
+      goUrl(path, obj, dateStr, name) {
         this.$router.push({
           path: path,
           query: {
             hotelId: obj.HotelId,
-            dateStr:dateStr,
+            dateStr: dateStr,
             blank: "y",
             tab: name
           }
@@ -401,8 +428,8 @@
       //点击获取酒店库存数据
       GetHoltelInventory() {
         this.msg.loading = true;
-        this.msg.Year=this.currentYear;
-        this.msg.Month=this.currentMonth;
+        this.msg.Year = this.currentYear;
+        this.msg.Month = this.currentMonth;
         this.DayData = [];
         this.apipost(
           "hotelreport_get_GetHotelPriceMonthStatisticsExt",
@@ -441,7 +468,7 @@
         this.apipost(
           "hotel_post_GetHasStockHotelList", {
             Country: 651,
-            IsMoreThanZero:1
+            IsMoreThanZero: 1
           },
           res => {
             if (res.data.resultCode == 1) {
@@ -457,14 +484,14 @@
           Id: ID
         };
         if (type == 1) {
-          this.msg.Province=0;
-          this.msg.City=0;
+          this.msg.Province = 0;
+          this.msg.City = 0;
           this.provinceList = [];
           this.cityList = [];
         } else if (type == 2) {
-          this.msg.City=0;
+          this.msg.City = 0;
           this.cityList = [];
-        } 
+        }
         this.apipost(
           "dict_post_Destination_GetChildList",
           msg,
@@ -488,12 +515,13 @@
       let myDate = new Date();
       this.currentYear = myDate.getFullYear();
       this.currentMonth = myDate.getMonth() + 1;
-      this.msg.Year=this.currentYear;
-      this.msg.Month=this.currentDay;
+      this.msg.Year = this.currentYear;
+      this.msg.Month = this.currentDay;
+      this.getBranchList();
       this.GetHotelList();
       this.initCalendar();
       this.GetHoltelInventory();
-      this.getProvinceList(651,1);
+      this.getProvinceList(651, 1);
     }
   };
 

src/components/TravelManager/Ticket/TravelticketManager.vue

@@ -848,7 +848,7 @@
           {{$t('system.content_noData')}}
         </div>
         <el-pagination background @current-change="handleCurrentChange" :current-page.sync="Query.currentPage"
-          layout="total,prev, pager, next, jumper" :page-size=Query.pageSize :total=Query.total>
+          layout="total,prev, pager, next, jumper" :page-size="Query.pageSize" :total="Query.total">
         </el-pagination>
 
         <div class="combottomDiv" style="height:150px;" v-if="isShowOrder">
@@ -904,6 +904,7 @@
           IsQueryPurchase: 1,
           //机票编号
           ID: "",
+          //PNR
           PNR:""
         },
         //线路列表