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

src/components/Hotel/HouseTypeList.vue → src/components/Hotel/HotelQueryList.vue

@@ -22,7 +22,15 @@
         </li>      
         </ul>
     </div>
-    <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle">
+
+    <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; " class="HotelQueryList">
+     <div class="hotelProductManage2_tableBox">
+      <span style="color:#000000;background-color: #ff3737;padding:2px 4px;border-radius:5px" >红日</span> 
+      <span style="color:#000000;background-color: #ff99cc;padding:2px 4px;border-radius:5px" >旺季</span> 
+      <span style="color:#000000;background-color: #bcd6ee;padding:2px 4px;border-radius:5px" >平季</span> 
+      <span style="color:#000000;background-color: #DDDDDD;padding:2px 4px;border-radius:5px">淡季</span> 
+      <span style="color:#000000;background-color: #02F78E;padding:2px 4px;border-radius:5px" >特别价</span> 
+    </div>
       <table border="0" cellspacing="1" cellpadding="0" class="HouseTypeList" v-if="isShow">
         <tr>
           <th width="300">酒店名称</th>
@@ -43,13 +51,20 @@
               <div style="min-width:300px; text-align:left;padding-left:5px;">{{item.HotelName}}</div>
             </td>
             <td>
-                <div class="Hotel_kong" style="min-width:60px;">空房</div>
+                <div class="Hotel_kong">价格</div>
+                <div class="Hotel_kong" style="min-width:60px;">总/用/剩</div>
                 <div class="Hotel_kong">超定</div>
             </td>
-            <td v-for="subItem in item.subList">
-                <div class="Hotel_kong Com_hoteldiv" :class="{'noKucun':subItem.Status==0}">{{subItem.RemainingInventory}}</div>
+            <td v-for="subItem 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">
+                  {{subItem.Inventory}}/{{subItem.UseInventory}}/{{subItem.RemainingInventory}}</div>
                 <div class="Hotel_kong Com_hoteldiv">
-                  <span v-if="subItem.UseInventory-subItem.Inventory>0" style="color:red;">{{subItem.UseInventory-subItem.Inventory}}</span>
+                  <span v-if="subItem.UseInventory-subItem.Inventory>0" style="color:red;">
+                    {{subItem.UseInventory-subItem.Inventory}}
+                    </span>
                 </div>
             </td>
         </tr>
@@ -84,6 +99,7 @@
           res => {
             if (res.data.resultCode == 1) {
               this.dataList = res.data.data;
+              console.log("this.datalist",this.dataList);
               this.isShow=true;
               console.log(this.dataList,'dataList');
             } else {
@@ -129,7 +145,30 @@
         var weekDay = ["天", "一", "二", "三", "四", "五", "六"];  
         var myDate = new Date(Date.parse(dateStr));  
         return weekDay[myDate.getDay()]
-      }
+      },
+      //获取颜色状态
+      // getClass(status) {
+      //   var classStr = "";
+      //   switch (status) {
+      //     case 1:
+      //       classStr = "classHong";
+      //       break;
+      //     case 2:
+      //       classStr = "classWang";
+      //       break;
+      //     case 3:
+      //       classStr = "classPing";
+      //       break;
+      //     case 4:
+      //       classStr = "classDan";
+      //       break;
+      //     case 5:
+      //       classStr = "classTe";
+      //       break;
+      //   }
+      //   return classStr;
+      // },
+
     },
     mounted() {
       this.GetHotelList();
@@ -139,9 +178,25 @@
 </script>
 
 <style>
+  .classHong{
+    background-color: rgb(255, 55, 55);
+  }
+  .classWang{
+    background-color: rgb(255, 153, 204);
+  }
+  .classPing{
+    background-color: rgb(188, 214, 238);
+  }
+  .classDan{
+    background-color: rgb(221, 221, 221);
+  }
+  .classTe{
+    background-color: rgb(2, 247, 142);
+  }
   .HouseTypeList {
     background: #ccc;
     width:100%;
+    margin-top:20px;
   }
   .Com_hoteldiv{
     min-width: 40px;
@@ -174,4 +229,7 @@
   .HouseTypeList tr td {
     font-size: 12px;
   }
+  .hotelProductManage2_tableBox span{
+    margin:0 10px 10px 0;
+  }
 </style>

src/components/confirmationOrderDownLoad.vue

@@ -703,10 +703,10 @@
                         },
                         datatype: "jsonP",
                         success: function (data) {
-                          //console.log("上传成功",data);
+                          
                         },
                         error: function () {
-                          //console.log("上传失败");
+                           
                         }
                       });
                       if (allNum !== document.querySelectorAll(cName).length) {
@@ -903,7 +903,7 @@
           }
           this.pdfLoading = false
         }).catch(err => {
-          console.log(err)
+         
         })
       },
       ToWord: function (title, isPc) {

src/components/systemLogs.vue

 <style>
     .sysLog_Content{
-        width:100%;
         border-left:2px solid #D2D2D2;
-        margin-left:20px;
+        margin:40px 0 0 40px;
     }
     .sysLog_List{
         position: relative;
@@ -16,11 +15,15 @@
         border:2px solid #58D2A7;
         border-radius:50%;
         margin-right:10px;
+        position: relative;
+        top:-4px;
     }
     .sysFirDate{
         color:#38425D;
         font-weight: bold;
         font-size:12px;
+        position: relative;
+        top:-4px;
     }
     .sysContent_main{
         width:894px;
@@ -44,10 +47,14 @@
         background-color: #B1B1B1;
         border:2px solid #EFEFEF;
         margin-right:10px;
+        position: relative;
+        top:-3px;
     }
     .sysFirDate_other{
         color:#38425D;
         font-size:12px;
+        position: relative;
+        top:-4px;
     }
 </style>
 
@@ -57,7 +64,7 @@
             <div class="sysPosi_div">
                 <span class="sysCircle" v-if="index==0"></span>
                 <span class="sysCircle_other" v-else></span>
-                <span style="font-size:14px;margin-right:20px;">{{item.UpdateTitle}}</span>
+                <span style="font-size:14px;margin-right:20px;position:relative;top:-4px;">{{item.UpdateTitle}}</span>
                 <span class="sysFirDate" v-if="index==0">{{item.UpdateTimeStr}}</span>
                 <span class="sysFirDate_other" v-else>{{item.UpdateTimeStr}}</span>
             </div>
@@ -83,7 +90,6 @@
             this.apipost("sysrecord_get_GetPageList",this.msg,res => {
                 if (res.data.resultCode == 1) {
                     this.dataList = res.data.data.pageData;
-                    console.log(this.dataList,'datalist');
                 } else {
                     this.Error(res.data.message);
                 }

src/router/config.js

@@ -628,11 +628,11 @@ export default {
                 title: '酒店核算详情'
               },
             },{
-              path: '/HouseTypeList', //配房类型
-              name: 'HouseTypeList',
-              component: resolve => require(['@/components/Hotel/HouseTypeList'], resolve),
+              path: '/HotelQueryList', //酒店查询统计
+              name: 'HotelQueryList',
+              component: resolve => require(['@/components/Hotel/HotelQueryList'], resolve),
               meta: {
-                title: '配房类型'
+                title: '酒店查询统计'
               },
             },
             {
@@ -2939,16 +2939,13 @@ export default {
                 title: '奖项列表'
               }
             },
-            {
-              path: '/systemLogs', //版本更新记录
-              name: 'systemLogs',
-              component: resolve => require(['@/components/systemLogs'], resolve),
-              meta:{
-                title: '版本更新记录'
-              }
-            }
           ]
         },
+        {
+          path: '/systemLogs', //版本更新记录
+          name: 'systemLogs',
+          component: resolve => require(['@/components/systemLogs'], resolve),
+        },
         {
           path: '/permissionmanage',
           name: 'PermissionManage',