清单精灵高度

web/building_saas/main/html/main.html

@@ -437,20 +437,16 @@
                                               </div>
                                           </div>
                                       </div>
-                                      <div class="container-fluid" id="qdjl" role="tabpanel">
+                                      <div class="container-fluid main-data-bottom ovf-hidden" id="qdjl" role="tabpanel">
                                           <div class="row p-0" style="background: #efefef">
                                               <div class="col-6 p-0">
-                                                  <div id="qdjlTools" style="width: calc(100% - 5px); border-bottom: solid 1px lightgrey">
-                                                      <a id="elfInsertRation" href="javascript:void(0);" class="btn btn-sm btn-primary px-1 m-1">应用选项</a>
-                                                      <a id="elfInsertSingle" href="javascript:void(0)" class="btn btn-sm btn-primary px-1">应用单条</a>
+                                                  <div id="qdjlTools" style="width: calc(100% - 5px); border-bottom: solid 1px lightgrey;">
+                                                      <a id="elfInsertRation" href="javascript:void(0);" class="btn btn-sm btn-primary px-1 ml-1">应用选项</a>
+                                                      <a id="elfInsertSingle" href="javascript:void(0)" class="btn btn-sm btn-primary px-1 ml-1">应用单条</a>
                                                   </div>
-                                                  <div class="main-data-bottom ovf-hidden" id="elfItems">
+                                                  <div class="ovf-hidden" id="elfItems">
                                                   </div>
                                               </div>
-                                              <div class="col-6 p-1">
-                                                  <!--<p class="mt-3"><a id="elfInsertRation" href="javascript:void(0);" class="btn btn-sm btn-primary">应用选项</a></p>
-                                                  <p><a id="elfInsertSingle" href="javascript:void(0)" class="btn btn-sm btn-primary">应用单条</a></p>-->
-                                              </div>
                                           </div>
                                       </div>
                                   </div>

web/building_saas/main/js/main.js

@@ -64,7 +64,7 @@ function getMainResizeEles() {
         min: 180,
         max: `$(window).height()-$('.header').height()-$('#headerToolsBar').height()-180-5`,
         notTopSpread: 0,
-        notBottomSpread: $('#bottom_div ul').height() + $('#qdjlTools').height(),
+        notBottomSpread: $('#bottom_div ul').height(),
         totalHeight: `$(window).height()-$('.header').height()-$('#headerToolsBar').height()-5`
     };
     return mainResizeEles;

web/building_saas/main/js/views/billsElf.js

@@ -212,8 +212,14 @@ const BillsElf = (function() {
     //刷新表
     //@return {void}
     function refreshWorkBook(){
-        if (elfItem.workBook) {
-            elfItem.workBook.refresh();
+        //计算内部的表格高度
+        if ($('#qdjl').is(':visible')) {
+            let totalHeight = $('#qdjl').height(),
+                elfToolsHeight = $('#qdjlTools').height();
+            $('#elfItems').height(totalHeight - elfToolsHeight);
+            if (elfItem.workBook) {
+                elfItem.workBook.refresh();
+            }
         }
     }
     //清空表数据