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/SOSetting/ExportAllot.html | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/HTML/views/SOSetting/ExportAllot.html b/HTML/views/SOSetting/ExportAllot.html
index f0c753f..fa226d7 100644
--- a/HTML/views/SOSetting/ExportAllot.html
+++ b/HTML/views/SOSetting/ExportAllot.html
@@ -23,11 +23,11 @@
<link rel="stylesheet" href="../../css/public.css" media="all">
</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">
@@ -120,10 +120,13 @@
<div class="layui-card-body">
<div>
<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" --><!-- 鑷畾涔夎〃澶村姞涓� -->
@@ -288,6 +291,8 @@
layer = layui.layer,
laydate = layui.laydate;
var $ = layui.$;
+ var h1 = GetTableTabHeight();
+
// var h1 = GetTableTopHeight();
// var h2 = GetTableBottomHeight();
// laydate.render({
@@ -547,7 +552,7 @@
elem: '#LAY-app-content-list',
url: IP + "/BllSo/GetExportAllotList",
method: 'POST',
- height: 'full-210',
+ height: h1,
id: 'LAY-app-content-list',
where: param,
contentType: 'application/json',
@@ -726,7 +731,7 @@
elem: '#LAY-app-content-list2',
url: IP + "/BllSo/GetCompleteDetailList",
method: 'POST',
- height: 'full-206',
+ height: h1,
id: 'LAY-app-content-list2',
where: param,
contentType: 'application/json',
--
Gitblit v1.8.0