diff --git a/src/main/webapp/WEB-INF/views/approveManage/annotationTemplate/annotationTemplateList.jsp b/src/main/webapp/WEB-INF/views/approveManage/annotationTemplate/annotationTemplateList.jsp
index e8d3aee..219945b 100644
--- a/src/main/webapp/WEB-INF/views/approveManage/annotationTemplate/annotationTemplateList.jsp
+++ b/src/main/webapp/WEB-INF/views/approveManage/annotationTemplate/annotationTemplateList.jsp
@@ -85,9 +85,6 @@
         .typeBtn{
             margin-left: 16%;
         }
-        .pagination{
-            margin:0!important;
-        }
         /*模态框头*/
         .modal-header{
             background-color: #199ED8;
diff --git a/src/main/webapp/WEB-INF/views/approveManage/approveList/approveList174.jsp b/src/main/webapp/WEB-INF/views/approveManage/approveList/approveList174.jsp
index eebbb20..819f012 100644
--- a/src/main/webapp/WEB-INF/views/approveManage/approveList/approveList174.jsp
+++ b/src/main/webapp/WEB-INF/views/approveManage/approveList/approveList174.jsp
@@ -35,7 +35,7 @@
             width: 100%;
             background-color: #fff;
             margin-left: 1%;
-            padding-top:5px;
+            margin-top:-10px;
         }
         .dateSearchDiv{
             width:29%;
@@ -66,14 +66,10 @@
             text-align: right;
             height:30px;
             margin-right: 25px;
-            margin-top: 5px;
         }
         .btn{
             margin-left: 1%;
         }
-        .pagination{
-            margin:0!important;
-        }
         /**级联病案号内容*/
         .mouseOver{
             background-color: #708090;
diff --git a/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList174.jsp b/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList174.jsp
index 5614fdb..f69e7cd 100644
--- a/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList174.jsp
+++ b/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList174.jsp
@@ -77,20 +77,9 @@
         }
 
         .btn {
-            margin-right: 3%;
-            margin-left: 2%;
-        }
-
-        .btns {
-            float: right;
-            margin-right: 3%;
-            margin-bottom: 1%;
+            margin-right: 5px;
+            margin-left: 10px;
         }
-
-        .pagination {
-            margin: 0 !important;
-        }
-
         /**批准驳回按钮组*/
         .approveBtns {
             margin-left: 110px;
@@ -190,10 +179,10 @@
             <div class="btnsDiv">
                 <button type="button" class="btn btn-sm btn-primary" onclick="refreshTable()">查询</button>
                 <shiro:hasPermission name="/approve/updateApprove">
-                    <button id="addApprovesMore" type="button" class="btn btn-sm btn-warning btnl" onclick="addApprovesMore()">  +  批量审批</button>
+                    <button id="addApprovesMore" type="button" class="btn btn-sm btn-warning" onclick="addApprovesMore()">  +  批量审批</button>
                 </shiro:hasPermission>
                 <shiro:hasPermission name="/approve/exportExcelApproveList">
-                    <button type="button" class="btn btn-sm btn-primary btns" onclick="exportExcel()"><i class="fa fa-reply"></i>导出</button>
+                    <button type="button" class="btn btn-sm btn-primary" onclick="exportExcel()"><i class="fa fa-reply"></i>导出</button>
                 </shiro:hasPermission>
             </div>
         </div>
diff --git a/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage174.jsp b/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage174.jsp
index d517c3c..6093244 100644
--- a/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage174.jsp
+++ b/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage174.jsp
@@ -81,7 +81,6 @@
         }
         #tableDiv{
             margin-left:15px;
-            margin-top:10px;
         }
         /***模态1*/
         .line1{
@@ -113,9 +112,6 @@
         .collectDiv{
             margin-top:1%;
         }
-        .pagination{
-            margin:0!important;
-        }
         /**级联病案号内容*/
         .mouseOver{
             background-color: #708090;
diff --git a/src/main/webapp/WEB-INF/views/otherManage/backupDatabase.jsp b/src/main/webapp/WEB-INF/views/otherManage/backupDatabase.jsp
index ada820f..f9c121b 100644
--- a/src/main/webapp/WEB-INF/views/otherManage/backupDatabase.jsp
+++ b/src/main/webapp/WEB-INF/views/otherManage/backupDatabase.jsp
@@ -64,12 +64,10 @@
         .btns{
             margin-left: 2%;
         }
-        .pagination{
-            margin:0!important;
-        }
         /**表格div*/
         .tableDiv{
             margin-left: 1%;
+            margin-top: -15px;
         }
     </style>
 </head>
diff --git a/src/main/webapp/WEB-INF/views/otherManage/downloadInfoList174.jsp b/src/main/webapp/WEB-INF/views/otherManage/downloadInfoList174.jsp
index 02604a3..17e8bd0 100644
--- a/src/main/webapp/WEB-INF/views/otherManage/downloadInfoList174.jsp
+++ b/src/main/webapp/WEB-INF/views/otherManage/downloadInfoList174.jsp
@@ -64,13 +64,11 @@
         .btns{
             margin-left: 2%;
         }
-        .pagination{
-            margin:0!important;
-        }
         /**表格div*/
         .tableDiv{
             margin-left: 1%;
             margin-right: 1%;
+            margin-top: -15px;
         }
         .hidden-xs{
             max-width: 250px;
diff --git a/src/main/webapp/WEB-INF/views/otherManage/lockList.jsp b/src/main/webapp/WEB-INF/views/otherManage/lockList.jsp
index 431b95b..2c57db8 100644
--- a/src/main/webapp/WEB-INF/views/otherManage/lockList.jsp
+++ b/src/main/webapp/WEB-INF/views/otherManage/lockList.jsp
@@ -63,13 +63,11 @@
         .btns{
             margin-left: 2%;
         }
-        .pagination{
-            margin:0!important;
-        }
         /**表格div*/
         .tableDiv{
             margin-left: 1%;
             margin-right: 1%;
+            margin-top: -15px;
         }
         .hidden-xs{
             max-width: 250px;
diff --git a/src/main/webapp/WEB-INF/views/otherManage/printInfoList174.jsp b/src/main/webapp/WEB-INF/views/otherManage/printInfoList174.jsp
index 0c68979..503ee70 100644
--- a/src/main/webapp/WEB-INF/views/otherManage/printInfoList174.jsp
+++ b/src/main/webapp/WEB-INF/views/otherManage/printInfoList174.jsp
@@ -64,13 +64,11 @@
         .btns{
             margin-left: 2%;
         }
-        .pagination{
-            margin:0!important;
-        }
         /**表格div*/
         .tableDiv{
             margin-left: 1%;
             margin-right: 1%;
+            margin-top: -15px;
         }
         .hidden-xs{
             max-width: 250px;
diff --git a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp
index 222b3fe..eb51581 100644
--- a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp
+++ b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp
@@ -80,15 +80,9 @@
             font-family: "Segoe UI", Helvetica, Arial, sans-serif;
             border: 1px solid #ddd;
         }
-
         .TableView {
             margin-left: 2%;
         }
-
-        .pagination {
-            margin: 0 !important;
-        }
-
         .form-group {
             width: 110%;
         }
diff --git a/src/main/webapp/WEB-INF/views/recordManage/templateSearch/customSearchIfameqf.jsp b/src/main/webapp/WEB-INF/views/recordManage/templateSearch/customSearchIfameqf.jsp
index 71e3c91..19b6ba3 100644
--- a/src/main/webapp/WEB-INF/views/recordManage/templateSearch/customSearchIfameqf.jsp
+++ b/src/main/webapp/WEB-INF/views/recordManage/templateSearch/customSearchIfameqf.jsp
@@ -50,7 +50,7 @@
             margin-bottom: 0!important;
         }
         .bottomDiv{
-            background-color: #fff
+            background-color: #fff;
         }
         .control-label{
             text-align: right;
@@ -99,9 +99,6 @@
         .TableView{
             margin-left:2%;
         }
-        .pagination{
-            margin:0!important;
-        }
         /*模态框头*/
         .modal-header{
             background-color: #199ED8;
@@ -233,7 +230,7 @@
         </shiro:hasPermission>
     </div>
     <!--数据表格-->
-    <div id="tableDiv" class="table-responsive tableDiv table-hover">
+    <div id="tableDiv" class="table-responsive tableDiv table-hover" style="height:470px">
         <table id="mytab" class="table text-nowrap table-bordered"></table>
     </div>
     <!-- 模态框1（Modal） 借阅申请-->
diff --git a/src/main/webapp/static/js/approveManage/annotationTemplate/annotationTemplateList.js b/src/main/webapp/static/js/approveManage/annotationTemplate/annotationTemplateList.js
index c5ef92b..59454a0 100644
--- a/src/main/webapp/static/js/approveManage/annotationTemplate/annotationTemplateList.js
+++ b/src/main/webapp/static/js/approveManage/annotationTemplate/annotationTemplateList.js
@@ -11,7 +11,7 @@ $('#mytab').bootstrapTable({
     pageNumber: 1,                       //初始化加载第一页，默认第一页
     pageSize: 10,                       //每页的记录行数（*）
     pageList: [5,10,15,20,30,50],//可供选择的每页的行数（*）
-    height: window.innerHeight - 155,                        //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度
+    height: $(window).height()-104,                        //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度
     columns:[
         {
             title:'全选',
diff --git a/src/main/webapp/static/js/approveManage/approveList/approveList174.js b/src/main/webapp/static/js/approveManage/approveList/approveList174.js
index 47277e9..3ac6d94 100644
--- a/src/main/webapp/static/js/approveManage/approveList/approveList174.js
+++ b/src/main/webapp/static/js/approveManage/approveList/approveList174.js
@@ -40,7 +40,7 @@ $('#mytab').bootstrapTable({
     pageNumber: 1,                       //初始化加载第一页，默认第一页
     pageSize: 5,                       //每页的记录行数（*）
     pageList: [5,10,15,20,30,50],//可供选择的每页的行数（*）
-    height: 320,                        //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度
+    height: $(window).height()-134,                        //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度
     columns:[
         {
             title:'全选',
diff --git a/src/main/webapp/static/js/approveManage/approveManageList/approveManageList174.js b/src/main/webapp/static/js/approveManage/approveManageList/approveManageList174.js
index 792f173..dfc0bdd 100644
--- a/src/main/webapp/static/js/approveManage/approveManageList/approveManageList174.js
+++ b/src/main/webapp/static/js/approveManage/approveManageList/approveManageList174.js
@@ -49,7 +49,7 @@ $('#mytab').bootstrapTable({
     pageNumber: 1,                       //初始化加载第一页，默认第一页
     pageSize: 5,                       //每页的记录行数（*）
     pageList: [5,10,15,20,30,50],//可供选择的每页的行数（*）
-    height: 320,                        //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度
+    height: $(window).height()-134,                        //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度
     columns:[
         {
             title:'全选',
diff --git a/src/main/webapp/static/js/approveManage/collection/collectManage174.js b/src/main/webapp/static/js/approveManage/collection/collectManage174.js
index b39bbc7..1c62160 100644
--- a/src/main/webapp/static/js/approveManage/collection/collectManage174.js
+++ b/src/main/webapp/static/js/approveManage/collection/collectManage174.js
@@ -10,7 +10,7 @@ $('#mytab').bootstrapTable({
     pageNumber: 1,                       //初始化加载第一页，默认第一页
     pageSize: 5,                       //每页的记录行数（*）
     pageList: [5,10,15,20,30,50],//可供选择的每页的行数（*）
-    height: 320,                        //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度
+    height: $(window).height()-144,                        //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度
     columns:[
         {
             title:'全选',
diff --git a/src/main/webapp/static/js/otherManage/backupDatabase.js b/src/main/webapp/static/js/otherManage/backupDatabase.js
index c610d7a..89f9721 100644
--- a/src/main/webapp/static/js/otherManage/backupDatabase.js
+++ b/src/main/webapp/static/js/otherManage/backupDatabase.js
@@ -10,7 +10,7 @@ $('#mytab').bootstrapTable({
     pageNumber: 1,                       //初始化加载第一页，默认第一页
     pageSize: 10,                       //每页的记录行数（*）
     pageList: [5,10,15,20,50,1000],//可供选择的每页的行数（*）
-    height: window.innerHeight - 140,                        //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度
+    height: $(window).height()-109,                        //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度
     columns:[
         {
             title:'全选',
diff --git a/src/main/webapp/static/js/otherManage/downloadInfoCommomJs174.js b/src/main/webapp/static/js/otherManage/downloadInfoCommomJs174.js
index b342d44..14ff0e2 100644
--- a/src/main/webapp/static/js/otherManage/downloadInfoCommomJs174.js
+++ b/src/main/webapp/static/js/otherManage/downloadInfoCommomJs174.js
@@ -33,7 +33,7 @@ $('#mytab').bootstrapTable({
     pageNumber: 1,                       //初始化加载第一页，默认第一页
     pageSize: 10,                       //每页的记录行数（*）
     pageList: [5,10,15,20,50,1000],//可供选择的每页的行数（*）
-    height: window.innerHeight - 173,                        //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度
+    height: $(window).height()-139,                        //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度
     columns:[
         {
             title:'全选',
diff --git a/src/main/webapp/static/js/otherManage/lockList.js b/src/main/webapp/static/js/otherManage/lockList.js
index 701d5d3..69cbecf 100644
--- a/src/main/webapp/static/js/otherManage/lockList.js
+++ b/src/main/webapp/static/js/otherManage/lockList.js
@@ -15,7 +15,7 @@ $('#mytab').bootstrapTable({
     pageNumber: 1,                       //初始化加载第一页，默认第一页
     pageSize: 10,                       //每页的记录行数（*）
     pageList: [5,10,15,20,50,1000],//可供选择的每页的行数（*）
-    height: window.innerHeight - 138,                        //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度
+    height: $(window).height()-139,//行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度
     columns:[
         {
             title:'全选',