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

yusijie

9 天以前 24f43454989b92a251d923e23948a9af83485931

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

@@ -63,6 +63,13 @@
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
                                    </div>
                                </div>

                                <div class="layui-inline">
                                    <label class="layui-form-label">项目编号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HProjectNumber" id="HProjectNumber" 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>
@@ -311,6 +318,14 @@
                optionPage.curr = 1;
                get_FastQuery(table, option);
                
            });
            //#endregion

            //#endregion è¾“入框回车监听
            $('input[type="text"]').on('keydown', function (event) {
                if (event.keyCode == 13) {
                    $("#btnSearch").click();
                }
            });
            //#endregion

@@ -1019,6 +1034,7 @@
                var HDate = $("#HBeginDate").val();//开始日期
                var HDate1 = $("#HEndDate").val();//结束日期
                var HBillNo = $("#HBillNo").val();//单据号
                var HProjectNumber = $("#HProjectNumber").val(); //项目编号
                var HCusID = $("#HCusID").val();
                var HMaterNumber = $("#HMaterNumber").val();
                var HMaterName = $("#HMaterName").val();
@@ -1110,6 +1126,9 @@
                if (HBillNo) {
                    sWhere += " and å•æ®å· like ''%" + HBillNo + "%''";
                }
                if (HProjectNumber) {
                    sWhere += " and é¡¹ç›®ç¼–码 like ''%" + HProjectNumber + "%''";
                }
                if (HCusID) {
                    sWhere += " and å®¢æˆ· like ''%" + HCusID + "%''";
                }
@@ -1147,6 +1166,7 @@
                $("#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("");//
                $("#HProjectNumber").val("");
                $("#HCusID").val("");
                $("#HMaterNumber").val("");
                $("#HMaterName").val("");
@@ -2239,8 +2259,10 @@
                    , content: ['../../基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //刷新表格数据
                        DisPlay_HideColumn();
                        //初始化页大小
                        DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
                        //直接执行列表筛选 åŠ è½½æ•°æ®åˆ°ç½‘æ ¼
                        get_FastQuery()
                        //更新表格缓存的数据
                        layer.close(index);//关闭弹窗
                    }
@@ -2685,8 +2707,8 @@

            //#region åˆå§‹æ—¥æœŸé—´éš” ä¸‹æ‹‰åˆ—表
            function setSelect_HInitTimeCycle() {
                var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
                var titleList = ["今天", "近两天", "近三天", "近四天", "近五天", "近六天", "近七天", "近30天"];
                var valueList = [0, 1, 2, 3, 4, 5, 6, 29, 180, 365];
                var titleList = ["今天", "近两天", "近三天", "近四天", "近五天", "近六天", "近七天", "近30天", "近半年", "近一年"];

                var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >任意间隔</option>';
                for (var i = 0; i < valueList.length; i++) {