智云MES-UI前端
parent: 6660925f | 补丁 | 提交 | ignore whitespace
wtt
2024-07-22 80efcc1e810773d7efeea408b1b26c9b5da65e8f 
新的隐藏列设置，报表页面优化
1个文件已添加
6个文件已修改
804 ■■■■■ 已修改文件
WebTM/WebTM.csproj 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/条码报表/KF_ICinventoryQueryReport.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/条码报表/Kf_StockInOutSumQueryReport.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/隐藏列设置/Gy_GridView_Hide_New.html 474 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBill_OutList.html 106 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html 120 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/领料出库/Kf_MateOutRequestBillList.html 99 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 WebTM/WebTM.csproj


@@ -369,6 +369,7 @@


    <Content Include="views\基础资料\基础资料\Gy_Maintain_Excel.html" />


    <Content Include="views\基础资料\基础资料\Gy_DotCheck_Excel.html" />


    <Content Include="views\基础资料\生产基础资料\Gy_Process_Excel.html" />


    <Content Include="views\基础资料\隐藏列设置\Gy_GridView_Hide_New.html" />


    <Content Include="views\工资管理\技能考核\HR_EmployeeSkillExamBill.html" />


    <Content Include="views\工资管理\技能考核\HR_EmployeeSkillExamBillList.html" />


    <Content Include="views\模治具管理\器具报表\Sc_MouldDotCheckTaskReport.html" />




 WebTM/views/²Ö´æ¹ÜÀí/ÌõÂ뱨±í/KF_ICinventoryQueryReport.html


@@ -435,7 +435,7 @@


                            option.totalRow = true;


                            table.render(option);


                            layer.close(ajaxLoad);


                            layer.alert(data1.code + data1.Message, { icon: 5 });


                          /*  layer.alert(data1.code + data1.Message, { icon: 5 });*/


                        }


                    },


                    error: function () {




 WebTM/views/²Ö´æ¹ÜÀí/ÌõÂ뱨±í/Kf_StockInOutSumQueryReport.html


@@ -471,7 +471,7 @@


                            option.totalRow = true;


                            table.render(option);


                            layer.close(ajaxLoad);


                            layer.alert(data1.code + data1.Message, { icon: 5 });


                            /*layer.alert(data1.code + data1.Message, { icon: 5 });*/


                        }


                    },


                    error: function () {




 WebTM/views/»ù´¡×ÊÁÏ/Òþ²ØÁÐÉèÖÃ/Gy_GridView_Hide_New.html


New file


@@ -0,0 +1,474 @@


<!DOCTYPE html>


<html>


<head>


    <meta charset="utf-8" />


    <title>隐藏列设置</title>


    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">


    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">


    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>


    <script src="../../../layuiadmin/layui/layui.js"></script>


    <script src="../../../layuiadmin/Scripts/json2.js"></script>


    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>


    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>


    <script src="../../../layuiadmin/PubCustom.js"></script>


    <style>


        /* é˜²æ­¢ä¸‹æ‹‰æ¡†çš„下拉列表被隐藏---必须设置--- */


        .layui-table-cell {


            overflow: visible !important;


        }


        /* ä½¿å¾—下拉框与单元格刚好合适 */


        td .layui-form-select {


            margin-top: -10px;


            margin-left: -15px;


            margin-right: -15px;


        }


    </style>


</head>


<body>


    <div class="layui-fluid" style="padding: 0;">


        <div class="layui-card" style="padding: 2px;background-color: #efefef;">


            <div class="layui-card-body" style="padding: 1px;">


                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">


                    <div style="padding: 10px; ">


                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="CheckAll" id="CheckAll">全选</button>


                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="ClearBill" id="ClearBill">全清</button>


                        <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btn_up" id="btn_up">上一行</button>


                        <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btn_under" id="btn_under">下一行</button>


                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">保存</button>


                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Exit" id="Exit">退出</button>


                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Del" id="Del">删除</button>


                    </div>


                    <div class="layui-collapse">


                        <div class="layui-colla-item">


                            <div class="layui-form-item" style="padding-top: 10px;">


                                <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>


                            </div>


                        </div>


                    </div>


                    <div class="layui-tab" lay-filter="tab-POStockInBill">


                        <div class="layui-tab-content">


                            <div class="layui-tab-item layui-show">


                                <div class="layui-form-item" style="padding-top: 10px;">


                                    <div class="layui-row">


                                        <div class="layui-inline">


                                            <label class="layui-form-label" style="width: 85px;">冻结列</label>


                                            <div class="layui-input-block" style="margin-left: 120px;">


                                                <input type="text" class="layui-input" name="HFixCols" lay-verify="HFixCols" id="HFixCols">


                                            </div>


                                        </div>


                                        <div class="layui-inline">


                                            <label class="layui-form-label" style="width: 85px;">字体大小</label>


                                            <div class="layui-input-block" style="margin-left: 120px;">


                                                <input type="text" class="layui-input" name="HFontSize" lay-verify="HFontSize" id="HFontSize">


                                            </div>


                                        </div>


                                        <div class="layui-inline">


                                            <label class="layui-form-label" style="width: 85px;">列宽</label>


                                            <div class="layui-input-block" style="margin-left: 120px;">


                                                <input type="text" class="layui-input" lay-verify="HColumnWidth" name="HColumnWidth" id="HColumnWidth">


                                            </div>


                                        </div>


                                        <div class="layui-inline">


                                            <label class="layui-form-label" style="width: 85px;">默认分页</label>


                                            <div class="layui-input-block" style="margin-left: 120px;">


                                                <input type="text" class="layui-input" lay-verify="HPageSize" name="HPageSize" id="HPageSize">


                                            </div>


                                        </div>


                                    </div>


                                    <div class="layui-row">


                                        <div class="layui-inline">


                                            <label class="layui-form-label">点击排序</label>


                                            <div class="layui-input-block" style="margin-left: 120px;width: 184px;">


                                                <select name="HSortFlag" lay-verify="HSortFlag" id="HSortFlag">


                                                    <option value=""></option>


                                                    <option value="是">是</option>


                                                    <option value="否">否</option>


                                                </select>


                                            </div>


                                        </div>


                                        <div class="layui-inline">


                                            <label class="layui-form-label">选中行合计</label>


                                            <div class="layui-input-block" style="margin-left: 125px;width: 184px;">


                                                <select name="HSelTotal" lay-verify="HSelTotal" id="HSelTotal">


                                                    <option value=""></option>


                                                    <option value="是">是</option>


                                                    <option value="否">否</option>


                                                </select>


                                            </div>


                                        </div>


                                    </div>


                                </div>


                            </div>


                        </div>


                    </div>


                </form>


            </div>


        </div>


    </div>


</body>


</html>


<!--行下拉选择(对齐方式)-->


<script type="text/html" id="Alignment">


    <select name="Alignment" lay-filter="Alignment" id="Alignment{{d.LAY_TABLE_INDEX+1}}">


        <option value="L">左对齐</option>


        <option value="M">居中</option>


        <option value="R">右对齐</option>


    </select>


</script>


<!--复选框 æ˜¯å¦éšè—-->


<script type="text/html" id="IsHide">


    <div class="layui-input-block" style="margin-left: 20px;">


        <input type="checkbox" name="IsHide" lay-filter="IsHide" id="IsHide{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">


    </div>


</script>


<script>


    layui.config({


        base: '../../../layuiadmin/' //静态资源所在路径


    }).extend({


        index: 'lib/index' //主入口模块


    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {


        //#region å…¬å…±å˜é‡


        var $ = layui.$


            , admin = layui.admin


            , layer = layui.layer


            , table = layui.table


            , form = layui.form


            , element = layui.element;


        //查询条件


        var sWhere = "";


        var option = [];


        //#endregion




        //#region è¿›å…¥é¡µé¢å³åŠ è½½




        var params = getUrlVars();


        var HModName = params[params[0]]; //模块名称


        var colName = params[params[1]]; //列名


        colName = decodeURI(colName);//对URI è¿›è¡Œè§£ç 


        //初始化界面


        set_ClearBill();




        //#endregion




        //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等






        //行选择处理（对齐方式）


        form.on('select(Alignment)', function (data) {


            //获取下拉框选中的值


            var elem = data.othis.parents('tr');


            var dataindex = elem.attr("data-index");


            $.each(option.data, function (index, value) {


                if (value.LAY_TABLE_INDEX == dataindex) {


                    value.Alignment = data.value;//把选中下拉框id值赋值给表格缓存


                }


            });


        });




        //是否隐藏


        form.on('checkbox(IsHide)', function (data) {


            //获取下拉框选中的值


            var elem = data.othis.parents('tr');


            var dataindex = elem.attr("data-index");


            $.each(option.data, function (index, value) {


                if (value.LAY_TABLE_INDEX == dataindex) {


                    value.IsHide = data.elem.checked;//把选中下拉框id值赋值给表格缓存


                }


            });


        });




        //保存提交


        form.on('submit(btnSave)', function (data) {//提交


            set_AddNew(data);


        });




        //全选


        form.on('submit(CheckAll)', function (data) {//提交


            for (var i = 0; i < table.cache["mainTable"].length; i++) {


                table.cache["mainTable"][i].IsHide = true;


                $('#IsHide' + (i + 1)).prop("checked", true);


            }


            form.render('checkbox');


        });




        //全清


        form.on('submit(ClearBill)', function (data) {//提交


            for (var i = 0; i < table.cache["mainTable"].length; i++) {


                table.cache["mainTable"][i].IsHide = false;


                $('#IsHide' + (i + 1)).attr("checked", false);


            }


            form.render('checkbox');


        });




        //上一行


        form.on('submit(btn_up)', function (data) {


            var checkStatus = table.checkStatus('mainTable')


                , checkData = checkStatus.data;


            if (checkStatus.data.length != 1) {


                layer.msg('请选择一行数据移动！');


            }


            else if (option.data[0]["ColumnName"] == checkData[0]["ColumnName"]) {


                layer.msg("首行数据无法上移！");


            } else {


                var tables = [];


                for (var i = 0; i < option.data.length; i++) {


                    if (option.data[i]["ColumnName"] == checkData[0]["ColumnName"]) {


                        tables.push(option.data[i - 1]);


                        checkData[0].LAY_CHECKED = true;


                        option.data[i - 1] = checkData[0];


                        option.data[i] = tables[0];


                        table.render(option);


                        //重新加载下拉框和单选框


                        for (var j = 1; j <= option.data.length; j++) {


                            if (option.data[j - 1].IsHide == true) {


                                $("#IsHide" + j).attr("checked", true);


                            }


                            $('#Alignment' + j).find("option[value='" + option.data[j - 1].Alignment + "']").attr("selected", true);


                        }


                        form.render('select');


                        form.render('checkbox');


                        break;


                    }


                }


            }


        })




        //下一行


        form.on('submit(btn_under)', function (data) {


            var checkStatus = table.checkStatus('mainTable')


                , checkData = checkStatus.data;


            if (checkStatus.data.length != 1) {


                layer.msg('请选择一行数据移动！');


            }


            else if (option.data[option.data.length - 1]["ColumnName"] == checkData[0]["ColumnName"]) {


                layer.msg("末行数据无法下移！");


            } else {


                var tables = [];


                for (var i = 0; i < option.data.length; i++) {


                    if (option.data[i]["ColumnName"] == checkData[0]["ColumnName"]) {


                        tables.push(option.data[i + 1]);


                        checkData[0].LAY_CHECKED = true;


                        option.data[i + 1] = checkData[0];


                        option.data[i] = tables[0];


                        table.render(option);


                        for (var j = 1; j <= option.data.length; j++) {


                            if (option.data[j - 1].IsHide == true) {


                                $("#IsHide" + j).attr("checked", true);


                            }


                            $('#Alignment' + j).find("option[value='" + option.data[j - 1].Alignment + "']").attr("selected", true);


                        }


                        form.render('select');


                        form.render('checkbox');


                        break;


                    }


                }


            }


        })




        //退出


        form.on('submit(Exit)', function () {


            Pub_Close(1);


        })




        //删除


        form.on('submit(Del)', function () {


            get_Del();


        })




        //#endregion




        //#region æ­¤é¡µé¢æ‰€æœ‰çš„方法




        //初始化界面


        function set_ClearBill() {


            set_InitGrid();


            get_Display();


        }




        //查询


        function get_Display() {


            var ajaxLoad = layer.load();


            $.ajax({


                url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',


                type: "GET",


                data: { "HModName": HModName, "user": sessionStorage["HUserName"] },


                success: function (data1) {


                    var colNames = [];//相对单据传过来的列名


                    var cols = [];//要传进表格的数据


                    var dataCol = [];//表格数据


                


                    if (data1.data.length != 0) {


                        //数据库查询出的列数据


                        dataCol = data1.data[0].HGridString.split(',');


                    }


                   


                    colNames = colName.split(',');




                    if (data1.data.length != 0 && dataCol.length == colNames.length) {


                        //冻结列


                        $("#HFixCols").val(data1.data[0].HFixCols);


                        //字体大小


                        $("#HFontSize").val(data1.data[0].HFontSize);


                        //列宽


                        $("#HColumnWidth").val(data1.data[0].HColumnWidth);


                        //默认分页


                        $("#HPageSize").val(data1.data[0].HPageSize);




                        //表格的数据填充


                        for (var i = 0; i < colNames.length; i++) {


                            var dataCols = dataCol[i].split('|');


                            cols.push({ "ColumnName": colNames[i], "IsHide": dataCols[1] == 1 ? true : false, "Alignment": dataCols[2], "ColumnWidth": dataCols[3] })


                        }


                        option.data = cols;


                        table.render(option);




                        //页面多选框 ä¸‹æ‹‰æ¡† é‡æ–°æ¸²æŸ“


                        for (var i = 0; i < colNames.length; i++) {


                            var dataCols = dataCol[i].split('|');


                            if (dataCols[1] == 1) {


                                $("#IsHide" + (i + 1)).attr("checked", true);


                            }


                            $('#Alignment' + (i + 1)).find("option[value='" + dataCols[2] + "']").attr("selected", true);


                        }


                        form.render('checkbox');


                        form.render('select');


                        layer.close(ajaxLoad);


                    } else {


                        //默认不选中 æ˜¾ç¤ºå­—体居左  è¡¨æ ¼çš„数据填充


                        for (var i = 0; i < colNames.length; i++) {


                            cols.push({ "ColumnName": colNames[i], "IsHide": false, "Alignment": "L", "ColumnWidth": 120 })


                        }


                        option.data = cols;


                        table.render(option);




                        //默认不选中 æ˜¾ç¤ºå­—体居左 é¡µé¢å¤šé€‰æ¡† ä¸‹æ‹‰æ¡† é‡æ–°æ¸²æŸ“


                        for (var i = 0; i < colNames.length; i++) {


                            $('#IsHide' + (i + 1)).prop("checked", false);


                            $('#Alignment' + (i + 1)).find("option[value='L']").attr("selected", true);


                        }


                        form.render('checkbox');


                        form.render('select');


                        layer.close(ajaxLoad);


                    }


                }, error: function () {


                    layer.close(ajaxLoad);


                    layer.alert("接口请求失败!", { icon: 5 });


                }


            });


        }




        //表格数据


        function set_InitGrid() {


            option = {


                elem: '#mainTable'


                //, toolbar: '#toolbarDemo'


                , height: 420


                , cellMinWidth: 90


                , limit: 500


                , cols: [[


                    { type: 'checkbox', fixed: 'left', style: 'background-color:#efefef4d;' }


                    , { type: 'numbers', title: '序号', width: 100, style: 'background-color:#efefef4d;' }


                    , { field: 'ColumnName', title: '列名', width: 100 }


                    , { file: 'IsHide', title: '是否隐藏', width: 100, templet: '#IsHide' }


                    , { field: 'Alignment', title: '对齐方式', width: 100, templet: '#Alignment' }


                    , { field: 'ColumnWidth', title: '列宽', width: 100,edit: 'text' }


                ]]


            };


        }




        //保存HMaker


        function set_AddNew(data) {




            var num = [];


            for (var i = 0; i < table.cache["mainTable"].length; i++) {


                if (table.cache["mainTable"][i] != "") {


                    table.cache["mainTable"][i].LAY_TABLE_INDEX = i;


                    num.push(table.cache["mainTable"][i])


                }


            }




            //默认分页


            var HPageSize = $("#HPageSize").val();


            if (HPageSize != "") {


                var nums = /^[0-9]+?[0-9]*$/;


                if (!nums.test(HPageSize)) {


                    layer.msg("默认分页不为正整数!")


                    return false;


                }


            }




            var sMainStr = JSON.stringify(data.field);


            var sSubStr = JSON.stringify(num);


            var OperationType = "1";


            var sMainSub = sMainStr + ';' + sSubStr + ';' + HModName + ';' + OperationType + ";" + sessionStorage["HUserName"];//sessionStorage["HUserName"]




            var index = layer.load();


            $.ajax({


                type: "POST",


                url: GetWEBURL() + "/Xt_grdAlignment_WMES/AddgrdAlignmentWMESNew",


                async: true,


                data: { "sMainSub": sMainSub },


                dataType: "json",


                success: function (data) {


                    if (data.count == 1) {


                        layer.close(index);


                        layer.msg("提交成功");


                    }


                    else {


                        layer.close(index);


                        layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });


                    }


                },


                error: function (err) {


                    layer.close(index);


                    layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });


                }


            });


        }




        //获取参数


        function getUrlVars() {


            var vars = [], hash;


            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');


            for (var i = 0; i < hashes.length; i++) {


                hash = hashes[i].split('=');


                vars.push(hash[0]);


                vars[hash[0]] = hash[1];


            }


            return vars;


        }




        //删除


        function get_Del() {


            layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {


                var wait = layer.load();


                //逻辑删除方法


                $.ajax({


                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/DelgrdAlignmentWMES',


                    type: "GET",


                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },


                    success: function (result) {


                        if (result.count == 1) {


                            layer.msg(result.Message, { icon: 1 }, function () {


                                //关闭当前frame


                                layer.close(wait);


                            });


                        } else {


                            layer.alert(result.code + result.Message, { icon: 5 });


                            layer.close(wait);


                        }


                    }, error: function () {


                        layer.alert("接口请求失败!", { icon: 5 });


                        layer.close(wait);


                    }


                });


            })


        }






        //#endregion




    });






</script>




 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Gy_BarCodeBill_OutList.html


@@ -29,7 +29,7 @@


                                        <span>更多</span>


                                    </div>


                                </div>


                                <div class="layui-inline">


                                <!--<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;">


@@ -47,7 +47,7 @@


                                    <div class="layui-input-block">


                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">


                                    </div>


                                </div>


                                </div>-->


                               


                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch" style="margin-left:10px">


                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>


@@ -242,41 +242,41 @@


            });




            //日期间隔下拉列表监听


            form.on('select(HInitTimeCycle)', function (data) {


                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;


                //若日期间隔不为 ä»»æ„é—´éš”，则禁用开始日期与结束日期的选择


                if (HInitTimeCycle != -1) {


                    $('#HBeginDate').prop('disabled', true);


                    $('#HEndDate').prop('disabled', true);


            //form.on('select(HInitTimeCycle)', function (data) {


            //    var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;


            //    //若日期间隔不为 ä»»æ„é—´éš”，则禁用开始日期与结束日期的选择


            //    if (HInitTimeCycle != -1) {


            //        $('#HBeginDate').prop('disabled', true);


            //        $('#HEndDate').prop('disabled', true);




                    $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));


                    $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));


            //        $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));


            //        $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));




                    //执行查询方法


                    get_FastQuery();


                } else {


                    $('#HBeginDate').prop('disabled', false);


                    $('#HEndDate').prop('disabled', false);


                }


            });


            //        //执行查询方法


            //        get_FastQuery();


            //    } else {


            //        $('#HBeginDate').prop('disabled', false);


            //        $('#HEndDate').prop('disabled', false);


            //    }


            //});




            //#region åˆå§‹åŒ–界面


            function set_ClearBill() {


                //初始化日期间隔、开始日期、结束日期


                setSelect_HInitTimeCycle();


                //若日期间隔不为 ä»»æ„é—´éš”，则禁用开始日期与结束日期的选择


                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;


                if (HInitTimeCycle != -1) {


                    $('#HBeginDate').prop('disabled', true);


                    $('#HEndDate').prop('disabled', true);


                } else {


                    $('#HBeginDate').prop('disabled', false);


                    $('#HEndDate').prop('disabled', false);


                }


                ////初始化日期间隔、开始日期、结束日期


                //setSelect_HInitTimeCycle();


                ////若日期间隔不为 ä»»æ„é—´éš”，则禁用开始日期与结束日期的选择


                //var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;


                //if (HInitTimeCycle != -1) {


                //    $('#HBeginDate').prop('disabled', true);


                //    $('#HEndDate').prop('disabled', true);


                //} else {


                //    $('#HBeginDate').prop('disabled', false);


                //    $('#HEndDate').prop('disabled', false);


                //}




                //根据日期间隔设置开始时间与结束时间


                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));


                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));


                ////根据日期间隔设置开始时间与结束时间


                //$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));


                //$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));


                //初始化表格


             


                set_InitGrid();


@@ -455,8 +455,8 @@




            //#region å¿«é€Ÿè¿‡æ»¤


            function get_FastQuery() {


                var HBeginDate = $("#HBeginDate").val();//开始日期


                var HEndDate = $("#HEndDate").val();//结束日期


                //var HBeginDate = $("#HBeginDate").val();//开始日期


                //var HEndDate = $("#HEndDate").val();//结束日期


                var ColName = $("#ColName").val();//复选框


                var Comparator = $("#Comparator").val()


                var ColContent = $("#ColContent").val();


@@ -530,12 +530,12 @@


                    }


                    sWhere += " and " + ColName2 + " " + com2;


                }


                if (HBeginDate) {


                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HBeginDate + "'";


                }


                if (HEndDate) {


                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HEndDate + "'";


                }


                //if (HBeginDate) {


                //    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HBeginDate + "'";


                //}


                //if (HEndDate) {


                //    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HEndDate + "'";


                //}


                get_Display(sWhere);


                sWhere = "";//调用接口后清空sWhere缓存


            }


@@ -564,8 +564,8 @@


            //#region é‡ç½®è¿‡æ»¤æ¡ä»¶æ–¹æ³•


            function set_ClearQuery() {


                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;


                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //开始日期


                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));  //结束日期


                //$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //开始日期


                //$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));  //结束日期


                $("#btnSearch").click();


                $("#ColContent").val("");


                $("#ColName").val("0");


@@ -826,21 +826,21 @@


                form.render('select');


            }


            //#region åˆå§‹æ—¥æœŸé—´éš” ä¸‹æ‹‰åˆ—表


            function setSelect_HInitTimeCycle() {


                var valueList = [0, 1, 2, 3, 4, 5, 6, 29];


                var titleList = ["今天", "近两天", "近三天", "近四天", "近五天", "近六天", "近七天", "近30天"];


            //function setSelect_HInitTimeCycle() {


            //    var valueList = [0, 1, 2, 3, 4, 5, 6, 29];


            //    var titleList = ["今天", "近两天", "近三天", "近四天", "近五天", "近六天", "近七天", "近30天"];




                var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >任意间隔</option>';


                for (var i = 0; i < valueList.length; i++) {


                    HInitTimeCycle_ArrayList += '<option  style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';


                }


            //    var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >任意间隔</option>';


            //    for (var i = 0; i < valueList.length; i++) {


            //        HInitTimeCycle_ArrayList += '<option  style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';


            //    }




                $("#HInitTimeCycle").empty();


                $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);


                form.render('select');


            //    $("#HInitTimeCycle").empty();


            //    $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);


            //    form.render('select');




                $("#HInitTimeCycle").val("29");


            }


            //    $("#HInitTimeCycle").val("29");


            //}




            //获取参数


            function getUrlVars() {




 WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillList.html


@@ -611,7 +611,7 @@


                //加载业务员


                //get_HEmpName();


                //隐藏勾选字段


                DisPlay_HideColumn();


                /*DisPlay_HideColumn();*/




                //任意字段过滤下拉框初始化


                ColFilter();


@@ -1980,7 +1980,7 @@


                    , shift: 2 //弹出动画


                    , area: ["50%", "90%"] //窗体大小


                    , maxmin: true //设置最大最小按钮是否显示


                    , content: ['../../基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]


                    , content: ['../../基础资料/隐藏列设置/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName, "yes"]


                    , btn: ["确定", "取消"]


                    , btn1: function (index, laero) {


                        //刷新表格数据


@@ -1991,6 +1991,7 @@


                })


            }


            //#endregion




            //#region æ˜¾ç¤ºåˆ—数据


            function DisPlay_HideColumn() {


                $.ajax({


@@ -2002,59 +2003,72 @@




                            var dataCol = [];//数据库查询出的列数据


                            var titleData = ["hmainid", "HBillType", "HSupID", "业务状态", "HUnitID", "供应商代码", "业务员代码", "HPriority", "HPSStyleID", "HSSID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID"];//不需要显示的字段 å¯æ‰©å±•




                            var newCols = [[]];//对应数据库列顺序col


                            newCols[0].push(option.cols[0][0]);//放入第一个checkbox


                            dataCol = data1.data[0].HGridString.split(',');




                            for (var i = 0; i < option.cols[0].length - 1; i++) {


                                var dataCols = dataCol[i].split('|');


                                //隐藏列


                                if (dataCols[1] == 1) {


                                    option.cols[0][i + 1]["hide"] = true;


                                }


                                //设置内容字体大小


                                if (data1.data[0].HFontSize != 0) {


                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";


                                } else {


                                    option.cols[0][i + 1]["style"] = "font-size:100%";


                                }


                                //设置列宽


                                if (dataCols[3] > 0) {


                                    option.cols[0][i + 1]["width"] = dataCols[3];


                                }


                                //显示列


                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {


                                    option.cols[0][i + 1]["hide"] = false;


                                }


                                //字体所在位置(å·¦ å±…中 å³)


                                switch (dataCols[2]) {


                                    case "L":


                                        option.cols[0][i + 1]["align"] = "left";


                                        break;


                                    case "M":


                                        option.cols[0][i + 1]["align"] = "center";


                                        break;


                                    case "R":


                                        option.cols[0][i + 1]["align"] = "right";


                                        break;


                                }


                            }




                            //取消冻结列


                            for (var i = 1; i < option.cols[0].length - 1; i++) {


                                if (option.cols[0][i]["fixed"] != null) {


                                    option.cols[0][i]["fixed"] = null;


                                }


                                else {


                                    break;


                                }


                            }


                            //冻结列


                            if (data1.data[0].HFixCols != 0) {


                                for (var i = 0; i < data1.data[0].HFixCols; i++) {


                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {


                                        data1.data[0].HFixCols += 1;


                            //列设置列数与页面列数是否一致


                            if (dataCol.length == option.cols[0].length - 1) {


                                //遍历寻找列设置对应列按顺序插入


                                for (var j = 0; j < option.cols[0].length - 1; j++) {


                                    for (var i = 0; i < option.cols[0].length - 1; i++) {


                                        var dataCols = dataCol[j].split('|');


                                        //选择与datacols相应列进行修改


                                        if (option.cols[0][i + 1]["field"] == dataCols[4]) {


                                            //隐藏列


                                            if (dataCols[1] == 1) {


                                                option.cols[0][i + 1]["hide"] = true;


                                            }


                                            //设置列宽


                                            if (dataCols[3] > 0) {


                                                option.cols[0][i + 1]["width"] = dataCols[3];


                                            }


                                            //设置内容字体大小


                                            if (data1.data[0].HFontSize != 0) {


                                                option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";


                                            } else {


                                                option.cols[0][i + 1]["style"] = "font-size:100%";


                                            }


                                            //显示列


                                            if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {


                                                option.cols[0][i + 1]["hide"] = false;


                                            }


                                            //字体所在位置(å·¦ å±…中 å³)


                                            switch (dataCols[2]) {


                                                case "L":


                                                    option.cols[0][i + 1]["align"] = "left";


                                                    break;


                                                case "M":


                                                    option.cols[0][i + 1]["align"] = "center";


                                                    break;


                                                case "R":


                                                    option.cols[0][i + 1]["align"] = "right";


                                                    break;


                                            }


                                            newCols[0].push(option.cols[0][i+1]);


                                        }


                                    }


                                    option.cols[0][i + 1]["fixed"] = "left";


                                }


                                //遍历循环后判断对应列数是否一致


                                if (dataCol.length == newCols[0].length - 1) {


                                    option.cols = newCols;


                                    //取消冻结列


                                    for (var i = 1; i < option.cols[0].length - 1; i++) {


                                        if (option.cols[0][i]["fixed"] != null) {


                                            option.cols[0][i]["fixed"] = null;


                                        }


                                        else {


                                            break;


                                        }


                                    }


                                    //冻结列


                                    if (data1.data[0].HFixCols != 0) {


                                        for (var i = 0; i < data1.data[0].HFixCols; i++) {


                                            if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {


                                                data1.data[0].HFixCols += 1;


                                            }


                                            option.cols[0][i + 1]["fixed"] = "left";


                                        }


                                    }


                                }


                            }


                            table.render(option);




 WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutRequestBillList.html


@@ -481,6 +481,56 @@


                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},


                    success: function (data1) {


                        if (data1.count == 1) {


                            var titleData = ["hmainid","HBillSubType","HEmpID","HManagerID"];//不需要显示的字段 å¯æ‰©å±•


                            var data = [];//列字段数据


                            var col = [];


                            var totalArray = [];


                            //给空的数组赋值


                            for (var key in data1.list) {//循序遍历数组


                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//从每个对象中提取数据


                            }


                            //在列表左边添加勾选框


                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });


                            for (var i = 0; i < data.length; i++) {//遍历data数组重的数据


                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {


                                if ($.inArray(data[i].name, titleData) > -1) {//检查data【i】.name是否在数组中  //计算列


                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列


                                }


                                else if ($.inArray(data[i].name, totalArray) > -1) { //计算列  


                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });


                                } else if (data[i].name == '单据号') {


                                    col.push({


                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '单据号', templet: function (d) {


                                            return '<span style="color: blue;">' + d.单据号 + '</span>'


                                        }, style: 'cursor: pointer;'


                                    });


                                } else {


                                    switch (data[i].Type) {


                                        //int


                                        case 'DateTime':


                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "行关闭日期" ? "行关闭人" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });


                                            break;


                                        default:


                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });


                                    }


                                }


                            }


                            //动态显示列名


                            option = {


                                elem: '#mainTable'


                                , toolbar: '#toolbarDemo'


                                , cols: [col]


                                , data: data1.data


                                , height: 800


                                , page: true


                                , totalRow: true


                                , cellMinWidth: 90


                                , limit: 50


                                , limits: [50, 500, 5000, 20000]


                                , done: function (res, curr, count) {


                                    soulTable.render(this);


                                }


                            }


                            DataList = data1.data;


                            option.data = data1.data;


                            table.render(option);


@@ -799,56 +849,9 @@


                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },


                    success: function (data1) {


                        if (data1.data.length != 0) {


                            var data = [];//列字段数据


                            var col = [];


                            var totalArray = [];


                            var dataCol = [];//数据库查询出的列数据


                           // var titleData = ["单据ID", "单据类型", "HDeptID", "HUnitID", "HMaterID", "HWHID", "HSPID", "源单主内码","源单子内码"];//不需要显示的字段 å¯æ‰©å±•


                            //给空的数组赋值


                            for (var key in data1.list) {//循序遍历数组


                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//从每个对象中提取数据


                            }


                            //在列表左边添加勾选框


                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });


                            for (var i = 0; i < data.length; i++) {//遍历data数组重的数据


                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {


                                if ($.inArray(data[i].name, titleData) > -1) {//检查data【i】.name是否在数组中  //计算列


                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列


                                }


                                else if ($.inArray(data[i].name, totalArray) > -1) { //计算列  


                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });


                                } else if (data[i].name == '单据号') {


                                    col.push({


                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '单据号', templet: function (d) {


                                            return '<span style="color: blue;">' + d.单据号 + '</span>'


                                        }, style: 'cursor: pointer;' });


                                } else {


                                    switch (data[i].Type) {


                                        //int


                                        case 'DateTime':


                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "行关闭日期" ? "行关闭人" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });


                                            break;


                                        default:


                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });


                                    }


                                }


                            }


                            //动态显示列名


                            option = {


                                elem: '#mainTable'


                                , toolbar: '#toolbarDemo'


                                , cols: [col]


                                , data: data1.data


                                , height: 800


                                , page: true


                                , totalRow: true


                                , cellMinWidth: 90


                                , limit: 50


                                , limits: [50, 500, 5000, 20000]


                                , done: function (res, curr, count) {


                                    soulTable.render(this);


                                }


                            }


                            


                            dataCol = data1.data[0].HGridString.split(',');




                            for (var i = 0; i < option.cols[0].length - 2; i++) {