酒店统计修改

src/components/Hotel/HotelQueryList.vue

@@ -2,6 +2,29 @@
   <div>
     <div class="query-box" style="border-bottom: none;">
       <ul>
+        <li>
+          <span>
+            <em>{{$t('system.quety_area')}}</em>
+            <el-select v-model="msg.Province" filterable @change="getProvinceList(msg.Province,2)"
+              :placeholder="$t('hotel.hotel_province')">
+              <el-option :key="0" :value="0" label="请选择"></el-option>
+              <el-option v-for="item in provinceList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
+            </el-select>
+            <el-select v-model="msg.City" filterable :placeholder="$t('hotel.hotel_city')">
+              <el-option :key="0" :value="0" label="请选择"></el-option>
+              <el-option v-for="item in cityList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
+            </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>
@@ -18,7 +41,8 @@
           </span>
         </li>
         <li>
-          <input type="button" class="normalBtn" value="温馨提示" @click="showNotice=true,resetPageIndex(),GetHotelTipList()"/>
+          <input type="button" class="normalBtn" value="温馨提示"
+            @click="showNotice=true,resetPageIndex(),GetHotelTipList()" />
           <input type="button" class="normalBtn" value="查询" @click="getList()" />
         </li>
       </ul>
@@ -37,16 +61,20 @@
         <tr>
           <th width="300">酒店名称</th>
           <th width="80"></th>
+          <template v-if="dataList.length>0">
             <th v-for="item in dataList[0].subList">
               {{getDateList(item.DateStr)}}
             </th>
+          </template>
         </tr>
         <tr>
           <th></th>
           <th></th>
+          <template v-if="dataList.length>0">
             <th v-for="item in dataList[0].subList">
               {{getWeek(item.DateStr)}}
             </th>
+          </template>
         </tr>
         <tr v-for="item in dataList">
           <td>
@@ -135,13 +163,7 @@
         </el-pagination>
       </div>
     </div>
-
-
-    <el-dialog
-      custom-class="w800"title="信息"
-      :visible.sync="showHQinfo"
-      center
-    >
+    <el-dialog custom-class="w800" title="信息" :visible.sync="showHQinfo" center>
       <el-form>
         <table border="0" cellspacing="1" cellpadding="0" class="HouseTypeList Hq_addTable" style="width:100%;">
           <tr>
@@ -167,7 +189,7 @@
         </el-pagination>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <button class="hollowFixedBtn" @click="showHQinfo = false">{{$t('pub.cancelBtn')}}</button>
+        <button class="hollowFixedBtn" @click="showHQinfo = false">关闭</button>
       </div>
     </el-dialog>
   </div>
@@ -180,7 +202,19 @@
           HotelId: 0,
           StartDate: new Date().Format("yyyy-MM-dd"),
           EndDate: this.setEdate(),
+          //只查询日本
+          Country: "651",
+          Province: 0,
+          City: 0,
+          OutBranchId: -1,
         },
+        //分公司列表
+        companyList: [],
+        defaultSelectValue: 0,
+        //国家 省市 区
+        provinceList: [],
+        cityList: [],
+        district: [],
         queryMsg: {
           QStartDate: '',
           QEndDate: '',
@@ -195,7 +229,7 @@
           TipContent: ''
         },
         //默认显示弹窗信息
-        showHQinfo:true,
+        showHQinfo: true,
         //酒店温馨提示列表
         HotelTipList: [],
         HotelList: [],
@@ -385,8 +419,47 @@
           err => {}
         );
       },
+      getProvinceList(ID, type) {
+        //根据省份获取城市
+        let msg = {
+          Id: ID
+        };
+        if (type == 1) {
+          this.msg.Province = 0;
+          this.msg.City = 0;
+          this.provinceList = [];
+          this.cityList = [];
+        } else if (type == 2) {
+          this.msg.City = 0;
+          this.cityList = [];
+        }
+        this.apipost(
+          "dict_post_Destination_GetChildList",
+          msg,
+          res => {
+            if (type == 1) {
+              this.provinceList = res.data.data;
+            } else if (type == 2) {
+              this.cityList = res.data.data;
+            }
+          },
+          err => {}
+        );
+      },
+      getBranchList() {
+        this.apipost('admin_get_BranchGetList', {
+          RB_Group_Id: '2',
+          Status: 0,
+        }, res => {
+          if (res.data.resultCode == 1) {
+            this.companyList = res.data.data;
+          }
+        }, err => {})
+      },
     },
     mounted() {
+      this.getBranchList();
+      this.getProvinceList(651, 1);
       this.GetHotelList();
       this.getList();
       this.GetHotelTipList();
@@ -487,4 +560,5 @@
     height: 350px;
     padding-top: 35px;
   }
+
 </style>

src/components/Hotel/HotelSalesBoard.vue

@@ -224,7 +224,7 @@
           <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 :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>
@@ -313,7 +313,7 @@
           Province: 0,
           City: 0,
           loading: false,
-          OutBranchId:0,
+          OutBranchId:-1,
         },
         //分公司列表
         companyList: [],