From 673851b09a4bd5f1c417ff26ff27d9fbe7601c8d Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 21 五月 2025 13:40:37 +0800
Subject: [PATCH] fix: 修复下拉框更新时，日期无变化。拼接sql语句时，时间格式化最多精确到月更改到精确到日
---
WebTM/layuiadmin/HideButton_New.js | 3 +
WebTM/views/系统管理/日志管理/Xt_SystemLogList.html | 156 ++++++++++++++++++++++++++++++++++------------------
2 files changed, 105 insertions(+), 54 deletions(-)
diff --git a/WebTM/layuiadmin/HideButton_New.js b/WebTM/layuiadmin/HideButton_New.js
index 917d923..24b2291 100644
--- a/WebTM/layuiadmin/HideButton_New.js
+++ b/WebTM/layuiadmin/HideButton_New.js
@@ -60,6 +60,9 @@
success: function (data1) {
//鑾峰彇鐖惰妭鐐逛笅鎵�鏈夌殑鎸夐挳鑺傜偣
var parentNodes = document.getElementById(set_HideButton_ID);
+ console.log(set_HideButton_ID)
+ console.log(parentNodes)
+ debugger;
var btns = parentNodes.querySelectorAll('button');
//鑾峰彇鏁版嵁搴撲腑宸茬粡璁板綍鐨勬寜閽妭鐐圭殑id鍒楄〃
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html"
index a3d31ff..00a8db5 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>绯荤粺鏃ュ織鍒楄〃</title>
@@ -16,15 +17,17 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
- <script src="../../../layuiadmin/HideButton.js"></script>
+ <!-- <script src="../../../layuiadmin/HideButton.js"></script> -->
<script src="../../../layuiadmin/soulTable.slim.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../../layuiadmin/HideButton_New.js"></script>
<style type="text/css">
input.layui-input.layui-unselect {
padding-right: 0;
}
</style>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -60,16 +63,20 @@
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<div class="layui-colla-content">
<div class="layui-inline">
<label class="layui-form-label">鏃ユ湡闂撮殧</label>
<div class="layui-input-block">
- <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+ <select name="HInitTimeCycle" id="HInitTimeCycle"
+ class="ForFilteringSchemes" lay-filter="HInitTimeCycle"
+ style="width:190px;">
</select>
</div>
</div>
@@ -85,6 +92,15 @@
<input type="date" class="layui-input" id="HDate1">
</div>
</div>
+
+ <!-- <div class="layui-form-item">
+ <select lay-filter="HInitTimeCycle">
+ <option value="">璇烽�夋嫨</option>
+ <option value="AAA">閫夐」 A</option>
+ <option value="BBB">閫夐」 B</option>
+ <option value="CCC">閫夐」 C</option>
+ </select>
+ </div> -->
</div>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
@@ -92,19 +108,25 @@
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+ <select name="ColName" id="ColName" class="ForFilteringSchemes"
+ lay-filter="ColName" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator"
+ style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -112,26 +134,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent" id="ColContent">
</div>
</div>
<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+ <select name="ColName1" id="ColName1" class="ForFilteringSchemes"
+ lay-filter="ColName1" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" class="ForFilteringSchemes" style="width:190px;">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1"
+ class="ForFilteringSchemes" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -139,26 +168,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent1" id="ColContent1">
</div>
</div>
<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+ <select name="ColName2" id="ColName2" class="ForFilteringSchemes"
+ lay-filter="ColName2" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" style="width:190px;">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2"
+ class="ForFilteringSchemes" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -166,7 +202,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -174,16 +211,17 @@
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
- <script type="text/html" id="toolbarDemo">
+ <script type="text/html" id="toolbarDemo" id="xt_SystemLogList_ButtonGroup">
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>-->
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
+ <!-- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button> -->
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
</div>
</script>
</form>
@@ -200,7 +238,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable', 'layer'], function () {
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -215,6 +253,8 @@
var sWhere = "";
var option = [];
var HModName = "Xt_SystemLogList";
+ var HBillType = 'Xt_SystemLogList';
+ var set_HideButton_ID = "xt_SystemLogList_ButtonGroup";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
//杩囨护鏉′欢鐨刢lass绫�
var HClassTag = "ForFilteringSchemes";
//妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
@@ -224,7 +264,7 @@
//閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
window.HInterID_Choose = 0;
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HItemID","hid"];
+ var titleData = ["HItemID", "hid"];
var ins;
//鍒濆鍖栫晫闈�
@@ -235,11 +275,31 @@
set_ResCnz();
});
+ //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+ form.on('select(HInitTimeCycle)', function (data) {
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ debugger;
+ if (HInitTimeCycle != -1) {
+ $('#HDate').prop('disabled', true);
+ $('#HDate1').prop('disabled', true);
+
+ $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery();
+ } else {
+ $('#HDate').prop('disabled', false);
+ $('#HDate1').prop('disabled', false);
+ }
+ });
+
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
$("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
- $("#HDate1").val("");//缁撴潫鏃ユ湡
+ $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
$("#UserID").val("");//鐢ㄦ埛鍚�
$("#WorkList").val("");//妯″潡鍚�
$("#btnSearch").click();
@@ -266,8 +326,11 @@
//#region 澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
switch (obj.event) {
+ //鎸夐挳璁剧疆
+ case 'set_HideButton': get_HideButton();
+ break;
//鍒楄缃�
- case 'set_HideColumn': get_HideColumn();
+ case 'set_HideColumn': get_HideColumn(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
break;
//淇濆瓨鏂规
case 'set_SaveScheme': set_SaveScheme();
@@ -325,9 +388,9 @@
$('#HDate1').prop('disabled', false);
}
- //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
+ // //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
$("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
- $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
}
$("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
$("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
@@ -509,30 +572,11 @@
}
- //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
- form.on('select(HInitTimeCycle)', function (data) {
- var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
- //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
- if (HInitTimeCycle != -1) {
- $('#HDate').prop('disabled', true);
- $('#HDate1').prop('disabled', true);
-
- $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
- $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
-
- //鎵ц鏌ヨ鏂规硶
- get_FastQuery();
- } else {
- $('#HDate').prop('disabled', false);
- $('#HDate1').prop('disabled', false);
- }
- });
-
//#region 鏌ヨ
function get_Display(sWhere) {
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
var index0 = layer.load(0, { shade: false });
- var ajaxLoad = layer.load();
+ var ajaxLoad = layer.load();
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
url: GetWEBURL() + '/Xt_SystemLog/list',
@@ -687,11 +731,12 @@
HOrgID = $("#HOrgID").val();//缁勭粐
}
if (HDate) {
- sWhere += " and convert(varchar(7),鏃ユ湡,20) >= '" + HDate + "'";
+ sWhere += " and convert(varchar(10),鏃ユ湡,20) >= '" + HDate + "'";
}
if (HDate1) {
- sWhere += " and convert(varchar(7),鏃ユ湡,20) <= '" + HDate1 + "'";
+ sWhere += " and convert(varchar(10),鏃ユ湡,20) <= '" + HDate1 + "'";
}
+ debugger;
if (UserID) {
sWhere += " and 鐢ㄦ埛鍚� like '%" + UserID + "%'";
}
@@ -850,9 +895,11 @@
$("#HInitTimeCycle").empty();
$("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
+ $("#HInitTimeCycle").val("29");
+
form.render('select');
- $("#HInitTimeCycle").val("29");
+
}
//#endregion
@@ -930,4 +977,5 @@
});
</script>
</body>
-</html>
+
+</html>
\ No newline at end of file
--
Gitblit v1.9.1