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

src/components/Hotel/HotelQueryList.vue

@@ -28,8 +28,7 @@
         <li>
           <span>
             <em>酒店</em>
-            <el-select v-model="msg.HotelId" :placeholder="$t('pub.pleaseSel')" filterable>
-              <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
+            <el-select v-model="msg.HotelChooseArray" :placeholder="$t('pub.pleaseSel')" filterable multiple  :multiple-limit="3" size="mini">
               <el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
             </el-select>
           </span>
@@ -60,25 +59,18 @@
       <table border="0" cellspacing="1" cellpadding="0" class="HouseTypeList" v-if="isShow">
         <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>
+          <th width="80">价格&库存</th>
           <template v-if="dataList.length>0">
             <th v-for="item in dataList[0].subList">
+              {{getDateList(item.DateStr)}}<br/>
               {{getWeek(item.DateStr)}}
             </th>
           </template>
         </tr>
         <tr v-for="item in dataList">
           <td>
-            <div style="min-width:300px; text-align:left;padding-left:5px;">{{item.HotelName}}</div>
+            <div style="min-width:300px; text-align:left;padding-left:5px;cursor:pointer;" @click="GotoHotel(item.HotelId)">
+              {{item.HotelName}}</div>
           </td>
           <td>
             <div class="Hotel_kong">价格</div>
@@ -86,8 +78,17 @@
             <div class="Hotel_kong">超定</div>
           </td>
           <td v-for="(subItem,subIndex) in item.subList">
-            <div class="Hotel_kong Com_hoteldiv" :class="getClass(subItem)">
-              {{subItem.CostPrice}}</div>
+            <div class="Hotel_kong Com_hoteldiv" >
+              <template v-if="subItem.PriceList&&subItem.PriceList.length>0">
+                <template v-for="childItem in subItem.PriceList">
+                   <div :class="getClass(1,childItem.InventoryType)" style="height:100%;float:left;" 
+                   :style="{width:(98/subItem.PriceList.length)+'%'}">{{childItem.CostPrice}}</div>
+                </template>
+              </template>
+              <template v-else>
+                <div :class="getClass(0,0)" style="width:100%;height:100%">&nbsp;</div>
+              </template>
+            </div>
             <div class="Hotel_kong Com_hoteldiv Hq_duoge" @click="GotoUrl(item,subIndex,subItem.UseInventory)">
               {{subItem.Inventory}}/{{subItem.UseInventory}}/{{subItem.RemainingInventory}}</div>
             <div class="Hotel_kong Com_hoteldiv">
@@ -120,7 +121,7 @@
           <el-row>
             <el-col :span="9">
               <el-form-item label="说明">
-                <el-input type="textarea" v-model="postMsg.TipContent" class="w600" maxlength="200"></el-input>
+                <el-input type="textarea" v-model="postMsg.TipContent" maxlength="200"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="15">
@@ -187,6 +188,8 @@
         <el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
           :page-size="queryMsg.pageSize" layout="total,prev, pager, next, jumper" :total="queryMsg.total">
         </el-pagination>
+        <div class="HQ_miaoshu">1.酒店库存系统已开放使用,欢迎前往参观选购!! </div>
+        <div class="HQ_miaoshu">2.库存酒店皆为时时更新,请上传人员细心上传!!</div>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <button class="hollowFixedBtn" @click="showHQinfo = false">关闭</button>
@@ -199,7 +202,8 @@
     data() {
       return {
         msg: {
-          HotelId: 0,
+          //酒店选择数组
+          HotelChooseArray:[],
           StartDate: new Date().Format("yyyy-MM-dd"),
           EndDate: this.setEdate(),
           //只查询日本
@@ -208,6 +212,7 @@
           City: 0,
           OutBranchId: -1,
         },
+    
         //分公司列表
         companyList: [],
         defaultSelectValue: 0,
@@ -223,7 +228,6 @@
           currentPage: 1,
           total: 0
         },
-
         postMsg: {
           Id: 0,
           TipContent: ''
@@ -252,6 +256,16 @@
       };
     },
     methods: {
+      GotoHotel(HotelId) {
+        this.$router.push({
+          path: "HotelManagement",
+          query: {
+            ID: HotelId,
+            tab: "酒店查询",
+            blank:'y',
+          }
+        });
+      },
       GotoUrl(item, subIndex, UseInventory) {
         if (UseInventory > 0) {
           this.$router.push({
@@ -267,16 +281,17 @@
       getList() {
         this.loading = true;
         if (this.msg.StartDate == null) {
-          this.msg.StartDate = new Date().Format("yyyy-MM-dd")
+          this.msg.StartDate = new Date().Format("yyyy-MM-dd");
         }
         if (this.msg.EndDate == null) {
-          this.msg.EndDate = this.setEdate()
+          this.msg.EndDate = this.setEdate();
         }
         this.apipost("dict_post_HotelOffer_GetHotelStatics", this.msg,
           res => {
             this.loading = false;
             if (res.data.resultCode == 1) {
               this.dataList = res.data.data;
+              console.log("dataList",this.dataList);
               this.isShow = true;
             } else {
               this.Error(res.data.message);
@@ -323,12 +338,12 @@
         return weekDay[myDate.getDay()]
       },
       //获取颜色状态
-      getClass(subItem) {
+      getClass(Status,InventoryType) {
         var classStr = "";
-        if (subItem.Status == 0) {
+        if (Status == 0) {
           classStr = 'noKucun';
         }
-        switch (subItem.InventoryType) {
+        switch (InventoryType) {
           case 1:
             classStr = "classHong";
             break;
@@ -502,6 +517,7 @@
 
   .Com_hoteldiv {
     min-width: 70px;
+    white-space:nowrap; 
   }
 
   .noKucun {
@@ -560,5 +576,11 @@
     height: 350px;
     padding-top: 35px;
   }
-
+  .HQ_miaoshu{
+    color:#E95252;
+    font-size:12px;
+  }
+  .HQ_miaoshu:first-child{
+    margin-top:10px;
+  }
 </style>