新增日志组件

src/components/SalesModule/groupInquiry.vue

@@ -815,7 +815,7 @@ export default {
         //航班配置
         FlightState:0,
         TCVisaStatus: '-1',
-        IsShowUnion:0,
+        IsShowUnion:-1,
         QueryType:1,//查询类型 1:签证
       },
       remarkMsg: {
@@ -1188,7 +1188,7 @@ export default {
       msg['IsVisaSelect'] = 1;
       this.queryCommonData.loading=true;
       this.apipost(
-        "travel_get_GetTravelPrciePageList",
+        "travel_get_GetTravelPrciePageList_V2",
         msg,
         res => {
           this.queryCommonData.loading=false;

src/components/commonPage/commonHotelInfo.vue

 <style>
-  .comHotelOperation{margin-top:10px;}
-  .comHotelOperation tr td{
+  .comHotelOperation {
+    margin-top: 10px;
+  }
+
+  .comHotelOperation tr td {
     text-align: left;
-    width:50%;
-    padding:5px 0;
+    width: 50%;
+    padding: 5px 0;
   }
+
 </style>
 
 <template>
@@ -12,18 +16,18 @@
     <div>
       <table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
         <tr v-if="showHotelObj.showPrice">
-           <td>
-             公司团号
-           </td>
-           <td :colspan="3" style="text-align:left;">
-              <span style="padding-left:5px;">{{TCNUM}} ({{TCID}})</span>
-           </td>
-           <td>
-             地接团号
-           </td>
-           <td :colspan="showHotelObj.ShowTaxType?5:3" style="text-align:left;">
-              <span style="padding-left:5px;">{{DMCNum}}</span>
-           </td>
+          <td>
+            公司团号
+          </td>
+          <td :colspan="3" style="text-align:left;">
+            <span style="padding-left:5px;">{{TCNUM}} ({{TCID}})</span>
+          </td>
+          <td>
+            地接团号
+          </td>
+          <td :colspan="showHotelObj.ShowTaxType?5:3" style="text-align:left;">
+            <span style="padding-left:5px;">{{DMCNum}}</span>
+          </td>
         </tr>
         <tr>
           <th width="120">日期</th>
@@ -36,6 +40,9 @@
           <th style="width:120px;" v-if="showHotelObj.ShowRebateRatio">返佣比例</th>
           <th style="width:120px" v-if="showHotelObj.showZhan">占房时间</th>
           <th style="width:100px" v-if="showHotelObj.showZhan">确认时间</th>
+          <th style="width:100px;display:none">
+            日志
+          </th>
         </tr>
         <template v-for="hotelItem in  HotelObj">
           <tr v-for="(hotelSubItem,hotelSubIndex) in hotelItem.SubList">
@@ -90,6 +97,13 @@
             <td v-if="showHotelObj.showZhan">
               {{hotelSubItem.SureTimeStr}}
             </td>
+            <td style="display:none;">
+              <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>
+              </el-popover>
+            </td>
           </tr>
         </template>
       </table>
@@ -123,22 +137,23 @@
             <td colspan="2" style="padding:10px 0;text-align:center;">
               <input type="button" class="normalBtn" :value="HotelObj[0].ShouPeiStatus==0?'手配书(确定)':'手配书(暂定)'"
                 v-if="showHotelObj.ShowShouPeiStatus" @click="subSetShouPeiShu(HotelObj[0].ShouPeiStatus)" />
-                <template v-if="showHotelObj.isFromTCList">
-                    <input type="button" v-if="HotelObj[0].ShouPeiStatus==1" class="normalBtn" value="下载" @click="DownLoadShouPeiShu()" />
-                </template>
-                <template v-else>
-                    <input type="button" class="normalBtn" value="下载" @click="DownLoadShouPeiShu()" />  
-                </template>
+              <template v-if="showHotelObj.isFromTCList">
+                <input type="button" v-if="HotelObj[0].ShouPeiStatus==1" class="normalBtn" value="下载"
+                  @click="DownLoadShouPeiShu()" />
+              </template>
+              <template v-else>
+                <input type="button" class="normalBtn" value="下载" @click="DownLoadShouPeiShu()" />
+              </template>
             </td>
           </tr>
         </template>
       </table>
     </div>
-
   </div>
 </template>
 
 <script>
+  import commonHotelLog from "../commonPage/commonHotelLog.vue";
   export default {
     props: ["HotelObj", "showHotelObj", "TCID", "DMCNum", "TCNUM"],
     data() {
@@ -146,6 +161,10 @@
         loading: false,
       };
     },
+    components: {
+      //日志组件
+      commonHotelLog
+    },
     methods: {
       DownLoadShouPeiShu() {
         this.loading = true;
@@ -161,15 +180,13 @@
       //子组件调用父组件方法
       subSetShouPeiShu(ShouPeiStatus) {
         var that = this;
-        var str="是否将手配书设置成"+(ShouPeiStatus==0?"【确定】":"【暂定】")+"?";
+        var str = "是否将手配书设置成" + (ShouPeiStatus == 0 ? "【确定】" : "【暂定】") + "?";
         this.Confirm(str, function () {
           that.$emit('SetShouPeiShu');
         });
       }
     },
-    mounted() {
-      
-    }
+    mounted() {}
   };
 
 </script>

src/components/commonPage/commonHotelLog.vue

+<!--酒店日志-->
+<style>
+  .commonHotelLog>div:first-child {
+    margin-bottom: 10px;
+  }
+
+  .commonHotelLog::-webkit-scrollbar {
+    /*滚动条整体样式*/
+    width: 4px;
+    /*高宽分别对应横竖滚动条的尺寸*/
+    height: 1px;
+  }
+
+  .commonHotelLog::-webkit-scrollbar-thumb {
+    /*滚动条里面小方块*/
+    border-radius: 4px;
+    -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
+    background: #c9c9c9;
+  }
+
+  .commonHotelLog::-webkit-scrollbar-track {
+    /*滚动条里面轨道*/
+    -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
+    border-radius: 4px;
+    background: #ededed;
+  }
+
+  .commonHotelLog .logContact {
+    width: 90%;
+    height: auto;
+    margin-top: 20px;
+    padding-left: 20px;
+    position: relative;
+  }
+
+  .commonHotelLog .logContact>div {
+    padding: 0 0 20px 20px;
+    border-left: 1px solid #d1d1d1;
+  }
+
+  .commonHotelLog .logContact>div:last-child {
+    border: none;
+  }
+
+  .commonHotelLog .AuditLog {
+    margin-left: 15px;
+  }
+
+  .commonHotelLog .Auditcircle {
+    position: absolute;
+    width: 10px;
+    height: 10px;
+    left: 16px;
+    background-color: #e95252;
+    border-radius: 50%;
+  }
+
+</style>
+
+<template>
+  <div>
+    <div class="commonHotelLog">
+      <div class="AuditLog">日志</div>
+      <div class="logContact" style="background:#f9f9f9; padding:20px 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>
+            <div class="operateName" style="color:#005CAA;font-size:12px;">{{item.CreateByName}} {{item.CreateTimeStr}}
+            </div>
+          </div>
+          <div class="fz12 color333">{{item.Remarks}}</div>
+        </div>
+        <div v-if='HotelLogsList.length==0'>暂无数据</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    props: ["TCID", "HotelId", "UseTime"],
+    data() {
+      return {
+        reverse: true,
+        loading: false,
+        queryLogMsg: {
+          pageIndex: 1,
+          pageSize: 15,
+          currentPage: 1,
+          HotelId: 0,
+          TCID: 0,
+          UseTime: ''
+        },
+        //酒店日志
+        HotelLogsList: [],
+      };
+    },
+    methods: {
+      //获取日志
+      getHotelLogsList(TCID, HotelId, timeStr) {
+        if (TCID) {
+          this.queryLogMsg.TCID = TCID;
+        }
+        if (HotelId) {
+          this.queryLogMsg.HotelId = HotelId;
+        }
+        if (timeStr) {
+          this.queryLogMsg.UseTime = timeStr;
+        }
+        this.apipost('DmcInfoChangeLog_get_GetHotelLogList', this.queryLogMsg, res => {
+          if (res.data.resultCode == 1) {
+            this.HotelLogsList = res.data.data.pageData;
+          }
+        }, err => {})
+      },
+    },
+    mounted() {
+      this.getHotelLogsList(this.TCID, this.HotelId, this.UseTime);
+    }
+  };
+
+</script>