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

src/components/Supplier/HotelQueryList.vue

@@ -234,7 +234,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog custom-class="w800" title="操作日志" :visible.sync="showLogInfo" center>
+    <el-dialog custom-class="w800" title="操作日志" :visible.sync="showLogInfo" center :before-close="closeChangeMachie">
       <el-form>
         <table border="0" cellspacing="1" cellpadding="0" class="HouseTypeList Hq_addTable logsTable" style="width:100%;">
           <tr>
@@ -262,7 +262,7 @@
         </el-pagination>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <button class="hollowFixedBtn" @click="showLogInfo = false">关闭</button>
+        <button class="hollowFixedBtn" @click="showLogInfo = false,queryLogMsg.pageIndex=1">关闭</button>
       </div>
     </el-dialog>
 
@@ -341,6 +341,7 @@
         showHQinfo: true,
         showLogInfo: false,
         LogsList:[],
+        HotelId:0,
         //酒店温馨提示列表
         HotelTipList: [],
         HotelList: [],
@@ -488,7 +489,7 @@
       },
       handleCurrentChange2(val){
         this.queryLogMsg.pageIndex = val;
-        this.getLogsList(this.queryLogMsg.HotelId);
+        this.getLogsList(this.HotelId);
       },
       resetPageIndex() {
         this.queryMsg.pageIndex = 1;
@@ -621,15 +622,20 @@
       //获取日志
       getLogsList(HotelId){
         this.showLogInfo = true;
+        this.HotelId = HotelId;
         this.queryLogMsg.HotelId = HotelId;
         this.ApiPost2('DmcInfoChangeLog_get_GetHotelLogList', this.queryLogMsg, res => {
+          console.log(res,'ressss');
           if (res.data.resultCode == 1) {
               this.LogsList = res.data.data.pageData;
               console.log(this.LogsList,'loglist');
               this.queryLogMsg.total = res.data.data.count;
           }
         }, err => {})
-
+      },
+      closeChangeMachie(){
+        this.showLogInfo = false;
+        this.queryLogMsg.pageIndex = 1;
       }
     },
     mounted() {