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

src/components/FinancialModule/FinancialSubmodule/NewBillModule.vue

@@ -214,6 +214,7 @@
                             <th width="110">{{$t('fnc.jine')}}</th>
                             <th width="90">{{$t('hotel.hotel_Currency')}}</th>
                             <th width="85">{{$t('hotel.hotel_CurrentRate')}}</th>
+                            <th>汇兑损益</th>                            
                             <th>{{$t('fnc.bwbjine')}}</th>
                           </tr>
                           <tr>
@@ -224,6 +225,10 @@
                             <td>{{item.OriginalMoney}}</td>
                             <td>{{item.CurrencyName}}</td>
                             <td>{{item.Rate}}</td>
+                            <td>
+                              <span v-if="item.IsExChange==0">否</span>
+                              <span v-if="item.IsExChange==1">是</span>
+                            </td>
                             <td>{{item.Money}}</td>
                           </tr>
                       </table>
@@ -266,6 +271,7 @@
                           <th width="110">{{$t('fnc.jine')}}</th>
                           <th width="90">{{$t('hotel.hotel_Currency')}}</th>
                           <th width="85">{{$t('hotel.hotel_CurrentRate')}}</th>
+                            <th>汇兑损益</th>                                                      
                           <th>{{$t('fnc.bwbjine')}}</th>
                         </tr>
                         <tr>
@@ -276,6 +282,10 @@
                             <td>{{item.OriginalMoney}}</td>
                             <td>{{item.CurrencyName}}</td>
                             <td>{{item.Rate}}</td>
+                            <td>
+                              <span v-if="item.IsExChange==0">否</span>
+                              <span v-if="item.IsExChange==1">是</span>
+                            </td>
                             <td>{{item.Money}}</td>
                         </tr>
                     </table>

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/Hotel/HotelProductManage2.vue

@@ -1006,7 +1006,8 @@
       // 获取供应商
       initSupplier() {
         this.apipost("supplier_post_GetAllList", {
-          Type: 1
+          Type: 1,
+          Country:651
         }, res => {
           if (res.data.resultCode === 1) {
             this.SupplierList = res.data.data;

src/components/Hotel/HotelQueryList.vue

@@ -299,11 +299,13 @@
           pageIndex: 1,
           pageSize: 5,
           currentPage: 1,
-          total: 0
+          total: 0,
+          OpType:0
         },
         postMsg: {
           Id: 0,
-          TipContent: ''
+          TipContent: '',
+          OpType:0,
         },
         //默认显示弹窗信息
         showHQinfo: true,

src/components/Hotel/roomReservations.vue

@@ -240,14 +240,13 @@
                   {{item.Remarks}}
                 </div>
               </td>
-       
             </tr>
             <tr>
               <td :colspan="item.colNum" style="text-align: left!important;padding-left: 20px;">
                 <div class="link">
                   <p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.Titles}}</p>
-                  <div v-show="outItem.StaticsReportList[0].DMCRemark!=''" class="colorE95252">
-                    地接备注:{{outItem.StaticsReportList[0].DMCRemark}}</div>
+                  <div v-show="outItem.StaticsReportList[0].DMCRemark!=''" class="colorE95252"> 地接备注:{{outItem.StaticsReportList[0].DMCRemark}}</div>
+                  <div  v-show="item.CommonReport.Complain_Extend.Id>0" class="colorE95252">供应商投诉:{{item.CommonReport.Complain_Extend.ComplainContent}}</div>
                 </div>
               </td>
             </tr>

src/components/Supplier/AddSupplierComplaints.vue

@@ -95,11 +95,13 @@
   .Supplier_AC_content .w757 {
     width: 757px !important;
   }
-
+  .Supplier_TouSu .el-textarea__inner{
+    height:300px;
+  }
 </style>
 
 <template>
-  <div class="Supplier_AC_content">
+  <div class="Supplier_AC_content Supplier_TouSu">
     <div class="Supplier_AC_inputGroup">
       <el-input placeholder="请输入团号/编号" class="w757" v-model="QMsg.TCID">
         <el-button slot="append" @click="CheckTCID()">验证</el-button>
@@ -121,21 +123,21 @@
         </ul>
       </div>
       <p>投诉情况</p>
-      <div class="Supplier_AC_complaintList">
+      <!-- <div class="Supplier_AC_complaintList">
         <div class="t">主题内容：</div>
         <ul style="width:90%;">
           <li v-for="subItem in themeList" @click="getTheme(subItem)" :class="{'checked':subItem.isCheck}">
             {{subItem.Name}}
           </li>
         </ul>
-      </div>
+      </div> -->
 
       <el-input type="textarea" style="margin-top:10px;" :rows="5" v-model="EditMsg.ComplainContent"
-        placeholder="具体问题描述，以及投诉人的姓名、联系方式"></el-input>
+        placeholder="具体问题描述"></el-input>
     </div>
-    <p style="text-align: center; margin: 10px 0 15px 0;">
+    <p style="text-align: center; margin: 35px 0 15px 0;">
       <input type="button" class="normalBtn" value="保存" @click="SaveData()" />
-      <input type="button" class="normalBtn" value="取消" />
+      <input type="button" class="normalBtn" value="取消" @click="goUrl('roomQuery2')" />
     </p>
   </div>
 </template>
@@ -196,10 +198,10 @@
       },
       //保存数据
       SaveData(status) {
-        if (this.themeCked.length === 0) {
-          this.Error("请选择主题内容");
-          return false;
-        }
+        // if (this.themeCked.length === 0) {
+        //   this.Error("请选择主题内容");
+        //   return false;
+        // }
         //数据组装
         this.EditMsg.ComplainContentrs = "";
         let contentrArr = [];
@@ -260,6 +262,12 @@
             this.Error(res.data.message);
           }
         }, err => {});
+      },
+      goUrl(path) {
+        this.$router.push({
+          path: path,
+          query: {}
+        });
       }
     },
     created() {

src/components/Supplier/HotelInfo.vue

@@ -259,7 +259,7 @@
       <div class="btn-list" style="width: 350px;position: fixed;right: 20px;top:50px">
         <span class="common-lefttit"></span>
         <button class="save-Btn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
-        <button class="cancel-Btn" @click="goUrl('HotelManagement')">{{$t('pub.cancelBtn')}}</button>
+        <button class="cancel-Btn" @click="goUrl('HotelManagement2')">{{$t('pub.cancelBtn')}}</button>
       </div>
     </div>
 

src/components/Supplier/HotelManagement.vue

@@ -221,7 +221,7 @@
 <template>
   <div class="flexOne hotelmanagement">
     <div class="query-box">
-      <ul>
+      <ul style="position:relative;">
         <li>
           <span class="hotel_name">
             <em>{{$t('hotel.hotel_name')}}</em>
@@ -274,7 +274,7 @@
             </el-select>
           </span>
         </li>
-        <li>
+        <li style="position:absolute;top:0;right:10px;">
           <button class="hollowFixedBtn" type="button" @click="resetPageIndex(),selectResource()">{{$t('pub.searchBtn')}}</button>
           <button class="normalBtn" type="button" @click="goSubInfo('HotelInfo2')">{{$t('pub.addBtn')}}</button>
         </li>

src/components/Supplier/HotelProductManage.vue

 <template>
-  <div class="hotelProductManage2">
-    <div class="hotelProductManage2_btnList">
-      <div class="btn_check" @click="getMonths()">查询</div>
-      <div class="btn_check" @click="goEdit('1')">批量编辑</div>
-    </div>
+  <div class="hotelProductManage2" style="padding:20px;">
     <div class="hotelProductManage2_condition">
       <div>
         <em>起始月</em>
         <el-date-picker v-model="condition.month" type="month" value-format="yyyy-MM" :clearable="false"
           placeholder="选择月"></el-date-picker>
       </div>
+      <input type="button" class="normalBtn" value="查询" @click="getMonths()"/>
+      <input type="button" class="normalBtn" value="批量编辑" style="margin-right:10px;" @click="goEdit('1')"/>
     </div>
     <div class="hotelProductManage2_tableBox">
       <table class="hotelProductManage2_table" border="0" cellspacing="0" cellpadding="0">
@@ -29,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>
@@ -253,7 +251,7 @@
             <el-form-item label="供应商" prop="Supplier">
               <el-select v-model="msg2.Supplier" placeholder="请选择">
                 <el-option :label="$t('pub.unlimitedSel')" value='0'></el-option>
-                <el-option v-for="(item,index) in SupplierList" :key="index" :label="item.Name" :value="item.ID">
+                <el-option v-for="(item,index) in SupplierList" :key="index" :label="item.Name" :value="item.ID" v-if="userInfo.SupplierId==item.ID">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -268,7 +266,7 @@
       </el-form>
     </div>
     <!-- 弹出编辑 -->
-    <div class="hotelProductManage2_edit" v-show="editShow">
+    <div class="hotelProductManage2_edit" v-show="editShow" style="left:0;">
       <div class="hotelProductManage2_edit_header">
         <div>报价管理</div>
         <div>
@@ -477,7 +475,7 @@
             <el-form-item label="供应商" prop="Supplier">
               <el-select v-model="msg.Supplier" placeholder="请选择">
                 <el-option :label="$t('pub.unlimitedSel')" value='0'></el-option>
-                <el-option v-for="(item,index) in SupplierList" :key="index" :label="item.Name" :value="item.ID">
+                <el-option v-for="(item,index) in SupplierList" :key="index" :label="item.Name" :value="item.ID" v-if="userInfo.SupplierId==item.ID">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -578,6 +576,7 @@
           data: {}
         },
         editShow: false,
+        userInfo:{},
         msg: {
           Hotel: '0',
           Supplier: 30,
@@ -609,6 +608,7 @@
           TaxesPrice: 0, //税金
           BeforeDay:0,//提前还房天数
           FreeRoomNum:0,//免间数
+          OpType:1,//供应商操作
         },
         msg2: {
           Hotel: '0',
@@ -641,6 +641,7 @@
           TaxesPrice: 0, //税金
           BeforeDay:0,//提前还房天数
           FreeRoomNum:0,//免间数
+          OpType:1,//供应商操作
         },
         rules: {
           InventoryType: {
@@ -1006,7 +1007,7 @@
       // 获取供应商
       initSupplier() {
         this.ApiPost2("supplier_post_GetAllList", {
-          Type: 1
+          Type: 1,
         }, res => {
           if (res.data.resultCode === 1) {
             this.SupplierList = res.data.data;
@@ -1132,6 +1133,7 @@
       }
     },
     created: function () {
+      this.userInfo = this.getLocalStorageSupplier();
       this.hotelId = this.$route.query.id === undefined ? '0' : this.$route.query.id;
       this.msg.Hotel = this.$route.query.id === undefined ? '0' : this.$route.query.id;
       this.msg2.Hotel = this.$route.query.id === undefined ? '0' : this.$route.query.id;
@@ -1150,10 +1152,6 @@
 </script>
 
 <style>
-  .hotelProductManage2 {
-    padding: 20px 0;
-  }
-
   .hotelproductCkbox {
     width: 10%;
     height: 30px;

src/components/Supplier/HotelQueryList.vue

 <template>
-  <div>
+  <div class="hotelQury2">
     <div class="query-box" style="border-bottom: none;">
-      <ul>
+      <ul style="position:relative;">
         <li>
           <span>
-            <em>{{$t('system.quety_area')}}</em>
+            <em class="HQ_em">{{$t('system.quety_area')}}</em>
             <el-select v-model="msg.Province" filterable @change="getProvinceList(msg.Province,2)"
               :placeholder="$t('hotel.hotel_province')">
               <el-option :key="0" :value="0" label="请选择"></el-option>
@@ -17,7 +17,7 @@
           </span>
         </li>
         <li>
-          <span><em>{{$t('admin.admin_company')}}</em>
+          <span><em class="HQ_em">{{$t('admin.admin_company')}}</em>
             <el-select filterable v-model='msg.OutBranchId' :placeholder="$t('pub.unlimitedSel')">
               <el-option :label="$t('pub.unlimitedSel')" :value='-1'></el-option>
               <el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key="item.Id">
@@ -27,8 +27,8 @@
         </li>
         <li>
           <span>
-            <em>星级</em>
-            <el-select v-model="msg.Star" :placeholder="$t('pub.pleaseSel')">
+            <em class="HQ_em">星级</em>
+            <el-select v-model="msg.Star" class="w150" :placeholder="$t('pub.pleaseSel')">
               <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
               <el-option label="3星或商务" :value='3'></el-option>
               <el-option label="4星" :value='4'></el-option>
@@ -38,7 +38,7 @@
         </li>
         <li>
           <span>
-            <em>价格区间</em>
+            <em class="HQ_em">价格区间</em>
             <el-select v-model="msg.PriceLevel" :placeholder="$t('pub.pleaseSel')">
               <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
               <el-option label="5000以下" :value='1'></el-option>
@@ -51,7 +51,7 @@
             </el-select>
           </span>
         </li>
-        <li><span><em>日期</em>
+        <li><span><em class="HQ_em">日期</em>
             <el-date-picker v-model='msg.StartDate' value-format="yyyy-MM-dd" type="date" :picker-options="beforeCheck">
             </el-date-picker>
             <el-date-picker v-model='msg.EndDate' value-format="yyyy-MM-dd" type="date" :picker-options="afterCheck">
@@ -60,25 +60,25 @@
         </li>
         <li>
           <span>
-            <em>酒店</em>
+            <em class="HQ_em">酒店</em>
             <el-select v-model="msg.HotelChooseArray" :placeholder="$t('pub.pleaseSel')" class="multiple_input w300"
               filterable multiple :multiple-limit="3">
               <el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
             </el-select>
           </span>
         </li>
-        <li>
-          <input type="button" class="normalBtn" value="温馨提示"
+        <li style="position:absolute;top:0;right:10px;">
+          <input type="button" class="normalBtn" style="padding:0 12px;margin-left:0" value="温馨提示"
             @click="showNotice=true,resetPageIndex(),GetHotelTipList()" />
-          <input type="button" class="normalBtn" value="查询" @click="getList()" />
-          <input type="button" class="normalBtn" value="下载" @click="DownLoadHotelQuery()" />
+          <input type="button" class="normalBtn" value="查询" style="padding:0 12px;margin-left:5px" @click="getList()" />
+          <input type="button" class="normalBtn" value="下载" style="padding:0 12px;margin-left:5px" @click="DownLoadHotelQuery()" />
         </li>
       </ul>
     </div>
 
     <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>
@@ -86,12 +86,13 @@
         <span style="color:#000000;background-color: #02F78E;padding:2px 4px;border-radius:5px">特别价</span>
       </div>
       <template v-if="isShow">
-        <el-table v-if="dataList.length>0" :data="dataList" style="width:100%" border v-loading='loading' height="500">
+        <el-table v-if="dataList.length>0" :data="dataList" style="width:100%" border v-loading='loading' :height="tableHeight">
           <el-table-column fixed label="酒店名称" min-width="180">
             <template slot-scope="scope">
               <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">
@@ -136,7 +137,7 @@
 
     </div>
 
-    <div class="combottomDiv HqCom_bottom" v-if="showNotice">
+    <div class="combottomDiv HqCom_bottom" v-if="showNotice" style="left:0;">
       <el-form label-width="80px">
         <el-row>
           <el-col :span="20">
@@ -232,6 +233,39 @@
         <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 logsTable" style="width:100%;">
+          <tr>
+            <th width="50">操作人</th>
+            <th>日期</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="50">{{item.UseTimeStr}}</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>
@@ -253,6 +287,7 @@
           //价格等级
           PriceLevel: 0,
         },
+        tableHeight:0,
         beforeCheck: {
           disabledDate: time => {
             if (this.msg.StartDate) {
@@ -287,14 +322,25 @@
           pageIndex: 1,
           pageSize: 5,
           currentPage: 1,
-          total: 0
+          total: 0,
+          OpType:1,
         },
         postMsg: {
           Id: 0,
-          TipContent: ''
+          TipContent: '',
+          OpType:1
+        },
+        queryLogMsg:{
+          pageIndex: 1,
+          pageSize: 6,
+          currentPage: 1,
+          total: 0,
+          HotelId:0
         },
         //默认显示弹窗信息
         showHQinfo: true,
+        showLogInfo: false,
+        LogsList:[],
         //酒店温馨提示列表
         HotelTipList: [],
         HotelList: [],
@@ -362,6 +408,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);
@@ -439,6 +486,10 @@
         this.queryMsg.pageIndex = val;
         this.GetHotelTipList();
       },
+      handleCurrentChange2(val){
+        this.queryLogMsg.pageIndex = val;
+        this.getLogsList(this.queryLogMsg.HotelId);
+      },
       resetPageIndex() {
         this.queryMsg.pageIndex = 1;
         this.queryMsg.currentPage = 1;
@@ -557,6 +608,29 @@
             this.loading = false;
           });
       },
+      com_onresize(){
+        //clientHeight的值由DIV内容的实际高度和CSS中的padding值决定，
+        var contentsHeight = document.body.clientHeight;        
+        var h = contentsHeight - 50 - 134 - 50;
+        if(h < 110){
+            return;
+        }
+          //设置table的行高
+        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;
+              console.log(this.LogsList,'loglist');
+              this.queryLogMsg.total = res.data.data.count;
+          }
+        }, err => {})
+
+      }
     },
     mounted() {
       this.getBranchList();
@@ -564,6 +638,10 @@
       this.GetHotelList();
       this.getList();
       this.GetHotelTipList();
+      this.com_onresize();
+      window.onresize = () => {
+          this.com_onresize();
+      }
     },
   };
 
@@ -695,5 +773,10 @@
   .HotelQueryList .el-table td {
     padding: 0;
   }
-
+  .hotelQury2 .w150 .el-input{
+    width:150px;
+  }
+  .HQ_em{
+    min-width: 75px!important;
+  }
 </style>

src/components/Supplier/HotelSalesBoard.vue

@@ -213,10 +213,10 @@
 <template>
   <div class="flexOne hotelSalesBoard" style="padding:0 20px;">
     <div class="query-box Plan_Query">
-      <ul>
+      <ul style="position:relative;">
         <li>
           <span>
-            <em>{{$t('system.quety_area')}}</em>
+            <em style="min-width:60px;">{{$t('system.quety_area')}}</em>
             <el-select v-model="msg.Province" filterable @change="getProvinceList(msg.Province,2)"
               :placeholder="$t('hotel.hotel_province')">
               <el-option :key="0" :value="0" label="请选择"></el-option>
@@ -229,7 +229,7 @@
           </span>
         </li>
         <li>
-          <span><em>{{$t('admin.admin_company')}}</em>
+          <span><em style="min-width:60px;">{{$t('admin.admin_company')}}</em>
             <el-select filterable v-model='msg.OutBranchId' :placeholder="$t('pub.unlimitedSel')">
               <el-option :label="$t('pub.unlimitedSel')" :value='-1'></el-option>
               <el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key="item.Id">
@@ -239,7 +239,7 @@
         </li>
         <li>
           <span>
-            <em>酒店</em>
+            <em style="min-width:60px;">酒店</em>
             <el-select v-model="msg.HotelId" :placeholder="$t('pub.pleaseSel')" filterable>
               <el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option>
               <el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
@@ -256,7 +256,7 @@
             </el-select>
           </span>
         </li>
-        <li style="margin-right:50px;">
+        <li style="position:absolute;right:10px;top:0;">
           <button class="normalBtn" type="button" @click="GetHoltelInventory()">{{$t('pub.searchBtn')}}</button>
           <input type="button" class="normalBtn" value="下载" @click="DownLoadHotelSalesBoard()" />
         </li>
@@ -307,9 +307,10 @@
           <p style="word-break:breakall;" :class="stockColor(subItem.InventoryType)"
             v-for="subItem in dayItem.dayValue">{{subItem.HotelName}}
             (总: {{subItem.Inventory}} &nbsp;&nbsp;
+            <!--@click="goUrl('roomReservations',subItem,dayItem.DayStr,'订房管理')" text-decoration:underline;-->
             <a title="点击跳转到订房管理" v-if="subItem.UseInventory>0"
-              @click="goUrl('roomReservations',subItem,dayItem.DayStr,'订房管理')"
-              style="cursor:pointer;text-decoration:underline;"
+              
+              style="cursor:pointer;"
               :class="subItem.InventoryType==4 ? 'stock1' : 'stock2'">已用:{{subItem.UseInventory}}</a>
             <span v-else>已用:{{subItem.UseInventory}}</span>
             )

src/components/Supplier/HotelTotalStock.vue

@@ -332,10 +332,10 @@
 <template>
   <div class="flexOne hotelTS">
     <div class="query-box">
-      <ul>
+      <ul style="position:relative">
         <li>
           <span>
-            <em>{{$t('system.quety_area')}}</em>
+            <em style="min-width:60px;">{{$t('system.quety_area')}}</em>
             <el-select v-model="msg.Province" filterable @change="getProvinceList(msg.Province,2)"
               :placeholder="$t('hotel.hotel_province')">
               <el-option :key="0" :value="0" label="请选择"></el-option>
@@ -349,7 +349,7 @@
         </li>
         <li>
           <span>
-            <em>酒店</em>
+            <em style="min-width:60px;">酒店</em>
             <el-select v-model="msg.HotelId" :placeholder="$t('pub.pleaseSel')" filterable>
               <el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option>
               <el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
@@ -358,7 +358,7 @@
         </li>
         <li style="display:none;">
           <span>
-            <em>供应商</em>
+            <em style="min-width:60px;">供应商</em>
             <el-select v-model="msg.Supplier" placeholder="请选择">
               <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
               <el-option v-for="(item,index) in SupplierList" :key="index" :label="item.Name" :value="item.ID">
@@ -378,7 +378,7 @@
             </el-date-picker>
           </div>
         </li>
-        <li>
+        <li style="position:absolute;right:10px;top:0;">
           <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()" />
         </li>
       </ul>

src/components/Supplier/roomQuery.vue

 <template>
   <div>
     <div class="query-box" style="border-bottom: none;">
-      <ul>
+      <ul style="position:relative;">
         <li>
           <span>
             <em>{{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em>
@@ -95,7 +95,7 @@
               :picker-options="pickerBeginDateAfter"></el-date-picker>
           </span>
         </li>
-        <li>
+        <li style="position:absolute;right:10px;top:0;">
           <input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" />
           <input type="button" class="normalBtn" value="下载" @click="DownLoadHotel()" />
         </li>
@@ -140,7 +140,10 @@
                 {{childItem.CheckInDateStr}}
               </td>
               <td class="tdLeft">
-                {{childItem.NewHotelName}}
+               <template v-if="childItem.SupplierId==UserInfo.SupplierId"> {{childItem.NewHotelName}}</template>
+                <template v-else>
+                      组团社自理
+              </template>
               </td>
               <td>
                 <span style="color:red;">
@@ -149,16 +152,13 @@
                   <template v-else>{{childItem.DMCState==1?"[地接-OK]":(childItem.DMCState==0?"[未操作]":"[暂定]")}}
                   </template>
                   </template>
-                  <template v-else>
-                      [组团社自理]
-                  </template>
                 </span>
               </td>
               <td v-if="childIndex==0" :rowspan="subItem.hotelList.length">
                 <a style="text-decoration:underline;color:blue;cursor:pointer"
                   @click="AddSupplierComplain(subItem.Complain_Extend.Id,subItem.Complain_Extend.TCID)">
-                  <template v-if="subItem.Complain_Extend.Id>0">编辑</template>
-                  <template v-else>添加</template>
+                  <template v-if="subItem.Complain_Extend.Id>0">编辑投诉</template>
+                  <template v-else>添加投诉</template>
                 </a>
                 <a style="text-decoration:underline;color:red;cursor:pointer" v-if="subItem.Complain_Extend.Id>0"
                   @click="DeleteSupplierComplain(subItem.Complain_Extend.Id)">删除</a>
@@ -512,7 +512,7 @@
   .roomQuery_SupplierTable tr td {
     border: 1px solid #d1d1d1;
     text-align: center;
-    padding: 10px 0;
+    padding: 5px 0;
 }
 
   .roomQuery_SupplierTable .tdLeft {

src/router/config.js

@@ -2574,6 +2574,14 @@ export default {
                                 title: '原路退款查询'
                             },
                         },
+                        {  //财务 财务单据 汇兑损益查询
+                            path: '/ExchangeLoss',
+                            name: 'ExchangeLoss',
+                            component: resolve => require(['@/components/FinancialModule/ExchangeLoss'], resolve),
+                            meta: {
+                                title: '汇兑损益查询'
+                            },
+                        },
                         { //财务 财务单据 出纳工作台
                             path: '/CashierWork',
                             name: 'CashierWork',