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

src/components/Supplier/roomQuery2.vue

@@ -177,14 +177,14 @@
                       </td>
                       <td style="text-align:center;">
                         <el-tooltip effect="dark" content="日志" placement="top-start">
-                          <el-popover width='230' trigger="click">
+                          <el-popover width='260' trigger="click">
                             <div class="priceContentDiv">
                               <div class="AuditLog">日志</div>
                               <div class="logContact" style="background:#f9f9f9; padding:20px 10px 0;">
                                 <div v-if='LogsList.length>0' v-for="(item,index) in LogsList" :key="index">
                                   <div class="clearfix">
                                     <div class="Auditcircle" style="left: 6px!important;"></div>
-                                    <div class="operateName" style="color:#005CAA;font-size:12px;">{{item.CreateTimeStr}}</div>
+                                    <div class="operateName" style="color:#005CAA;font-size:12px;">{{item.CreateByName}} {{item.CreateTimeStr}}</div>
                                     <!-- <div class="operateDate fz12 color666">{{item.x}}</div> -->
                                   </div>
                                   <div class="fz12 color333">{{item.Remarks}}</div>
@@ -205,7 +205,7 @@
                       <td colspan="6">
                         <span style="display:inline-block;width:60px;vertical-align:top;">提示信息：</span>
                         <span style="display:inline-block;width:87%;"
-                          :class="{'rq_disImNote':childItem.SupplierHotelStatus==1&&DateMinus(subItem.UseTimeStr)<=5,'rq_importNote':childItem.SupplierHotelStatus==2&&DateMinus(subItem.UseTimeStr)<=5}">{{childItem.Remarks}}</span>
+                          :class="{'rq_disImNote':childItem.SupplierHotelStatus==1&&DateMinus(getDateStr(childItem.SupplierHotelStatusTime))<=5,'rq_importNote':childItem.SupplierHotelStatus==2&&DateMinus(getDateStr(childItem.SupplierHotelStatusTime))<=5}">{{childItem.Remarks}}</span>
                       </td>
                     </tr>
                   </template>
@@ -239,6 +239,7 @@
   </div>
 </template>
 <script>
+  import moment from 'moment'
   export default {
     data() {
       return {
@@ -284,12 +285,12 @@
         LogsList: [],
         queryLogMsg: {
           pageIndex: 1,
-          pageSize: 5,
+          pageSize: 15,
           currentPage: 1,
           total: 0,
           HotelId: 0,
           TCID: 0,
-          sDate:''
+          UseTime:''
         },
         //是否为今天
         isToday: false,
@@ -306,7 +307,10 @@
         if(HotelId){
           this.queryLogMsg.HotelId = HotelId;
         }
-        this.queryLogMsg.sDate = timeStr;
+        if(timeStr)
+        {
+           this.queryLogMsg.UseTime = timeStr;
+        }
         this.ApiPost2('DmcInfoChangeLog_get_GetHotelLogList', this.queryLogMsg, res => {
           if (res.data.resultCode == 1) {
             this.LogsList = res.data.data.pageData;
@@ -337,7 +341,7 @@
             if (this.dataList && this.dataList.length > 0) {
               this.dataList.forEach(x => {
                 if (x.HotelBookTimeStr) {
-                  x.Numbers = 5 - this.DateMinus(x.HotelBookTimeStr);
+                  x.Numbers = 5 - this.DateMinus(x.HotelBookTimeStr.split(' ')[0]);
                 }
               })
             }
@@ -421,6 +425,9 @@
       },
       handleScroll(){
         this.top=document.documentElement.scrollTop
+      },
+      getDateStr(date){
+          return moment(date).format("YYYY-MM-DD HH:mm:ss").split(' ')[0];
       }
     },
     mounted() {

src/components/commonPage/commonHotelInfo.vue

@@ -55,6 +55,15 @@
             </td>
         </tr>
         </template>
+        <tfoot v-if="showHotelObj.showBtnList">
+            <tr>
+                <td colspan="7" style="padding:10px 0">
+                    <input type="button" class="normalBtn" value="确定" style="display:none;"/>
+                    <input type="button" class="normalBtn" value="暂定" style="display:none;"/>
+                    <input type="button" class="normalBtn" value="下载"/>
+                </td>
+            </tr>
+        </tfoot>
     </table>
 </template>
 <script>
@@ -69,7 +78,7 @@
      
     },
     mounted() {
-
+        
     }
   };
 

src/components/dmc/manager/dmcTotalTable.vue

@@ -514,7 +514,8 @@
         showHotelObj:{
           showPrice:true,
           showPay:true,
-          showZhan:true
+          showZhan:true,
+          showBtnList:false
         },
         pickerBeginDateBefore: {
           disabledDate: time => {