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

src/components/FinancialModule/BasicDocuments.vue

@@ -998,7 +998,7 @@
                                 
                                 <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;">
                                     <tr>
-                                        <th>账户分类 收支冲抵</th>
+                                        <th>账户分类</th>
                                         <th>付款方式</th>
                                         <th>账户</th>
                                         <!-- <th width="100px">账户余额</th> -->

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 {

src/components/commonPage/fourday.vue

@@ -137,9 +137,13 @@ export default {
         }
       }else{
         if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){
-          if(this.isDirect===1){
-            suffix = "或同級"
-          }
+               if (this.day.jiu2[0].status == 1) {
+              suffix = "【保证入住】"
+            } else {
+              if (this.isDirect === 1) {
+                suffix = "或同級"
+              }
+            }
         }
       }
       return suffix;

src/components/commonPage/threeday.vue

@@ -177,9 +177,13 @@ export default {
         }
       }else{
         if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){
-          if(this.isDirect===1){
-            suffix = "或同級"
-          }
+               if (this.day.jiu2[0].status == 1) {
+              suffix = "【保证入住】"
+            } else {
+              if (this.isDirect === 1) {
+                suffix = "或同級"
+              }
+            }
         }
       }
       return suffix;

src/components/commonPage/twoday.vue

@@ -104,9 +104,13 @@ export default {
         }
       }else{
         if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){
-          if(this.isDirect===1){
-            suffix = "或同級"
-          }
+          if (this.day.jiu2[0].status == 1) {
+              suffix = "【保证入住】"
+            } else {
+              if (this.isDirect === 1) {
+                suffix = "或同級"
+              }
+            }
         }
       }
       return suffix;

src/components/confirmationOrderDownLoad.vue

@@ -749,7 +749,7 @@
           // }, null)
 
           _this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum +
-                '日游', isPc)
+            '日游', isPc)
         } else {
           this.ToWord(this.orderMsg.startDate + this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游', isPc)
         }
@@ -1182,8 +1182,11 @@
               }
               jin.push(obj)
             } else if (y.type == 3 && y.childItem.hotelName != '' && y.childItem.imaArray.length > 0) {
+              //酒店
               let obj = {
                 title: y.childItem.hotelName,
+                newTitle: y.childItem.newHotelName,
+                status: y.childItem.status,
                 content: y.childItem.description,
                 img: y.childItem.imaArray[0].url,
                 ticketName: '',
@@ -1226,7 +1229,9 @@
             if (y.type == 3) {
               jiu2.push({
                 name: y.childItem.hotelName,
-                url: y.childItem.url
+                url: y.childItem.url,
+                newTitle: y.childItem.newHotelName,
+                status: y.childItem.status,
               });
               useDinnerTypeBy = y.childItem.useDinnerType
             }
@@ -1345,7 +1350,6 @@
       threeday,
       fourday,
       fiveday,
-
     },
   }