From 0c9d469fa247665eaa37908b811ae5f183da7a3e Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期二, 27 二月 2024 16:02:00 +0800
Subject: [PATCH] Merge branch 'master' into wxw

---
 HTML/views/BaseSetting/Department.html |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/HTML/views/BaseSetting/Department.html b/HTML/views/BaseSetting/Department.html
index 36feaff..4c506bc 100644
--- a/HTML/views/BaseSetting/Department.html
+++ b/HTML/views/BaseSetting/Department.html
@@ -17,10 +17,10 @@
 			});
 		  </script>
 	</head>
-	<body>
+	<body id="body">
 		<div class="layui-fluid" style="padding-bottom: 0">
 			<div class="layui-card">
-				<div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
+				<div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
 					<div class="layui-form-item">
 						<div class="layui-inline">
 							<label class="layui-form-label" style="width: 56px">閮ㄩ棬缂栫爜</label>
@@ -41,6 +41,8 @@
 						</div>
 					</div>
 				</div>
+
+				<div id="center"></div>
 
 				<div class="layui-card-body">
 					<div style="padding-bottom: 5px;display: flex;flex-direction: row-reverse;">
@@ -81,6 +83,7 @@
 				laypage = layui.laypage,
 				layer = layui.layer;
 
+				var h1 = GetTableHeight();
 				refreshTable("", "");
 				var tableIns;
 			
@@ -170,7 +173,7 @@
 				
 				var infoOptions = {
 					elem: "#LAY-app-content-list",
-					height: "full-129",
+					height: h1,
 					id: "LAY-app-content-list",
 					page: true,
 					limit: pageCnt,

--
Gitblit v1.8.0