新增日志显示

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -490,7 +490,7 @@
                     <span class="TCL-greenType">{{item.ClearOrderHour}}小时</span>
                   </p>
                   <p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
-                    <el-popover width="800" trigger="click" popper-class="TC_HotelPop">
+                    <el-popover width="850" trigger="click" popper-class="TC_HotelPop">
                       <commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj" 
                       :TCID="item.TCID"
                       :DMCNum="item.DMCNum" :TCNUM="item.TCNUM"

src/components/commonPage/commonHotelInfo.vue

@@ -9,6 +9,17 @@
     padding: 5px 0;
   }
 
+  .comHotelOperation .tdRight {
+    text-align: right;
+    width: 20%;
+  }
+
+  .comHotelOperation .tdLeft {
+    text-align: left;
+    padding-left: 5px;
+     width: 30%;
+  }
+
 </style>
 
 <template>
@@ -19,7 +30,7 @@
           <td>
             公司团号
           </td>
-          <td :colspan="3" style="text-align:left;">
+          <td :colspan="4" style="text-align:left;">
             <span style="padding-left:5px;">{{TCNUM}} ({{TCID}})</span>
           </td>
           <td>
@@ -38,13 +49,13 @@
           <th style="width:100px;" v-if="showHotelObj.showPay">付款方式</th>
           <th style="width:100px;" v-if="showHotelObj.ShowTaxType">税入/税别</th>
           <th style="width:120px;" v-if="showHotelObj.ShowRebateRatio">返佣比例</th>
-          <th style="width:120px" v-if="showHotelObj.showZhan">占房时间</th>
+          <th style="width:130px" v-if="showHotelObj.showZhan">占房时间</th>
           <th style="width:100px" v-if="showHotelObj.showZhan">确认时间</th>
-          <th style="width:100px;display:none">
+          <th style="width:80px;" v-if="showHotelObj.showPrice">
             日志
           </th>
         </tr>
-        <template v-for="hotelItem in  HotelObj">
+        <template v-for="(hotelItem,index) in  HotelObj">
           <tr v-for="(hotelSubItem,hotelSubIndex) in hotelItem.SubList">
             <td width="120" v-if="hotelSubIndex==0" :rowspan="hotelItem.SubList.length">
               {{hotelItem.UseDay}}
@@ -97,11 +108,10 @@
             <td v-if="showHotelObj.showZhan">
               {{hotelSubItem.SureTimeStr}}
             </td>
-            <td style="display:none;">
+            <td v-if="showHotelObj.showPrice">
               <el-popover width="200" trigger="click" popper-class="Bus_HotelPop">
-                <commonHotelLog :TCID="TCID" :HotelId="hotelSubItem.HotelId" :UseTime="hotelItem.UseDay">
-                </commonHotelLog>
-                <div slot="reference" class="w80" style="cursor:pointer;text-decoration:underline;">日志</div>
+                <commonHotelLog  :ref="'comHotelLog'+index+hotelSubIndex+''"> </commonHotelLog>
+                <div slot="reference" class="w80" style="cursor:pointer;text-decoration:underline;" @click="GetHotelLog(hotelSubItem,index,hotelSubIndex)">日志</div>
               </el-popover>
             </td>
           </tr>
@@ -112,21 +122,33 @@
       <table width="100%" class="comHotelOperation">
         <template v-if="HotelObj&&HotelObj.length>0&&showHotelObj.showCaozuoTime">
           <tr>
-            <td>开团时间：
+            <td class="tdRight">
+              开团时间：
+            </td>
+            <td class="tdLeft">
               <span v-if="HotelObj[0].PriceCreateDateStr">{{HotelObj[0].PriceCreateDateStr}}</span>
               <span v-else>暂无</span>
             </td>
-            <td style="padding-left:26px;">吃房时间：
+            <td class="tdRight">
+              吃房时间：
+            </td>
+            <td class="tdLeft">
               <span v-if="HotelObj[0].UseHotelTimeStr">{{HotelObj[0].UseHotelTimeStr}}</span>
               <span v-else>暂无</span>
             </td>
           </tr>
           <tr>
-            <td>地接团号生成时间：
+            <td class="tdRight">
+              地接团号生成时间：
+            </td>
+            <td class="tdLeft">
               <span v-if="HotelObj[0].DMCNumCreateTimeStr">{{HotelObj[0].DMCNumCreateTimeStr}}</span>
               <span v-else>暂无</span>
             </td>
-            <td>手配确认时间：
+            <td class="tdRight">
+              手配确认时间：
+            </td>
+            <td class="tdLeft">
               <span v-if="HotelObj[0].ShouPeiStatusTimeStr">{{HotelObj[0].ShouPeiStatusTimeStr}}</span>
               <span v-else>暂无</span>
             </td>
@@ -166,6 +188,11 @@
       commonHotelLog
     },
     methods: {
+      //调用子组件获取日志方法
+      GetHotelLog(subItem,index,hotelSubIndex) {
+        let str = `comHotelLog${index}${hotelSubIndex}`
+        this.$refs[str][0].getHotelLogsList(this.TCID,subItem.HotelId,subItem.UseDay);
+      },
       DownLoadShouPeiShu() {
         this.loading = true;
         let qMsg = {

src/components/commonPage/commonHotelLog.vue

 <!--酒店日志-->
 <style>
+ .commonHotelLog{
+   height: 150px;
+   overflow-y:scroll;
+ }
   .commonHotelLog>div:first-child {
     margin-bottom: 10px;
   }
@@ -59,9 +63,9 @@
 
 <template>
   <div>
-    <div class="commonHotelLog">
+    <div class="commonHotelLog" v-loading="loading">
       <div class="AuditLog">日志</div>
-      <div class="logContact" style="background:#f9f9f9; padding:20px 10px 0;">
+      <div class="logContact" style="background:#f9f9f9; padding:5px 10px 0;">
         <div v-if='HotelLogsList.length>0' v-for="(item,index) in HotelLogsList" :key="index">
           <div class="clearfix">
             <div class="Auditcircle" style="left: 6px!important;"></div>
@@ -75,13 +79,10 @@
     </div>
   </div>
 </template>
-
 <script>
   export default {
-    props: ["TCID", "HotelId", "UseTime"],
     data() {
       return {
-        reverse: true,
         loading: false,
         queryLogMsg: {
           pageIndex: 1,
@@ -98,6 +99,8 @@
     methods: {
       //获取日志
       getHotelLogsList(TCID, HotelId, timeStr) {
+        this.HotelLogsList=[];
+        this.loading = true;
         if (TCID) {
           this.queryLogMsg.TCID = TCID;
         }
@@ -108,15 +111,14 @@
           this.queryLogMsg.UseTime = timeStr;
         }
         this.apipost('DmcInfoChangeLog_get_GetHotelLogList', this.queryLogMsg, res => {
+          this.loading = false;
           if (res.data.resultCode == 1) {
             this.HotelLogsList = res.data.data.pageData;
           }
         }, err => {})
       },
     },
-    mounted() {
-      this.getHotelLogsList(this.TCID, this.HotelId, this.UseTime);
-    }
+    mounted() {}
   };
 
 </script>