Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

zrg

2024-05-11 7295b8c0c0d2f5272700274344843c48e0697312

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

Diff too large

 WebTM/WebTM.csproj

@@ -341,6 +341,7 @@
    <Content Include="views\设备管理\设备停机单\Sb_EquipStopBillList.html" />
    <Content Include="views\设备管理\设备开机单\Sb_EquipBeginBill.html" />
    <Content Include="views\设备管理\设备开机单\Sb_EquipBeginBillList.html" />
    <Content Include="views\车间管理\报表分析\Kf_PressurizedWaterNoOutReport.html" />
    <Content Include="views\项目管理\基础建模\Add_Edit_Gy_TaskClass.html" />
    <Content Include="views\项目管理\基础建模\Add_Edit_Gy_ProjectClass.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_ColorClass.html" />

 WebTM/views/WMSɨÂëÄ£¿é/ÌõÂë²éѯ/Gy_BarCodeBill_QiaoYi_PDA.html

@@ -50,6 +50,16 @@
                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">销售订单:</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input name="HSeOrderBillNo" id="HSeOrderBillNo" lay-verify="HSeOrderBillNo" disabled="disabled" autocomplete="off" class="layui-input mobile">
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width: 60px; padding-left: 0px;">生产订单:</label>
                                        </div>
                                        <div class="layui-col-xs5" style="text-align:left;">
@@ -366,6 +376,7 @@
                                "HSourceInterID": data.HSourceInterID,
                                "HOrderBillNo": data.流转卡号,
                                "HOrderInterID": data.HOrderInterID,
                                "HSeOrderBillNo": data.销售订单号,
                                "HWidth": data.门幅,
                                "HWeight": data.克重,
                                "HNumber": data.HNumber,
@@ -412,7 +423,7 @@

            form.on('submit(cmdCancel)', function () {
                layer.confirm('您确定要退出吗？', { icon: 3, title: '提示' }, function (index) {
                    parent.location.href = "../../../views/index_Mobile.html";
                    parent.location.href = "../../../views/index_Mobile_QiaoYi.html";
                });
            })
                //#endregion

 WebTM/views/home/console_Mobile_QiaoYi.html

@@ -86,6 +86,12 @@
                                                <cite>中检记录单</cite>
                                            </a>
                                        </li>
                                        <li class="layui-col-xs3">
                                            <a href="../WMS扫码模块/条码查询/Gy_BarCodeBill_QiaoYi_PDA.html" target="main_self_frame">
                                                <i class="layui-icon layui-icon-form"></i>
                                                <cite>条码查询</cite>
                                            </a>
                                        </li>
                                    </ul>
                                </div>
                            </div>

 WebTM/views/index_QiaoYi.html

@@ -565,6 +565,7 @@
                                            <a>毛尖</a>
                                            <dl class="layui-nav-child append" id="append" style="margin: 0 0 0 13px;">
                                                <dd><a lay-href="车间管理/报表分析/Kf_PressurizedWaterOutReport.html">压水出站</a></dd>
                                                <dd><a lay-href="车间管理/报表分析/Kf_PressurizedWaterNoOutReport.html">压水未出站报表</a></dd>
                                                <dd><a lay-href="车间管理/报表分析/Kf_HairtipReport.html">毛尖出站</a></dd>
                                                <dd><a lay-href="车间管理/报表分析/Kf_DigitalSprayPaintingReport.html">数码喷花出站</a></dd>
                                            </dl>

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Add_Edit_Gy_InspectBasis.html

@@ -33,14 +33,14 @@
                                    <div class="layui-tab-item layui-show">
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 120px">代码：</label>
                                                <label class="layui-form-label" style="width: 120px">代码<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
                                                    <input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 120px">名称：</label>
                                                <label class="layui-form-label" style="width: 120px">名称<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input class="layui-input" name="HName" id="HName" autocomplete="off">
                                                </div>
@@ -145,6 +145,10 @@
            //保存
            form.on('submit(Saver)', function (data) {//保存

                if (!AllowLoadData()) {
                    return;
                }

                var isEndCheck = document.getElementById("HStopflag").checked;
                isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//将数组合并成字符串

@@ -226,7 +230,7 @@
                    },
                    success: function (result) {
                        if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data.h_v_Gy_InspectBasis[0];
                            var data = result.data.h_v_Gy_InspectBasis_Edit[0];
                            $("#HItemID").val(data.HItemID);//代码ID
                            $("#HNumber").val(data.检验依据代码);//代码
                            $("#HName").val(data.检验依据名称);//名称
@@ -271,6 +275,24 @@
                    }
                })
            }

            //数据验证
            function AllowLoadData() {
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();

                if (HNumber == null || HNumber == undefined || HNumber == "") {
                    layer.msg("请输入代码！", { icon: 5 });
                    return false;
                }
                if (HName == null || HName == undefined || HName == "") {

                    layer.msg("请输入名称！", { icon: 5 });
                    return false;
                }

                return true;
            }
            //#endregion
        });


 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Add_Edit_Gy_InspectInstruMent.html

@@ -33,14 +33,14 @@
                                    <div class="layui-tab-item layui-show">
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 120px">代码：</label>
                                                <label class="layui-form-label" style="width: 120px">代码<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
                                                    <input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 120px">名称：</label>
                                                <label class="layui-form-label" style="width: 120px">名称<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input class="layui-input" name="HName" id="HName" autocomplete="off">
                                                </div>
@@ -144,6 +144,10 @@
            //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等
            //保存
            form.on('submit(Saver)', function (data) {//保存

                if (!AllowLoadData()) {
                    return;
                }

                var isEndCheck = document.getElementById("HStopflag").checked;
                isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//将数组合并成字符串
@@ -271,6 +275,25 @@
                    }
                })
            }

            //数据验证
            function AllowLoadData() {
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();

                if (HNumber == null || HNumber == undefined || HNumber == "") {
                    layer.msg("请输入代码！", { icon: 5 });
                    return false;
                }
                if (HName == null || HName == undefined || HName == "") {

                    layer.msg("请输入名称！", { icon: 5 });
                    return false;
                }

                return true;
            }

            //#endregion
        });


 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Add_Edit_Gy_InspectMethod.html

@@ -33,14 +33,14 @@
                                    <div class="layui-tab-item layui-show">
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 120px">代码：</label>
                                                <label class="layui-form-label" style="width: 120px">代码<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
                                                    <input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 120px">名称：</label>
                                                <label class="layui-form-label" style="width: 120px">名称<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input class="layui-input" name="HName" id="HName" autocomplete="off">
                                                </div>
@@ -144,6 +144,10 @@
            //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等
            //保存
            form.on('submit(Saver)', function (data) {//保存

                if (!AllowLoadData()) {
                    return;
                }

                var isEndCheck = document.getElementById("HStopflag").checked;
                isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//将数组合并成字符串
@@ -271,6 +275,25 @@
                    }
                })
            }

            //数据验证
            function AllowLoadData() {
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();              

                if (HNumber == null || HNumber == undefined || HNumber == "") {
                    layer.msg("请输入代码！", { icon: 5 });
                    return false;
                }
                if (HName == null || HName == undefined || HName == "") {

                    layer.msg("请输入名称！", { icon: 5 });
                    return false;
                }
             
                return true;
            }

            //#endregion
        });


 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Add_Edit_Gy_QualityStd.html

@@ -33,14 +33,14 @@
                                    <div class="layui-tab-item layui-show">
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 120px">代码：</label>
                                                <label class="layui-form-label" style="width: 120px">代码<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
                                                    <input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 120px">名称：</label>
                                                <label class="layui-form-label" style="width: 120px">名称<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input class="layui-input" name="HName" id="HName" autocomplete="off">
                                                </div>
@@ -144,6 +144,10 @@
            //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等
            //保存
            form.on('submit(Saver)', function (data) {//保存

                if (!AllowLoadData()) {
                    return;
                }

                var isEndCheck = document.getElementById("HStopflag").checked;
                isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//将数组合并成字符串
@@ -271,6 +275,25 @@
                    }
                })
            }

            //数据验证
            function AllowLoadData() {
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();

                if (HNumber == null || HNumber == undefined || HNumber == "") {
                    layer.msg("请输入代码！", { icon: 5 });
                    return false;
                }
                if (HName == null || HName == undefined || HName == "") {

                    layer.msg("请输入名称！", { icon: 5 });
                    return false;
                }

                return true;
            }

            //#endregion
        });


 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html

@@ -224,6 +224,13 @@
                                                <input type="date" class="layui-input ForFilteringSchemes" id="HDate1">
                                            </div>
                                        </div>
                                        <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>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
@@ -523,6 +530,25 @@
                get_FastQuery();
            });

            //#region æ—¥æœŸé—´éš”下拉列表监听
            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);
                }
            });
            //#endregion

            //获取组织
            function Organ() {
@@ -577,6 +603,22 @@

            //#region åˆå§‹åŒ–界面
            function set_ClearBill() {
                //初始化日期间隔、开始日期、结束日期
                setSelect_HInitTimeCycle();
                //若日期间隔不为 ä»»æ„é—´éš”，则禁用开始日期与结束日期的选择
                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                if (HInitTimeCycle != -1) {
                    $('#HDate').prop('disabled', true);
                    $('#HDate1').prop('disabled', true);
                } else {
                    $('#HDate').prop('disabled', false);
                    $('#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"));

                //初始化表格
                set_InitGrid();
                //查询
@@ -671,8 +713,6 @@
            };

            function set_InitGrid() {
                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
@@ -918,48 +958,48 @@


                if (ColName1 != 0 && Comparator1 != 0) {
                    var com = "";
                    switch (Comparator) {
                    var com1 = "";
                    switch (Comparator1) {
                        case "7":
                            com = "like'%" + ColContent1 + "%'";
                            com1 = "like'%" + ColContent1 + "%'";
                            break;
                        case "8":
                            com = "like'%" + ColContent1 + "'";
                            com1 = "like'%" + ColContent1 + "'";
                            break;
                        case "9":
                            com = "like'" + ColContent1 + "%'";
                            com1 = "like'" + ColContent1 + "%'";
                            break;
                        case "10":
                            com = "not like'%" + ColContent1 + "%'";
                            com1 = "not like'%" + ColContent1 + "%'";
                            break;
                        default:
                            com = "" + Comparator1 + "'" + ColContent1 + "'";
                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
                            break;
                    }
                    sWhere += " and " + ColName1 + " " + com;
                    sWhere += " and " + ColName1 + " " + com1;
                }


                if (ColName2 != 0 && Comparator2 != 0) {
                    var com = "";
                    switch (Comparator) {
                    var com2 = "";
                    switch (Comparator2) {
                        case "7":
                            com = "like'%" + ColContent2 + "%'";
                            com2 = "like'%" + ColContent2 + "%'";
                            break;
                        case "8":
                            com = "like'%" + ColContent2 + "'";
                            com2 = "like'%" + ColContent2 + "'";
                            break;
                        case "9":
                            com = "like'" + ColContent2 + "%'";
                            com2 = "like'" + ColContent2 + "%'";
                            break;
                        case "10":
                            com = "not like'%" + ColContent2 + "%'";
                            com2 = "not like'%" + ColContent2 + "%'";
                            break;
                        default:
                            com = "" + Comparator2 + "'" + ColContent2 + "'";
                            com2 = "" + Comparator2 + "'" + ColContent2 + "'";
                            break;
                    }
                    sWhere += " and " + ColName2 + " " + com;
                    sWhere += " and " + ColName2 + " " + com2;
                }

                //传递的参数不为NAN
@@ -1030,8 +1070,10 @@

            //#region é‡ç½®è¿‡æ»¤æ¡ä»¶æ–¹æ³•
            function set_ClearQuery() {
                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//开始日期
                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));;//结束日期
                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //开始日期
                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));  //结束日期

                $("#HOrderProcNO").val("");//订单跟踪号
                $("#WorkCenter").val("");//单据号
                $("#HDeptName").val("0");//单据号
@@ -2123,6 +2165,24 @@
                                    $("#" + data[i].过滤字段ID).find("option[value='" + data[i].过滤值 + "']").attr("selected", true);
                                }
                            }

                            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);
                            }


                            //执行查询方法
                            get_FastQuery()
                            form.render("select");
@@ -2383,6 +2443,25 @@
            }
            //#endregion


            //#region åˆå§‹æ—¥æœŸé—´éš” ä¸‹æ‹‰åˆ—表
            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>';
                }

                $("#HInitTimeCycle").empty();
                $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
                form.render('select');

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

            //#region èŽ·å–参数
            function getUrlVars() {
                var vars = [], hash;

 WebTM/views/ÖÊÁ¿¹ÜÀí/Ê×¼þ¼ìÑéµ¥/QC_Add_Edit_FirstPieceCheckBill.html

@@ -709,13 +709,6 @@
            var editIndex = 0;//编辑下标
            var SampleNum = [];//样本数量

            //判断是否登录 æœªç™»å½•åˆ™è·³åˆ°ç™»å½•é¡µ
            //if (sessionStorage.login != "login") {
            //    layer.confirm("登录失效，请重新登录！", {
            //        icon: 4, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['重新登录']
            //    }, function () { window.location.href = "../../user/login.html"; });
            //}

            //#region ã€åŠ¨æ€èŽ·å–模块名称】
            var HModuleType = "7505";
            //通过单据类型，从数据库动态获取单据模块命名,引用js文件 PageTitle.js
@@ -805,6 +798,11 @@
                    //根据源单id获取源单信息
                    LoadingInformation_ICMO();
                }
                //工序流转卡列表首检
                else if (HSouceBillType == 3772) {
                    //根据源单id获取源单信息
                    LoadingInformation_ProcExchange();
                }
                else {
                    layer.alert("源单类型无效！", { icon: 5 });
                }
@@ -819,7 +817,7 @@
            //初始化表格
            set_InitGrid();

            //根据源单id获取源单信息
            //根据源单id获取源单信息(进站接收单)
            function LoadingInformation_StationInBill() {
                var wait = layer.load();
                $.ajax({
@@ -859,6 +857,47 @@
                    }
                });
            }
            
            //根据源单id获取源单信息(工序流转卡)
            function LoadingInformation_ProcExchange() {
                var wait = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/QC_FirstPieceCheckBill/get_ProcessExchangeBill',
                    type: "GET",
                    data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        var data = result.data[0];
                        if (result.count == 1) {
                            $("#HProcExchBillNo").val(data.单据号);
                            $("#HProcExchInterID").val(data.HInterID);
                            $("#HProcExchEntryID").val(data.HProcExchEntryID);//
                            $("#HProcExchQty").val(data.流转卡数量);
                            $("#HICMOBillNo").val(data.任务单);
                            $("#HICMOInterID").val(data.HICMOInterID);
                            $("#HICMOQty").val(data.HICMOQty);//
                            $("#HSourceName").val(data.生产资源);//
                            $("#HSourceID").val(data.HSourceID);//
                            $("#HMaterID").val(data.HMaterID);
                            $("#HMaterName").val(data.产品名称);
                            $("#HMainSourceBillNo").val(data.单据号);
                            $("#HMainSourceBillType").val(data.HBillType);
                            $("#HMainSourceInterID").val(data.HInterID);
                            $("#HICMOEntryID").val(data.HICMOEntryID);//
                            $("#HQCSchemeName").val(data.检验方案名称);
                            $("#HQCSchemeID").val(data.检验方案ID);
                            $("#HProcName").val(data.当前工序);//
                            //获取表体检验项目信息
                            get_CheckItem();
                        } else {
                            layer.alert(result.Message, { icon: 5 });
                        }
                        layer.close(wait);
                    }, error: function () {
                        layer.close(wait);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }

            //根据源单id获取源单信息--生产订单
            function LoadingInformation_ICMO() {

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBillList.html

@@ -46,7 +46,13 @@
                                <div class="layui-inline">
                                    <input type="checkbox" id="wybj" name="wybj" title="只显示委外" lay-filter="wybj" lay-skin="primary" class="ForFilteringSchemes">
                                </div>

                                <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>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                    <div class="layui-input-block">
@@ -139,6 +145,62 @@
                                        <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>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <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="7">包含</option>
                                            <option value="8">左包含</option>
                                            <option value="9">右包含</option>
                                            <option value="10">不包含</option>
                                        </select>
                                    </div>
                                    <div class="layui-inline">
                                        <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>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <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="7">包含</option>
                                            <option value="8">左包含</option>
                                            <option value="9">右包含</option>
                                            <option value="10">不包含</option>
                                        </select>
                                    </div>
                                    <div class="layui-inline">
                                        <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
                                    </div>
                                </div>
                            </div>
                        </div>
                        <!--<div class="layui-tab-item layui-show">-->
@@ -198,6 +260,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>按钮设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" 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" style="display:none;" 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" style="display:none;" lay-event="set_FirstPieceCheck" id="set_FirstPieceCheck"><i class="layui-icon layui-icon-form"></i>首检</button>
                            </div>
                        </script>
                        <script type="text/html" id="toolbarDemo2">
@@ -405,6 +468,9 @@
                    //读取方案
                    case 'set_ReadScheme': set_ReadScheme();
                        break;
                    //首检
                    case 'set_FirstPieceCheck': set_FirstPieceCheck();
                        break;
                };
            });

@@ -487,12 +553,45 @@
            });
            //#endregion

            //#region æ—¥æœŸé—´éš”下拉列表监听
            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);
                }
            });
            //#endregion

            //#region æœ¬é¡µé¢æ‰€æœ‰è¢«è°ƒç”¨çš„方法
            function set_ClearBill() {
                get_Dept();
                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));//开始日期

                //初始化日期间隔、开始日期、结束日期
                setSelect_HInitTimeCycle();
                //若日期间隔不为 ä»»æ„é—´éš”，则禁用开始日期与结束日期的选择
                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                if (HInitTimeCycle != -1) {
                    $('#HDate').prop('disabled', true);
                    $('#HDate1').prop('disabled', true);
                } else {
                    $('#HDate').prop('disabled', false);
                    $('#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"));//结束日期

                //初始化主表列表
                set_InitGrid();
                //初始化从表列表
@@ -514,14 +613,26 @@
                $("#SHPrintQty").val("");//打印状态
                $("input[type='checkbox'][name='wybj']").prop('checked', false);
                form.render("checkbox");//委外标记
                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));//开始日期
                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));//结束日期

                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //开始日期
                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));  //结束日期

                $("#HOrderProcNO").val("");//订单跟踪号
                $("#SHname").val("");//物料|子件名称|子件规格
                $("#HBillNo").val("");//单据号
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");

                $("#ColContent1").val("");
                $("#ColName1").val("0");
                $("#Comparator1").val("0");

                $("#ColContent2").val("");
                $("#ColName2").val("0");
                $("#Comparator2").val("0");

                form.render('select');
                //$("#btnSearch").click();
                sWhere = "";
@@ -542,6 +653,12 @@
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();
                var ColName1 = $("#ColName1").val();//复选框
                var Comparator1 = $("#Comparator1").val()
                var ColContent1 = $("#ColContent1").val();
                var ColName2 = $("#ColName2").val();//复选框
                var Comparator2 = $("#Comparator2").val()
                var ColContent2 = $("#ColContent2").val();
                var HDeptName = $("#HDeptName").val();//车间

                if (ColName != 0 && Comparator != 0) {
@@ -564,6 +681,50 @@
                            break;
                    }
                    sWhere += " and " + ColName + " " + com;
                }

                if (ColName1 != 0 && Comparator1 != 0) {
                    var com1 = "";
                    switch (Comparator1) {
                        case "7":
                            com1 = "like'%" + ColContent1 + "%'";
                            break;
                        case "8":
                            com1 = "like'%" + ColContent1 + "'";
                            break;
                        case "9":
                            com1 = "like'" + ColContent1 + "%'";
                            break;
                        case "10":
                            com1 = "not like'%" + ColContent1 + "%'";
                            break;
                        default:
                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
                            break;
                    }
                    sWhere += " and " + ColName1 + " " + com1;
                }

                if (ColName2 != 0 && Comparator2 != 0) {
                    var com2 = "";
                    switch (Comparator2) {
                        case "7":
                            com2 = "like'%" + ColContent2 + "%'";
                            break;
                        case "8":
                            com2 = "like'%" + ColContent2 + "'";
                            break;
                        case "9":
                            com2 = "like'" + ColContent2 + "%'";
                            break;
                        case "10":
                            com2 = "not like'%" + ColContent2 + "%'";
                            break;
                        default:
                            com2 = "" + Comparator2 + "'" + ColContent2 + "'";
                            break;
                    }
                    sWhere += " and " + ColName2 + " " + com2;
                }

                if (SHPrintQty) {//判断打印状态
@@ -1361,6 +1522,22 @@
                                    $("#" + data[i].过滤字段ID).find("option[value='" + data[i].过滤值 + "']").attr("selected", true);
                                }
                            }


                            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"));
                            } else {
                                $('#HDate').prop('disabled', false);
                                $('#HDate1').prop('disabled', false);
                            }


                            //执行查询方法
                            get_FastQuery()
                            form.render("select");
@@ -2499,6 +2676,34 @@
                }
            }

            //首检
            function set_FirstPieceCheck() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    var OperationType = 2;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '首件检验单-编辑'
                        , shade: 0.6
                        , maxmin: false
                        , anim: 0
                        , content: ['../../质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3772&HICMOEntryID=0', 'yes']
                        , resize: false
                        , cancel: function () {
                            btnIs();
                        }
                        , end: function () {
                            get_FastQuery();
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');
                }
            }

            //列明显示下拉框
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';
@@ -2509,6 +2714,14 @@
                }
                $("#ColName").empty();
                $("#ColName").append(Organization);
                form.render('select');

                $("#ColName1").empty();
                $("#ColName1").append(Organization);
                form.render('select');

                $("#ColName2").empty();
                $("#ColName2").append(Organization);
                form.render('select');
            }

@@ -2586,6 +2799,24 @@
                }
            }

            //#region åˆå§‹æ—¥æœŸé—´éš” ä¸‹æ‹‰åˆ—表
            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>';
                }

                $("#HInitTimeCycle").empty();
                $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
                form.render('select');

                $("#HInitTimeCycle").val("6");
            }
            //#endregion

            //#region åä½œåºŸ/作废数据
            function set_DropBill(num) {
                var checkStatus = table.checkStatus('mainTable')

 WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Kf_PressurizedWaterNoOutReport.html

New file
@@ -0,0 +1,578 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>车间压水出站报表</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <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>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/HideButton.js"></script>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>更多</span>
                                    </div>
                                </div>

                                <div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">结束日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
                                    </div>
                                </div>


                                <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>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <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="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></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="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>按钮设置</button>
                            </div>
                        </script>
                    </form>
                </div>
            </div>
        </div>
    </div>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
            //#region å…¬ç”¨å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
            var option = [];
            var sWhere = "";
            var HModName = "Kf_PressurizedWaterNoOutReport";
            //不需要显示的字段 å¯æ‰©å±•
            var titleData = [];

            var ins;                        //用于导出excel
            //#endregion

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

            //初始化界面
            set_ClearBill();

            //#endregion

            //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等
            //#region å¤´å·¥å…·æ äº‹ä»¶
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
                    //刷新
                    case 'get_Refresh': get_Refresh();
                        break;
                    //导出excel
                    case 'get_export':
                        get_Export();
                        break;
                    //退出按钮
                    case 'get_Exit': Pub_Close(2);
                        break;
                    //列设置
                    case 'set_HideColumn': get_HideColumn();
                        break;
                    //按钮设置
                    case 'HideButton':
                        var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                        var HBillType = "Kf_PressurizedWaterNoOutReport";
                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                        break;
                };
            });
            //#endregion

            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
            table.on('row(mainTable)', function (obj) {
                //选中行改变颜色
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据，前面的只是添加或删除选中未选中样式以及设置背景色，字体颜色
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            })
            //#endregion


            //#region é‡ç½®æŒ‰é’®
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            });
            //#endregion

            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery(2);
            });
            //#endregion

            //#endregion

            //#region æœ¬é¡µé¢æ‰€æœ‰è¢«è°ƒç”¨çš„方法

            //#region åˆå§‹åŒ–界面
            function set_ClearBill() {
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 3), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));

                //初始化表格
                set_InitGrid();
                //查询
                get_FastQuery(1);
                //Organ();
            }
            //#endregion

            //#region åˆå§‹åŒ–表格方法
            function set_InitGrid() {
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , page: true
                    , totalRow: true
                    //, cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 50000]
                };
            }
            //#endregion
            //#endregion

            //#region æŸ¥è¯¢
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Kf_PressurizedWaterNoOutReport/list',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "userid": sessionStorage["Czybm"]},
                    success: function (data1) {
                        if (data1.count == 1) {
                            var totalArray = [];
                            var data = [];
                            var col = [];
                            //给空的数组赋值
                            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' });
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    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,templet: "<div>{{d." + data[i].name + " ==null ?'':fixed(d." + data[i].name + ")}}</div>" });
                                }
                                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 + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width:120 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
                                    }
                                }
                            }

                            option.cols = [col];
                            option.data = data1.data;
                            ins = table.render(option);

                            //刷新按钮显示
                            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                            var HBillType = "Kf_PressurizedWaterNoOutReport";
                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);

                            //刷新表格数据
                            //DisPlay_HideColumn();

                            layer.close(ajaxLoad);

                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                ColFilter();
                            }

                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });

            }
            //#endregion

            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery(number) {
                var HDate = $("#HBeginDate").val();//开始日期
                var HDate1 = $("#HEndDate").val();//结束日期

                //任意字段过滤
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();

                if (ColName != 0 && Comparator != 0) {
                    var com = "";
                    switch (Comparator) {
                        case "7":
                            com = "like ''%" + ColContent + "%''";
                            break;
                        case "8":
                            com = "like ''%" + ColContent + "''";
                            break;
                        case "9":
                            com = "like ''" + ColContent + "%''";
                            break;
                        case "10":
                            com = "not like ''%" + ColContent + "%''";
                            break;
                        default:
                            com = "" + Comparator + "''" + ColContent + "''";
                            break;
                    }
                    sWhere += " and " + ColName + " " + com;
                }


                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= ''" + HDate + "''";
                }
                if (HDate1) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= ''" + HDate1 + "''";
                }



                ////根据用户过滤用户关联客户的记录
                //sWhere += getSWhereByHUser();

                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
            //#endregion

            //#region é‡ç½®è¿‡æ»¤æ¡ä»¶æ–¹æ³•
            function set_ClearQuery() {
                //初始化时间
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 3), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));

                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                form.render('select');

                sWhere = "";
            }
            //#endregion

            //#region åˆ·æ–°
            function get_Refresh() {
                $("#btnSearch").trigger('click');
            }
            //#endregion

            //#region å¯¼å‡ºExecel
            function get_Export() {
                var ModRightNameCheck = "Kf_PressurizedWaterNoOutReport_ExportExcel";

                //逻辑审核方法
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //方法所在页面和方法名
                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            table.exportFile(ins.config.id, option.data, "xls");
                        } else {
                            layer.alert("当前模块没有导出权限!", { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion

            //#region éšè—åˆ—设置
            function get_HideColumn() {
                var colName = "";
                var contentUrl = "";
                for (var i = 1; i < option.cols[0].length; i++) {
                    colName += option.cols[0][i]["title"] + ",";
                }
                var urlStr = window.document.location.pathname;//获取文件路径
                var urlLen = urlStr.split('/');
                for (var i = 0; i < urlLen.length - 4; i++) {
                    contentUrl += "../";
                }
                colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码

                contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;

                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //加上边框
                    , title: "隐藏列设置"  //标题
                    , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2 //弹出动画
                    , area: ["50%", "90%"] //窗体大小
                    , maxmin: true //设置最大最小按钮是否显示
                    , content: [contentUrl, "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //刷新表格数据
                        DisPlay_HideColumn();
                        //更新表格缓存的数据
                        layer.close(index);//关闭弹窗
                    }
                })
            }
            //#endregion
            //#region æ˜¾ç¤ºåˆ—数据
            function DisPlay_HideColumn() {
                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    type: "GET",
                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.data.length != 0) {

                            var dataCol = [];//数据库查询出的列数据
                            //var titleData = ["单据ID", "HMouldID", "hsubid", "HManagerID", "源单主内码", "源单子内码"];//不需要显示的字段 å¯æ‰©å±•

                            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 (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 (data1.data[0].HColumnWidth != 0) {
                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                                //} else {
                                //    option.cols[0][i + 1]["width"] = "";
                                //}
                                //显示列
                                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;
                                    }
                                    option.cols[0][i + 1]["fixed"] = "left";
                                }
                            }
                            table.render(option);
                        } else {
                            table.render(option);
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                })
            }
            //#endregion

            //#region ä»»æ„å­—段过滤：列名显示下拉框
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';
                for (var i = 1; i < option.cols[0].length; i++) {
                    if (option.cols[0][i].hide != true) {
                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
                    }
                }
                $("#ColName").empty();
                $("#ColName").append(Organization);
                form.render('select');
            }
            //#endregion

            //#region æ ¹æ®ç”¨æˆ·èŽ·å–用户关联客户的过滤条件
            function getSWhereByHUser() {
                var res = "";
                $.ajax({
                    type: "GET",
                    async: false,
                    url: GetWEBURL() + "/Xs_SeOrderBill/getCusIDListByUser", //方法所在页面和方法名
                    data: { "CurUserID": sessionStorage["Czybm"], "CurUserName": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            res = result.data;
                        } else {
                            res = result.data;
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
                    }, error: function (err) {
                        res = " and 1 = 0";
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });

                res = res.replace("HCusID", "客户内码");
                res = res.replaceAll("'", "''");

                return res;
            }
            //#endregion
        });

            //#endregion

        //#region å°†æ•°æ®å¢žåŠ åƒåˆ†ä½
        function fixed(str) {
            if (str !== '' && str != null) {
                if (str === 0) {  //当为0时，不用处理
                    return 0;
                } else {
                    var str1 = str + "";
                    var real = str1.split('.')[0];                  //整数部分
                    var realQty = real.length;
                    var dotQty = str1.length - realQty - 1;

                    if (dotQty > 0) {
                        return str.toFixed(dotQty).replace(/(\d)(?=(\d{3})+\.)/g, '$1,');
                    } else {
                        var temp = str.toFixed(1).replace(/(\d)(?=(\d{3})+\.)/g, '$1,') + "";
                        temp = temp.split('.')[0];
                        return temp;
                    }
                }
            } else {
                return '';
            }
            return str;
        }
        //#endregion

            //以上是layui模块
    </script>

</body>
</html>

 WebTM/views/ÏúÊÛ¹ÜÀí/ÏúÊÛ¶©µ¥/Add_Edit_Xs_SeOrderBillList.html

@@ -224,7 +224,7 @@
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                    <div class="layui-row" style="display:none;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">项目代码</label>
                                            <div class="layui-input-inline">
@@ -543,7 +543,7 @@
            //#endregion

            //#region åˆ—设置：子表1
            //DisPlay_HideColumn();
            DisPlay_HideColumn();
            //#endregion
            //#endregion


 WebTM/views/ÏúÊÛ¹ÜÀí/ÏúÊÛ¶©µ¥/Xs_SeOrderBillList.html

@@ -39,6 +39,13 @@
                                    </div>
                                </div>
                                <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>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
@@ -123,6 +130,62 @@
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>

                                    <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
                                        <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>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" 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="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
                                        </div>
                                    </div>

                                    <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
                                        <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>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" 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="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
@@ -155,9 +218,9 @@
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" 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" style="display:none;" lay-event="HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>隐藏列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>按钮设置</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" 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" style="display:none;" 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" style="display:none;" lay-event="set_QueryCondition" id="set_QueryCondition"><i class="layui-icon layui-icon-set"></i>高级过滤</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" 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" style="display:none;" 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" style="display:none;" lay-event="set_QueryCondition" id="set_QueryCondition"><i class="layui-icon layui-icon-set"></i>高级过滤</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                            </div>
                        </script>
@@ -457,6 +520,30 @@
                })
            });
            //#endregion

            //#region æ—¥æœŸé—´éš”下拉列表监听
            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"));

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

                    //执行查询方法
                    get_FastQuery();
                } else {
                    $('#HBeginDate').prop('disabled', false);
                    $('#HEndDate').prop('disabled', false);
                }
            });
            //#endregion
            //#endregion


@@ -464,7 +551,20 @@
        
            //#region åˆå§‹åŒ–界面
            function set_ClearBill() {
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                //初始化日期间隔、开始日期、结束日期
                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"));
                //初始化表格
                set_InitGrid();
@@ -665,6 +765,14 @@
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();

                var ColName1 = $("#ColName1").val();//复选框
                var Comparator1 = $("#Comparator1").val()
                var ColContent1 = $("#ColContent1").val();

                var ColName2 = $("#ColName2").val();//复选框
                var Comparator2 = $("#Comparator2").val()
                var ColContent2 = $("#ColContent2").val();

                if (ColName != 0 && Comparator != 0) {
                    var com = "";
                    switch (Comparator) {
@@ -686,6 +794,51 @@
                    }
                    sWhere += " and " + ColName + " " + com;
                }

                if (ColName1 != 0 && Comparator1 != 0) {
                    var com1 = "";
                    switch (Comparator1) {
                        case "7":
                            com1 = "like'%" + ColContent1 + "%'";
                            break;
                        case "8":
                            com1 = "like'%" + ColContent1 + "'";
                            break;
                        case "9":
                            com1 = "like'" + ColContent1 + "%'";
                            break;
                        case "10":
                            com1 = "not like'%" + ColContent1 + "%'";
                            break;
                        default:
                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
                            break;
                    }
                    sWhere += " and " + ColName1 + " " + com1;
                }

                if (ColName2 != 0 && Comparator2 != 0) {
                    var com2 = "";
                    switch (Comparator2) {
                        case "7":
                            com2 = "like'%" + ColContent2 + "%'";
                            break;
                        case "8":
                            com2 = "like'%" + ColContent2 + "'";
                            break;
                        case "9":
                            com2 = "like'" + ColContent2 + "%'";
                            break;
                        case "10":
                            com2 = "not like'%" + ColContent2 + "%'";
                            break;
                        default:
                            com2 = "" + Comparator2 + "'" + ColContent2 + "'";
                            break;
                    }
                    sWhere += " and " + ColName2 + " " + com2;
                }

                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HDate + "'";
                }
@@ -723,8 +876,9 @@

            //#region é‡ç½®è¿‡æ»¤æ¡ä»¶
            function set_ClearQuery() {
                $("#HDate").val("");//开始日期
                $("#HDate1").val("");//结束日期
                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"));  //结束日期
                $("#HBillNo").val("");//
                $("#HCusID").val("");
                $("#HMaterNumber").val("");
@@ -732,6 +886,15 @@
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");

                $("#ColContent1").val("");
                $("#ColName1").val("0");
                $("#Comparator1").val("0");

                $("#ColContent2").val("");
                $("#ColName2").val("0");
                $("#Comparator2").val("0");

                form.render('select');
                sWhere = "";
            }
@@ -1705,6 +1868,30 @@
                                    $("#" + data[i].过滤字段ID).find("option[value='" + data[i].过滤值 + "']").attr("selected", true);
                                }
                            }


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

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

                                //执行查询方法
                                get_FastQuery();
                            } else {
                                $('#HBeginDate').prop('disabled', false);
                                $('#HEndDate').prop('disabled', false);
                            }



                            //执行查询方法
                            get_FastQuery()
                            form.render("select");
@@ -1951,6 +2138,32 @@
                $("#ColName").empty();
                $("#ColName").append(Organization);
                form.render('select');

                $("#ColName1").empty();
                $("#ColName1").append(Organization);
                form.render('select');

                $("#ColName2").empty();
                $("#ColName2").append(Organization);
                form.render('select');
            }
            //#endregion

            //#region åˆå§‹æ—¥æœŸé—´éš” ä¸‹æ‹‰åˆ—表
            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>';
                }

                $("#HInitTimeCycle").empty();
                $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
                form.render('select');

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