From a7c8452ad33ae2f9fa6de326ee85054f60bad8c0 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 01 三月 2024 16:18:52 +0800
Subject: [PATCH] 解决冲突
---
HTML/views/WareHouseSetting/Exception.html | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/HTML/views/WareHouseSetting/Exception.html b/HTML/views/WareHouseSetting/Exception.html
index b133c87..3cad3ae 100644
--- a/HTML/views/WareHouseSetting/Exception.html
+++ b/HTML/views/WareHouseSetting/Exception.html
@@ -17,9 +17,9 @@
});
</script>
</head>
- <body>
+ <body id="body">
<div class="layui-card" style="padding-bottom: 0">
- <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">寮傚父鍙�</label>
@@ -79,6 +79,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>
<script type="text/html" id="table-content-list">
@@ -121,7 +122,7 @@
form = layui.form,
laypage = layui.laypage,
layer = layui.layer;
-
+ var h1 = GetTableHeight();
refreshTable("", "", "", "","","","");
var tableIns;
@@ -210,7 +211,7 @@
}
var infoOptions = {
elem: '#LAY-app-content-list',
- height: 'full-130',
+ height: h1,
id: 'LAY-app-content-list',
page: true,
limit: pageCnt,
--
Gitblit v1.8.0