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

src/components/Hotel/HotelQueryList.vue

@@ -55,11 +55,11 @@
                 <div class="Hotel_kong" style="min-width:60px;">总/用/剩</div>
                 <div class="Hotel_kong">超定</div>
             </td>
-            <td v-for="subItem in item.subList">       
+            <td v-for="(subItem,subIndex) in item.subList">       
                <div class="Hotel_kong Com_hoteldiv" :class="{'noKucun':subItem.Status==0,'classHong':subItem.InventoryType==1,
                 'classWang':subItem.InventoryType==2,'classPing':subItem.InventoryType==3,'classDan':subItem.InventoryType==4,'classTe':subItem.InventoryType==5}">
                   {{subItem.CostPrice}}</div>
-                <div class="Hotel_kong Com_hoteldiv">
+                <div class="Hotel_kong Com_hoteldiv" @click="GotoUrl(item,subIndex)">
                   {{subItem.Inventory}}/{{subItem.UseInventory}}/{{subItem.RemainingInventory}}</div>
                 <div class="Hotel_kong Com_hoteldiv">
                   <span v-if="subItem.UseInventory-subItem.Inventory>0" style="color:red;">
@@ -88,6 +88,18 @@
       };
     },
     methods: {
+      GotoUrl(item,subIndex)
+      {
+         this.$router.push({
+          path: "TravelControlList",
+          query: {
+            HotelId: item.HotelId,
+            HotelUseTime: item.subList[subIndex].DateStr,
+            blank: "y",
+            tab: name
+          }
+        });
+      },
       getList() {
         if (this.msg.StartDate == null) {
           this.msg.StartDate = new Date().Format("yyyy-MM-dd")

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -908,6 +908,8 @@
           TeamType: 0, //一般常规团
           IsShowUnion: 1,
           TCID: '0',
+          HotelId:0,//酒店编号
+          HotelUseTime:"",//酒店使用时间
         },
         remarkMsg: {
           TCID: 0,
@@ -1658,6 +1660,12 @@
       if (this.$route.query.tcmun) {
         this.queryMsg.TCNUM = this.$route.query.tcmun
       }
+      if (this.$route.query.HotelId) {
+        this.queryMsg.HotelId = this.$route.query.HotelId
+      }
+      if (this.$route.query.HotelUseTime) {
+        this.queryMsg.HotelUseTime = this.$route.query.HotelUseTime
+      }
 
       if (this.CurrentUserInfo.IsParentCompany == undefined) {
         this.queryCommonData.IsParentCompany = 2