11

src/components/busManagement/BookAcar/components/JapanMonthRunList.vue

@@ -79,9 +79,8 @@
       <font class="jieji">接机 √</font> &nbsp;<font class="songji">送机 √</font>&nbsp;
       <font class="yiriyou">一日游 √</font>
     </div>
-
-    <el-table ref="mytableJap" :data="OrderList" style="width: 100%" :loading="loading" :height="tableHeight"
-      key="index">
+    <!--:height="tableHeight"-->
+    <el-table ref="mytableJap" :data="OrderList" style="width: 100%" :loading="loading" key="index">
       <el-table-column fixed prop="SupplierName" :label="$t('objFill.v101.busManagement.chegongs')" width="150">
         <template slot-scope="scope">
           <div class="text-p-xs">{{scope.row.SupplierName}}</div>

src/components/busManagement/BookAcar/components/JapanOrderList.vue

@@ -12,7 +12,8 @@
 </style>
 <template>
   <div class="japanorder">
-    <el-table :data="OrderList" style="width: 100%" height="500">
+    <!--height="500"-->
+    <el-table :data="OrderList" style="width: 100%" >
       <el-table-column fixed prop="CustomerName" :label="$t('objFill.v101.busManagement.shiyongdanw')" width="150">
       </el-table-column>
       <el-table-column fixed :label="$t('objFill.v101.busManagement.yongchexinzhi')" width="165">

src/components/busManagement/JapanBusMonthFStatistics.vue

@@ -40,8 +40,9 @@
         </li>
       </ul>
     </div>
+    <!--:style="{height: boxHeight + 'px'}"-->
     <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; margin-top: 10px; " class="ownScrollbarStyle"
-      :style="{height: boxHeight + 'px'}">
+      >
       <OrderList :pagesTitle="Title" :OrderList="DataList" :loading="loading" @success="msg.pageIndex=1,GetList()">
       </OrderList>
     </div>

src/components/busManagement/JapanBusMonthStatistics.vue

@@ -129,6 +129,7 @@
           this.loading = false;
           if (res.data.resultCode == 1) {
             this.DataList = res.data.data.pageData;
+            this.total = res.data.data.count;
           } else {
             this.Error(res.data.message);
           }