Merge branch 'master' of http://120.26.64.82:3000/BFFE/SZYGM1.0

src/styles/index.scss

@@ -1,8 +1,8 @@
-@import "./variables.scss";
-@import "./transition.scss";
-@import "./scss-suger.scss";
-@import "./reset-style.scss";
-@import "./elemenet-style-overflow.scss";
+@import './variables.scss';
+@import './transition.scss';
+@import './scss-suger.scss';
+@import './reset-style.scss';
+@import './elemenet-style-overflow.scss';
 
 //scroll
 @mixin main-show-wh() {
@@ -18,6 +18,7 @@
 .scroll-y {
   @include main-show-wh();
   overflow-y: auto;
+  overflow-x: hidden;
 }
 .scroll-x {
   @include main-show-wh();
@@ -93,7 +94,7 @@
       background: #eb2f3b;
       border-radius: 50%;
       margin-right: 15px;
-      background: url("@/assets/status/ic_close_hint.png") no-repeat;
+      background: url('@/assets/status/ic_close_hint.png') no-repeat;
       background-size: 100% 100%;
       display: inline-block;
       position: relative;

src/views/baggageManagement/arrival/waybill/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="station">
+  <div class="station scroll-y">
     <div class="station-head">
       <div class="station-head-title">运单基本信息</div>
       <div class="station-head-content flex">
@@ -50,7 +50,7 @@
       </div>
     </div>
     <div class="station-table">
-      <Table :tableHeader="tableHeader" :tableData="tableData" />
+      <Table height="calc(100vh - 800px)" :tableHeader="tableHeader" :tableData="tableData" />
     </div>
   </div>
 </template>

src/views/baggageManagement/departure/waybill/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="station">
+  <div class="station scroll-y">
     <div class="station-head">
       <div class="station-head-title">运单基本信息</div>
       <div class="station-head-content flex">
@@ -50,7 +50,7 @@
       </div>
     </div>
     <div class="station-table">
-      <Table :tableHeader="tableHeader" :tableData="tableData" />
+      <Table height="calc(100vh - 800px)" :tableHeader="tableHeader" :tableData="tableData" />
     </div>
   </div>
 </template>