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/ASNSetting/PalletBind.html | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/HTML/views/ASNSetting/PalletBind.html b/HTML/views/ASNSetting/PalletBind.html
index 1fa9dcd..ea693af 100644
--- a/HTML/views/ASNSetting/PalletBind.html
+++ b/HTML/views/ASNSetting/PalletBind.html
@@ -34,11 +34,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">
+ <div class="layui-form layui-card-header layuiadmin-card-header-auto" id="top">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" style="width: 60px;">鍏ュ簱鍗曞彿</label>
@@ -146,10 +146,13 @@
<div class="layui-card-body">
<div style="position: relative;">
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
- <ul class="layui-tab-title">
+ <ul class="layui-tab-title" id="tab">
<li class="layui-this">鎵樼洏淇℃伅</li>
<li >绠辩爜淇℃伅</li>
</ul>
+
+ <div id="center"></div>
+
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
<div class="position-relative"><!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� -->
@@ -374,6 +377,7 @@
laypage = layui.laypage,
layer = layui.layer;
laydate = layui.laydate;
+ var h1 = GetTableTabHeight();
laydate.render({
elem: '#StartTime'
, format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
@@ -684,7 +688,7 @@
table.render({
id: 'PalletBind',
elem: '#PalletBind',
- height: 'full-210',
+ height: h1,
url: IP + "/BllAsn/GetPalletBindList",
method: 'post',
contentType: 'application/json',
@@ -930,7 +934,7 @@
table.render({
id: 'BoxInfo',
elem: '#BoxInfo',
- height: 'full-210',
+ height: h1,
url: IP + "/BllAsn/GetBoxInfoList",
method: 'post',
contentType: 'application/json',
--
Gitblit v1.8.0