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

src/components/Hotel/roomReservations.vue

@@ -117,7 +117,7 @@
           <th>备注</th>
         </tr>
         <tr v-if="list.length==0">
-          <td colspan="10">暂无数据</td>
+          <td colspan="11">暂无数据</td>
         </tr>
         <tbody v-for="(outItem,outindex) in list" :class="{roomReservationsSplitTrCss:outindex%2!=0}">
           <template v-for="(item,index) in outItem.StaticsReportList">

src/components/Hotel/roomReservationsDetails.vue

@@ -5,6 +5,12 @@
     margin: 5px auto;
     font-size: 12px;
   }
+  .rq_importNote {
+    color: red;
+  }
+  .rq_disImNote {
+    color: #ea6d6d;
+  }
 
 </style>
 
@@ -294,7 +300,9 @@
                    <tr v-if="subItem.SupplierToDmcRemarks">
                     <td width="70" style="text-align:right;">供应商对地接备注：</td>
                     <td>
-                      {{subItem.SupplierToDmcRemarks}}
+                      <span :class="{'rq_disImNote':subItem.SupplierToDmcHotelStatus==1&&DateMinus(subItem.SupplierToDmcHotelStatusTime)<=5,'rq_importNote':subItem.SupplierToDmcHotelStatus==2&&DateMinus(subItem.SupplierToDmcHotelStatusTime)<=5}">
+                        {{subItem.SupplierToDmcRemarks}}
+                      </span>
                     </td>
                   </tr>
                 </table>
@@ -330,6 +338,7 @@
   </div>
 </template>
 <script>
+  import moment from 'moment'
   import comCheckHotel from "../commonPage/comCheckHotel.vue";
   export default {
     data() {
@@ -388,6 +397,14 @@
         let str = `comCheckHotel${index}${subIndex}`
         this.$refs[str][0].getCheckHotel();
       },
+      DateMinus(sDate) {
+        var newDate = moment(sDate).format("YYYY-MM-DD");
+        var sdate = new Date(newDate.replace(/-/g, "/"));
+        var now = new Date();
+        var days = now.getTime() - sdate.getTime();
+        var day = Math.abs(parseInt(days / (1000 * 60 * 60 * 24)));
+        return day;
+      },
       getItem(index, subIndex) {
         this.checkedIndex = index
         this.checkedsubIndex = subIndex
@@ -528,6 +545,7 @@
                 })
               });
               this.list = list;
+              console.log(this.list,'listttt');
               this.$forceUpdate();
             }
           } else {