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

src/components/Supplier/HotelManagement.vue

@@ -280,7 +280,7 @@
         </li>
       </ul>
     </div>
-    <div class="hotelResource clearfix" v-loading="loading">
+    <div class="hotelResource clearfix" v-loading="loading" style="padding:0 20px;">
       <div class="resourceList" v-for="(item,index) in tableData" :key="index">
         <div class="reTopInfo" :class="{'comCursorUrl':item.URL}" @click="OpenNewUrl(item.URL)">
           <img v-if="!item.PicPath" src="../../assets/img/bg_c3@3x.png">

src/components/Supplier/HotelQueryList.vue

@@ -76,10 +76,10 @@
       </ul>
     </div>
 
-    <div style="width: 100%;min-height:200px;  overflow-x: auto;padding-bottom: 10px; " class="HotelQueryList"
+    <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;">
-        <span style="color:#000000;background-color: #ff3737;padding:2px 4px;border-radius:5px">红日</span>
+        <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>
         <span style="color:#000000;background-color: #DDDDDD;padding:2px 4px;border-radius:5px">淡季</span>
@@ -581,6 +581,7 @@
 
   .classHong {
     background-color: rgb(255, 55, 55);
+    color:#fff;
   }
 
   .classWang {

src/components/Supplier/HotelSalesBoard.vue

@@ -211,7 +211,7 @@
 
 </style>
 <template>
-  <div class="flexOne hotelSalesBoard">
+  <div class="flexOne hotelSalesBoard" style="padding:0 20px;">
     <div class="query-box Plan_Query">
       <ul>
         <li>

src/components/Supplier/roomQuery.vue

@@ -29,12 +29,13 @@
             <el-input v-model='msg.TCNUM'></el-input>
           </span>
         </li>
-        <li><span><em>日期</em>
-            <el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"
-              :picker-options="pickerBeginDateBefore"></el-date-picker>
-            -
-            <el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"
-              :picker-options="pickerBeginDateAfter"></el-date-picker>
+        <li>
+          <span>
+            <em>酒店</em>
+            <el-select v-model="msg.HotelId" :placeholder="$t('pub.pleaseSel')" filterable>
+              <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
+              <el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
+            </el-select>
           </span>
         </li>
         <li><span>
@@ -86,11 +87,12 @@
         </li>
         <li>
           <span>
-            <em>酒店</em>
-            <el-select v-model="msg.HotelId" :placeholder="$t('pub.pleaseSel')" filterable>
-              <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
-              <el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
-            </el-select>
+            <em>日期</em>
+            <el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"
+              :picker-options="pickerBeginDateBefore"></el-date-picker>
+            -
+            <el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"
+              :picker-options="pickerBeginDateAfter"></el-date-picker>
           </span>
         </li>
         <li>
@@ -100,7 +102,7 @@
       </ul>
     </div>
     <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle">
-      <div style="font-size:12px;padding:2px 4px 3px 4px; color:red">注意事项:每次导出数据最好不要超过一个月。</div>
+      <div style="font-size:12px;padding:2px 4px 3px 20px; color:red">注意事项:每次导出数据最好不要超过一个月。</div>
       <table border="0" cellspacing="1" cellpadding="0" class="roomQuery_SupplierTable" v-loading='loading'>
         <tr>
           <th width="100">序号</th>
@@ -490,8 +492,14 @@
     background: #eee !important;
   }
 
-  .roomQuery_SupplierTable {
-    background: #ccc;
+  .roomQuery_SupplierTable{
+    width: 98%;
+    font-size: 12px;
+    color: #333;
+    margin: auto;
+    border-collapse: collapse;
+    background-color: #fff;
+    border: 1px solid #d1d1d1;
   }
 
   .roomQuery_SupplierTable tr th {
@@ -501,17 +509,11 @@
     color: #333;
   }
 
-  .roomQuery_SupplierTable tr {
-    background: #fff;
-    text-align: center;
-  }
-
   .roomQuery_SupplierTable tr td {
-    font-size: 12px;
-    line-height: 22px;
-    height: 22px;
-    ;
-  }
+    border: 1px solid #d1d1d1;
+    text-align: center;
+    padding: 10px 0;
+}
 
   .roomQuery_SupplierTable .tdLeft {
     text-align: left;

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',