diff --git a/frontend/views/finance/ticheng-jisuan.php b/frontend/views/finance/ticheng-jisuan.php
index 2e6fea7..f404201 100644
--- a/frontend/views/finance/ticheng-jisuan.php
+++ b/frontend/views/finance/ticheng-jisuan.php
@@ -239,6 +239,7 @@ use \common\libs\MyLib;
         var a=$(".gray-bg").height();
         //获取条件选择高度
         var b=$('#searchFrm').height();
+        console.log(b);
         //获取标题高度
         var c=$('.ibox-title').height();
         $('.fixed-table-body').css({'height': a-b-c-100});
diff --git a/frontend/views/permissions/index.php b/frontend/views/permissions/index.php
index 140ff53..cd5e25d 100644
--- a/frontend/views/permissions/index.php
+++ b/frontend/views/permissions/index.php
@@ -103,7 +103,18 @@ use \common\libs\MyLib;
          var a=$(".gray-bg").height();
          //获取标题高度
          var c=$('.ibox-title').height();
-         $('.fixed-table-body').css({'height': a-c-100});
+          //获取条件选择高度
+          var b=$('#searchFrm').height();
+          console.log(b);
+         //获取table高度
+         var e=$("row").height();
+         var d= a-c-b-100;
+         if(e>d){
+             $('.fixed-table-body').css({'height':d});
+         }else{
+            $('.fixed-table-body').css({'height':e});
+         }
+
     }
     $(function() {
         search();