From 19be6575a27a007b3dba7b0d28ddb769b5a1fed6 Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期二, 26 三月 2024 16:31:46 +0800
Subject: [PATCH] Merge branch 'csc'
---
HTML/views/SOSetting/ComBoxInfo.html | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/HTML/views/SOSetting/ComBoxInfo.html b/HTML/views/SOSetting/ComBoxInfo.html
index 66afe34..5e5f425 100644
--- a/HTML/views/SOSetting/ComBoxInfo.html
+++ b/HTML/views/SOSetting/ComBoxInfo.html
@@ -83,7 +83,7 @@
infoOptions.page = {
curr: 1
}
- tableIns = table.render(infoOptions);
+ table.render(infoOptions);
}
else { //涓嶆垚鍔�
layer.msg('鑾峰彇绠辩爜鏄庣粏鍒楄〃淇℃伅澶辫触锛�', {
@@ -97,7 +97,8 @@
// 琛ㄥ崟闇�瑕佺殑鍙橀噺
var infoOptions = {
elem: '#LAY-app-content-list',
- height: h1,
+ // height: h1,
+ height: 'full-100',
id: 'LAY-app-content-list',
page: true,
limit: pageCnt,
@@ -131,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