From 5b4f00ff3ea04a3246a8f6f86bdefe749fcfd0c4 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期二, 26 三月 2024 08:24:28 +0800
Subject: [PATCH] 合并代码
---
HTML/views/SOSetting/ComBoxInfo.html | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/HTML/views/SOSetting/ComBoxInfo.html b/HTML/views/SOSetting/ComBoxInfo.html
index 1156189..5e5f425 100644
--- a/HTML/views/SOSetting/ComBoxInfo.html
+++ b/HTML/views/SOSetting/ComBoxInfo.html
@@ -8,11 +8,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<link rel="stylesheet" href="../../layuiadmin/layui/css/layui.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" style="margin-bottom: 0px;">
<div class="layui-inline zongdan" >
@@ -30,6 +30,8 @@
</div>
</div>
</div>
+
+ <div id="center"></div>
<div class="layui-card-body">
@@ -54,6 +56,7 @@
var $ = layui.$,
form = layui.form,
layer = layui.layer;
+ var h1 = GetTableHeight();
var boxNo = getQueryString('BoxNo');
if (!boxNo)
{
@@ -80,7 +83,7 @@
infoOptions.page = {
curr: 1
}
- tableIns = table.render(infoOptions);
+ table.render(infoOptions);
}
else { //涓嶆垚鍔�
layer.msg('鑾峰彇绠辩爜鏄庣粏鍒楄〃淇℃伅澶辫触锛�', {
@@ -94,7 +97,8 @@
// 琛ㄥ崟闇�瑕佺殑鍙橀噺
var infoOptions = {
elem: '#LAY-app-content-list',
- height: 'full-98',
+ // height: h1,
+ height: 'full-100',
id: 'LAY-app-content-list',
page: true,
limit: pageCnt,
@@ -128,7 +132,7 @@
field: 'CreateUserName', align: 'center', title: '鍒涘缓浜�', width: 120,
},
{
- field: 'CreateTime', align: 'center', title: '鍒涘缓鏃堕棿', width: 165,
+ field: 'CreateTime', align: 'center', title: '鎷ｈ揣鏃堕棿', width: 165,
templet: function (d) {
return formatDate(d.CreateTime);
},
--
Gitblit v1.8.0