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

src/components/FinancialModule/addFinancialDocuments.vue

@@ -862,6 +862,7 @@ export default {
             e.target.value = (e.target.value.match(/^\d*(\.?\d{0,1})/g)[0]) || null
         },
         AddFinancial(z){  //保存
+            
             if(z){
                 this.msg.Status = 0;
             }else{
@@ -904,7 +905,6 @@ export default {
           if(this.orderObj!=null&&this.orderObj.OrderSource===10){
             // console.log("getGuestInfo",this.$store.getters.getGuestInfo)
             let guestInfo = JSON.parse(sessionStorage.getItem("saveGuestInfo"));
-             console.log("getGuestInfo",guestInfo)
             //  return;
             this.msg.GuestInfoList=[];
             if(guestInfo!=null&&guestInfo.length>0){
@@ -913,7 +913,6 @@ export default {
               })
             }
           }
-          console.log("1234",this.msg);
           this.loading = true;
           this.msg.Description=this.Description;
             this.apipost('Financial_post_Set',this.msg,res=>{
@@ -1306,6 +1305,9 @@ export default {
             }, err => {})
         },
         admin_get_DepartmentGetList(Bid, T){
+            if(Bid==0){
+                this.chosenPeople=[];
+            }
           // this.msg.RB_Depart_Id = '';
           // this.departmentMsg.RB_Branch_Id = Bid ? Bid : -1;
           this.departmentMsg.RB_Branch_Id = -1;
@@ -1369,7 +1371,7 @@ export default {
                                 this.companyList = data;   
                             }
                         }
-                        
+                        console.log('this.companyList', this.companyList)
                     }, err => {})
                  
                 }
@@ -1458,7 +1460,8 @@ export default {
                 this.Description= gj+' '+gn+' '+gjzd+ ' '+ sj+' '+sc
             }
         }
-    },created(){
+    },
+    created(){
         var that=this;
         this.orderObj = this.$route.query.orderObj?JSON.parse(this.$route.query.orderObj):null;
         this.isFrompassenger = this.orderObj.isFromPassenger;
@@ -1473,7 +1476,8 @@ export default {
           }
           
         }
-    },mounted(){
+    },
+    mounted(){
         let userInfo = this.getLocalStorage();
         this.department = userInfo.DepartName;
         this.EmployeeId=userInfo.EmployeeId;

src/components/Supplier/HotelProductManage.vue

@@ -27,8 +27,8 @@
         </tbody>
       </table>
     </div>
-    <div class="hotelProductManage2_tableBox">
-      <span style="color:#000000;background-color: #ff3737;padding:2px 4px;border-radius:5px">红日</span>
+    <div style="margin-bottom:20px;">
+      <span style="color:#000000;background-color: #ff3737;padding:2px 4px;border-radius:5px;color:#fff;">红日</span>
       <span style="color:#000000;background-color: #ff99cc;padding:2px 4px;border-radius:5px">旺季</span>
       <span style="color:#000000;background-color: #bcd6ee;padding:2px 4px;border-radius:5px">平季</span>
       <span style="color:#000000;background-color: #DDDDDD;padding:2px 4px;border-radius:5px">淡季</span>

src/components/Supplier/HotelQueryList.vue

@@ -78,7 +78,7 @@
 
     <div style="width: 100%;min-height:200px;  overflow-x: auto;padding:0 20px; " class="HotelQueryList"
       v-loading="loading">
-      <div class="hotelProductManage2_tableBox" style="margin-bottom:20px;">
+      <div style="margin-bottom:20px;">
         <span style="color:#fff;background-color: #ff3737;padding:2px 4px;border-radius:5px">红日</span>
         <span style="color:#000000;background-color: #ff99cc;padding:2px 4px;border-radius:5px">旺季</span>
         <span style="color:#000000;background-color: #bcd6ee;padding:2px 4px;border-radius:5px">平季</span>
@@ -92,6 +92,7 @@
               <div style="text-decoration: underline;cursor:pointer">
                 {{scope.row.HotelName}}</div>
               <div>{{scope.row.TotalInventory}}</div>
+              <input type="button" class="normalBtn" style="margin-left:0;height:22px;padding:0 10px;" @click="getLogsList(scope.row.HotelId)" value="操作日志"/>
             </template>
           </el-table-column>
           <el-table-column label="价格&库存" fixed min-width="120">
@@ -232,6 +233,37 @@
         <button class="hollowFixedBtn" @click="showHQinfo = false">关闭</button>
       </div>
     </el-dialog>
+
+    <el-dialog custom-class="w800" title="操作日志" :visible.sync="showLogInfo" center>
+      <el-form>
+        <table border="0" cellspacing="1" cellpadding="0" class="HouseTypeList Hq_addTable" style="width:100%;">
+          <tr>
+            <th width="50">操作人</th>
+            <th>操作时间</th>
+            <th width="70">内容</th>
+          </tr>
+          <template v-if="LogsList.length>0">
+            <tr v-for="(item,index) in LogsList">
+              <td width="50">{{item.CreateByName}}</td>
+              <td width="80">
+                  {{item.CreateTimeStr}}
+              </td>
+              <td>{{item.Remarks}}</td>
+            </tr>
+          </template>
+          <tr v-else>
+            <td colspan="5">暂无数据...</td>
+          </tr>
+        </table>
+        <el-pagination background @current-change="handleCurrentChange2" :current-page.sync="queryLogMsg.currentPage"
+          :page-size="queryLogMsg.pageSize" layout="total,prev, pager, next, jumper" :total="queryLogMsg.total">
+        </el-pagination>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <button class="hollowFixedBtn" @click="showLogInfo = false">关闭</button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 <script>
@@ -296,8 +328,17 @@
           TipContent: '',
           OpType:1
         },
+        queryLogMsg:{
+          pageIndex: 1,
+          pageSize: 5,
+          currentPage: 1,
+          total: 0,
+          HotelId:0
+        },
         //默认显示弹窗信息
         showHQinfo: true,
+        showLogInfo: false,
+        LogsList:[],
         //酒店温馨提示列表
         HotelTipList: [],
         HotelList: [],
@@ -365,6 +406,7 @@
             this.loading = false;
             if (res.data.resultCode == 1) {
               this.dataList = res.data.data;
+              console.log(this.dataList,'datalist');
               this.isShow = true;
             } else {
               this.Error(res.data.message);
@@ -442,6 +484,10 @@
         this.queryMsg.pageIndex = val;
         this.GetHotelTipList();
       },
+      handleCurrentChange2(val){
+        this.queryLogMsg.pageIndex = val;
+        this.getLogsList();
+      },
       resetPageIndex() {
         this.queryMsg.pageIndex = 1;
         this.queryMsg.currentPage = 1;
@@ -568,8 +614,20 @@
             return;
         }
           //设置table的行高
-          this.tableHeight =  h;
-        }
+        this.tableHeight =  h;
+      },
+      //获取日志
+      getLogsList(HotelId){
+        this.showLogInfo = true;
+        this.queryLogMsg.HotelId = HotelId;
+        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 => {})
+
+      }
     },
     mounted() {
       this.getBranchList();

src/components/SupplierIndex.vue

@@ -2,7 +2,7 @@
   <div style="position: relative;" ref="firstParent">
     <div class="nav">
       <div class="nav-left">
-        <img class="GroupPic" src="../assets/img/default_head_img.jpg" />
+        <img class="GroupPic" src="../assets/img/daxiang.png" />
       </div>
       <div class="nav-middle">
         <ul class="clearfix" :style="{width:`${allWindowWidth}px`}">