fix: 修复下拉框更新时,日期无变化。拼接sql语句时,时间格式化最多精确到月更改到精确到日
2个文件已修改
159 ■■■■■ 已修改文件
WebTM/layuiadmin/HideButton_New.js 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/系统管理/日志管理/Xt_SystemLogList.html 156 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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列表
WebTM/views/ϵͳ¹ÜÀí/ÈÕÖ¾¹ÜÀí/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
            //过滤条件的classç±»
            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>