From 9c55f49b5ef7451008ae7f2734f2a9e6d604c7b3 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期二, 27 二月 2024 10:28:41 +0800
Subject: [PATCH] Merge branch 'yyk'

---
 HTML/views/WareHouseSetting/Pallets.html |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/HTML/views/WareHouseSetting/Pallets.html b/HTML/views/WareHouseSetting/Pallets.html
index e9553fb..a7a3e9b 100644
--- a/HTML/views/WareHouseSetting/Pallets.html
+++ b/HTML/views/WareHouseSetting/Pallets.html
@@ -23,10 +23,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: 70px;">鎵樼洏鏉$爜锛�</label>
@@ -56,6 +56,7 @@
 						</div>
 					</div>
 				</div>
+				<div id="center"></div>
 				<div class="layui-card-body">
 					<table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
 					 
@@ -83,7 +84,7 @@
 					form = layui.form,
 					laypage = layui.laypage,
 					layer = layui.layer;
-				
+					var h1 = GetTableHeight();
 				var isTrue= true; 
 				 
 				var where = {
@@ -92,7 +93,7 @@
 				}
 				var tableIns = table.render({
 					elem: '#LAY-app-content-list',
-					height: 'full-95',
+					height: h1,
 					id: 'LAY-app-content-list',
 					url: IP + "/Sys/GetPalletsList",
 					method: 'post',

--
Gitblit v1.8.0