修改

src/components/Supplier/roomQuery2.vue

@@ -103,7 +103,7 @@
     <el-dialog custom-class='w800' title="酒店信息" :visible.sync="hotelUseDetail" center>
           <table class="rq_HotelTable" v-loading="hotelLoading">
               <tr>
-                <th width="120">
+                <th width="130">
                   时间
                 </th>
                 <th width="150">
@@ -117,6 +117,7 @@
                 </th>
                 <th width="100">提醒</th>
                 <th width="150">备注</th>
+                <th width="50">日志</th>
               </tr>
               <template v-for="(subItem,subIndex) in HotelList">
                 <tbody>
@@ -174,6 +175,28 @@
                           <textarea class="w135" cols="25" rows="5" v-model='childItem.SupplierToDmcRemarks'></textarea>
                         </template>
                       </td>
+                      <td style="text-align:center;">
+                        <el-tooltip effect="dark" content="日志" placement="top-start">
+                          <el-popover width='230' 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;">{{item.emName}}</div>
+                                    <div class="operateDate fz12 color666">{{item.x}}</div>
+                                  </div>
+                                  <div class="fz12 color333">{{item.logInfo}}</div>
+                                </div>
+                                <div v-if='LogsList.length==0'>暂无数据</div>
+                              </div>
+                            </div>
+                            <el-button slot="reference"  @click='getLogsList(childItem.TCID,childItem.HotelId,subItem.UseTimeStr)' type="primary"
+                              style='background:#47BF8C; border-color:#47BF8C;padding:5px;' icon="iconfont icon-rizhi1"></el-button>
+                          </el-popover>
+                        </el-tooltip>
+                      </td>
                     </tr>
                     <tr>
                       <td colspan="6">
@@ -261,7 +284,8 @@
           currentPage: 1,
           total: 0,
           HotelId: 0,
-          TCID: 0
+          TCID: 0,
+          sDate:''
         },
         //是否为今天
         isToday: false,
@@ -271,16 +295,22 @@
     },
     methods: {
       //获取日志
-      getLogsList(TCID) {
-        // if (TCID) {
-        //   this.queryLogMsg.TCID = TCID;
-        // }
-        // this.ApiPost2('DmcInfoChangeLog_get_GetHotelLogList', this.queryLogMsg, res => {
-        //   if (res.data.resultCode == 1) {
-        //     this.LogsList = res.data.data.pageData;
-        //     this.queryLogMsg.total = res.data.data.count;
-        //   }
-        // }, err => {})
+      getLogsList(TCID,HotelId,timeStr) {
+        if (TCID) {
+          this.queryLogMsg.TCID = TCID;
+        }
+        if(HotelId){
+          this.queryLogMsg.HotelId = HotelId;
+        }
+        this.queryLogMsg.sDate = timeStr;
+        this.ApiPost2('DmcInfoChangeLog_get_GetHotelLogList', this.queryLogMsg, res => {
+          if (res.data.resultCode == 1) {
+            console.log(res,'res');
+            this.LogsList = res.data.data.pageData;
+            this.queryLogMsg.total = res.data.data.count;
+            console.log(this.LogsList,'Losglist');
+          }
+        }, err => {})
       },
       //保存信息
       saveSupplierjourneyorder(HotelList) {
@@ -333,6 +363,7 @@
           this.hotelLoading = false;
           if (res.data.resultCode == 1) {
             this.HotelList = res.data.data;
+            console.log(this.HotelList,'HotelList');
           } else {
             this.Error(res.data.message);
           }
@@ -640,4 +671,48 @@
   .roomQuery .page-component-up:hover i{
     color: #F1f1f1;
   }
+  .priceContentDiv {
+    overflow: auto;
+    max-height: 200px;
+  }
+  .priceContentDiv>div:first-child {
+    margin-bottom:10px;
+  }
+  .priceContentDiv::-webkit-scrollbar {
+    /*滚动条整体样式*/
+    width: 4px;
+    /*高宽分别对应横竖滚动条的尺寸*/
+    height: 1px;
+  }
+  .priceContentDiv::-webkit-scrollbar-thumb {
+    /*滚动条里面小方块*/
+    border-radius: 4px;
+    -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
+    background: #c9c9c9;
+  }
+  .priceContentDiv::-webkit-scrollbar-track {
+    /*滚动条里面轨道*/
+    -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
+    border-radius: 4px;
+    background: #ededed;
+  }
+
+  .logContact {
+    width:90%;
+    height:auto;
+    margin-top: 20px;
+    padding-left:20px;
+    position: relative;
+  }
+  .logContact>div {
+    padding:0 0 20px 20px;
+    border-left:1px solid #d1d1d1;
+  }
+  .logContact>div:last-child {
+    border:none;
+  }
+  .AuditLog {
+    margin-left:15px;
+  }
+
 </style>