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

zrg

2024-07-16 39593476c804f52772d737b8bf4f6de49e44d616

 WebTM/views/基础资料/基础资料/Gy_SettleStyle.html

@@ -47,7 +47,7 @@
                                <div class="layui-inline">
                                    <label class="layui-form-label">缁撶畻鏂瑰紡浠ｇ爜</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HNumber2" id="HNumber2" style="width:190px;">
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HNumber2" id="HNumber2" style="width:190px;">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
@@ -58,12 +58,12 @@
                                            <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 name="ColName" id="ColName" lay-filter="ColName" style="width:190px;" class="ForFilteringSchemes">
                                                    </select>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
                                                <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;" class="ForFilteringSchemes">
                                                    <option value="0" selected="selected"></option>
                                                    <option value="=">=</option>
                                                    <option value=">=">>=</option>
@@ -78,7 +78,7 @@
                                                </select>
                                            </div>
                                            <div class="layui-inline">
                                                <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
                                                <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
                                            </div>
                                        </div>
                                    </div>
@@ -225,7 +225,6 @@
                //鏌ヨ
                get_Display(sWhere);

                get_DefaultModule();
            }
            //#endregion

@@ -307,8 +306,9 @@
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);
                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                            if ($("#ColName option").length < 1) {
                                ColFilter();
                                get_DefaultModule();//鍔犺浇鏂规
                            }
                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                        } else {