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/Locate.html | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/HTML/views/WareHouseSetting/Locate.html b/HTML/views/WareHouseSetting/Locate.html
index e2adf60..9f52be6 100644
--- a/HTML/views/WareHouseSetting/Locate.html
+++ b/HTML/views/WareHouseSetting/Locate.html
@@ -18,11 +18,11 @@
});
</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: 60px;">鎵�灞炰粨搴�</label>
@@ -117,6 +117,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" style="width: 100%;"></table>
<script type="text/html" id="table-content-list">
@@ -147,6 +148,7 @@
layer = layui.layer,
$ = layui.$;
var houseid = 0;
+ var h1 = GetTableHeight();
// 琛ㄥ崟闇�瑕佺殑鍙橀噺
var doing = true;
active = {
@@ -273,7 +275,7 @@
console.log(where);
var tableIns = table.render({
elem: '#LAY-app-content-list',
- height: 'full-135',
+ height: h1,
id: 'LAY-app-content-list',
url: IP + "/Sys/GetStorageLocatList",
method: 'post',
--
Gitblit v1.8.0