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

llj

2025-09-24 a5ef49c0913126bc4fbb5a09736ddcb05273e1e7

 WebTM/views/²Ö´æ¹ÜÀí/×éÍе¥/Sc_PackUnionBillMain_Setto.html

@@ -98,11 +98,11 @@
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<=">
                                                     &lt;= </option>
                                                    &lt;= </option>
                                                <option value="<">
                                                     &lt; </option>
                                                    &lt; </option>
                                                <option value="<>">
                                                     &lt;>
                                                    &lt;>
                                                </option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
@@ -241,7 +241,7 @@
            //#region ã€åŠ¨æ€èŽ·å–模块名称】
            var HModuleType = "Sc_PackUnionBillMain_Setto";
            //通过单据类型，从数据库动态获取单据模块命名,引用js文件 PageTitle.js
            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
            var HPageTitle = get_PageTitle(HModuleType) || document.title;
            //#endregion


@@ -403,6 +403,7 @@
                $("#HBeginDate").val(util.toDateString(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
                $("#HEndDate").val(util.toDateString(new Date(), "yyyy-MM-dd"));
                //查询
                get_FastQuery()
                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
            }
@@ -517,10 +518,10 @@
                            ins = table.render(option);
                            layer.close(ajaxLoad);

                            if ($("#ColName option").length < 1) {
                                ColFilter();
                                get_DefaultModule();//加载方案
                            }
                            // if ($("#ColName option").length < 1) {
                            //     ColFilter();
                            //     get_DefaultModule();//加载方案
                            // }

                            //layer.alert("查询成功", { icon: 1 });
                        } else {
@@ -615,11 +616,12 @@

                            //刷新表格数据
                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
                            ins = table.render(option);

                            if ($("#ColName option").length < 1) {
                                ColFilter();
                                get_DefaultModule();//加载方案
                                // get_DefaultModule();//加载方案
                            }
                            ins = table.render(option);
                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                            layer.close(ajaxLoad);
                        } else {
@@ -752,7 +754,7 @@
                $("#HEndDate").val(util.toDateString(new Date(), "yyyy-MM-dd"));
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0"); 
                $("#Comparator").val("0");
                $("#ColContent2").val("");
                $("#ColName2").val("0");
                $("#Comparator2").val("0");
@@ -901,7 +903,7 @@
                });
                return Permission;
            }
        //#endregion
            //#endregion

            //#region ã€è¿‡æ»¤æ–¹æ¡ˆã€‘

@@ -933,6 +935,8 @@
                                    $("#" + data[i].过滤字段ID).find("option[value='" + data[i].过滤值 + "']").attr("selected", true);
                                }
                            }


                            //执行查询方法
                            get_FastQuery()
                            form.render("select");
@@ -941,7 +945,7 @@
                            //隐藏显示过滤方案的标签信息
                            document.getElementById("HFilterScheme_Now").style.display = "none";
                            //执行查询方法
                            get_FastQuery()
                            //get_FastQuery()
                            form.render("select");
                        }
                    }, error: function () {