器具出入库列表界面增加以下过滤条件

zzr99

2022-03-25 266b2556a076f2d0b0b924c1088496e943d1bebb

器具出入库列表界面增加以下过滤条件

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldMoveStockStepInBillList.html

@@ -31,11 +31,11 @@
                    <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-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>更多</span>
                                    </div>
                                </div>-->
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">单据号</label>
                                    <div class="layui-input-block">
@@ -54,18 +54,55 @@
                                        <input type="date" class="layui-input" id="HEndDate" 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" name="HStockOrgName" id="HStockOrgName" 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">
                                
                                <div class="layui-colla-content">
                                    <div class="layui-inline">
                                        <div class="layui-inline">
                                            <span>其他条件></span>
                                        </div>
                                    </div>

                                </div>-->
                                    <div class="layui-inline">
                                        <label class="layui-form-label">部门信息</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HDept" id="HDept" 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" name="HMaterNumber" id="HMaterNumber" 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" name="HModelNumber" id="HModelNumber" 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" name="HWhName" id="HWhName" 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" name="HSupName" id="HSupName" style="width:190px;">
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -462,18 +499,40 @@

            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery(table, option) {
                var HDate = $("#HBeginDate").val();//开始日期
                var HDate1 = $("#HEndDate").val();//结束日期
                var HBillNo = $("#HBillNo").val();//单据号
                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HDate + "'";
                var HBeginDate = $("#HBeginDate").val();//开始日期
                var HEndDate = $("#HEndDate").val();//结束日期
                var HStockOrgName = $("#HStockOrgName").val(); //组织
                var HBillNo = $("#HBillNo").val(); //单据号
                var HDept = $("#HDept").val();       //部门信息
                var HMaterNumber = $("#HMaterNumber").val();   //物料代码    
                var HModelNumber = $("#HModelNumber").val();    //器具代码
                var HWhName = $("#HWhName").val();  //仓库名称
                //var HSupName = $("#HSupName").val();    //往来单位
                if (HBeginDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HBeginDate + "'";
                }
                if (HDate1) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HDate1 + "'";
                if (HEndDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HEndDate + "'";
                }
                if (HStockOrgName) {
                    sWhere += " and è°ƒå…¥ç»„织 like '%" + HStockOrgName + "%' or è°ƒå‡ºç»„织 like '%" + HStockOrgName+"%'";
                }
                if (HBillNo) {
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                }
                if (HDept) {
                    sWhere += " and éƒ¨é—¨ like '%" + HDept + "%'";
                }
                if (HMaterNumber) {
                    sWhere += " and ç‰©æ–™ä»£ç  like '%" + HMaterNumber + "%'";
                }
                if (HModelNumber) {
                    sWhere += " and æ¨¡å…·ä»£ç  like '%" + HModelNumber + "%'";
                }
                if (HWhName) {
                    sWhere += " and è°ƒå…¥ä»“库 like '%" + HWhName + "%' or è°ƒå…¥ä»“库 like '%" + HWhName +"%'";
                }
                
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
@@ -481,9 +540,15 @@

            //#region é‡ç½®è¿‡æ»¤æ¡ä»¶
            function set_ClearQuery() {
                $("#HDate").val("");//开始日期
                $("#HDate1").val("");//结束日期
                $("#HBillNo").val("");//单据号
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBillNo").val("");
                $("#HDept").val("");
                $("#HMaterNumber").val("");
                $("#HModelNumber").val("");
                $("#HWhName").val("");
                $("#HSupName").val("");
                $("#HStockOrgName").val("");
                sWhere = "";
                get_Display(sWhere);
            }

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldMoveStockStepOutBillList.html

@@ -32,11 +32,11 @@
                    <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-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>更多</span>
                                    </div>
                                </div>-->
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">单据号</label>
                                    <div class="layui-input-block">
@@ -55,18 +55,54 @@
                                        <input type="date" class="layui-input" id="HEndDate" 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" name="HStockOrgName" id="HStockOrgName" 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">
                                <div class="layui-colla-content">
                                    <div class="layui-inline">
                                        <div class="layui-inline">
                                            <span>其他条件></span>
                                        </div>
                                    </div>

                                </div>-->
                                    <div class="layui-inline">
                                        <label class="layui-form-label">部门信息</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HDept" id="HDept" 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" name="HMaterNumber" id="HMaterNumber" 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" name="HModelNumber" id="HModelNumber" 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" name="HWhName" id="HWhName" 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" name="HSupName" id="HSupName" style="width:190px;">
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -462,18 +498,43 @@

            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery(table, option) {
                var HDate = $("#HBeginDate").val();//开始日期
                var HDate1 = $("#HEndDate").val();//结束日期
                var HBillNo = $("#HBillNo").val();//单据号
                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HDate + "'";
                var HBeginDate = $("#HBeginDate").val();//开始日期
                var HEndDate = $("#HEndDate").val();//结束日期
                var HStockOrgName = $("#HStockOrgName").val(); //组织
                var HBillNo = $("#HBillNo").val(); //单据号
                var HDept = $("#HDept").val();       //部门信息
                var HMaterNumber = $("#HMaterNumber").val();   //物料代码    
                var HModelNumber = $("#HModelNumber").val();    //器具代码
                var HWhName = $("#HWhName").val();  //仓库名称
                //var HSupName = $("#HSupName").val();    //往来单位
                
                if (HBeginDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HBeginDate + "'";
                }
                if (HDate1) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HDate1 + "'";
                if (HEndDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HEndDate + "'";
                }
                if (HStockOrgName) {
                    sWhere += " and è°ƒå…¥ç»„织 like '%" + HStockOrgName + "%' or è°ƒå‡ºç»„织 like '%" + HStockOrgName+"%'";
                }
                if (HBillNo) {
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                }
                if (HDept) {
                    sWhere += " and éƒ¨é—¨ like '%" + HDept + "%'";
                }
                if (HMaterNumber) {
                    sWhere += " and ç‰©æ–™ä»£ç  like '%" + HMaterNumber + "%'";
                }
                if (HModelNumber) {
                    sWhere += " and æ¨¡å…·ä»£ç  like '%" + HModelNumber + "%'";
                }
                if (HWhName) {
                    sWhere += " and è°ƒå‡ºä»“库 like '%" + HWhName + "%' or è°ƒå…¥ä»“库 like '%" + HWhName +"%'";
                }
                //if (HSupName) {
                //    sWhere += " and å¾€æ¥å•ä½ like '%" + HSupName + "%'";
                //}
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
@@ -481,9 +542,15 @@

            //#region é‡ç½®è¿‡æ»¤æ¡ä»¶
            function set_ClearQuery() {
                $("#HDate").val("");//开始日期
                $("#HDate1").val("");//结束日期
                $("#HBillNo").val("");//单据号
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBillNo").val("");
                $("#HDept").val("");
                $("#HMaterNumber").val("");
                $("#HModelNumber").val("");
                $("#HWhName").val("");
                $("#HSupName").val("");
                $("#HStockOrgName").val("");
                sWhere = "";
                get_Display(sWhere);
            }

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldOtherOutBillList.html

@@ -31,11 +31,11 @@
                    <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-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>更多</span>
                                    </div>
                                </div>-->
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">单据号</label>
                                    <div class="layui-input-block">
@@ -54,18 +54,54 @@
                                        <input type="date" class="layui-input" id="HEndDate" 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" name="HStockOrgName" id="HStockOrgName" 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">
                                <div class="layui-colla-content">
                                    <div class="layui-inline">
                                        <div class="layui-inline">
                                            <span>其他条件></span>
                                        </div>
                                    </div>

                                </div>-->
                                    <div class="layui-inline">
                                        <label class="layui-form-label">部门信息</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HDept" id="HDept" 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" name="HMaterNumber" id="HMaterNumber" 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" name="HModelNumber" id="HModelNumber" 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" name="HWhName" id="HWhName" 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" name="HSupName" id="HSupName" style="width:190px;">
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -182,6 +218,7 @@
                        , { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
                        //, { field: '计量单位代码', title: '计量单位代码', width: 125 }
                        //, { field: '计量单位', title: '计量单位', width: 125 }
                        , { field: '库存组织', title: '库存组织', width: 125 }
                        , { field: 'HWHSonID', title: 'HWHSonID', width: 200, hide: true }
                        , { field: '发料仓库代码', title: '发料仓库代码', width: 125 }
                        , { field: '发料仓库', title: '发料仓库', width: 125 }
@@ -455,17 +492,42 @@
            }
            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery(table, option) {
                var HDate = $("#HBeginDate").val();//开始日期
                var HDate1 = $("#HEndDate").val();//结束日期
                var HBillNo = $("#HBillNo").val();//单据号
                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HDate + "'";
                var HBeginDate = $("#HBeginDate").val();//开始日期
                var HEndDate = $("#HEndDate").val();//结束日期
                var HStockOrgName = $("#HStockOrgName").val(); //组织
                var HBillNo = $("#HBillNo").val(); //单据号
                var HDept = $("#HDept").val();       //部门信息
                var HMaterNumber = $("#HMaterNumber").val();   //物料代码    
                var HModelNumber = $("#HModelNumber").val();    //器具代码
                var HWhName = $("#HWhName").val();  //仓库名称
                var HSupName = $("#HSupName").val();    //往来单位
               
                if (HBeginDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HBeginDate + "'";
                }
                if (HDate1) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HDate1 + "'";
                if (HEndDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HEndDate + "'";
                }
                if (HStockOrgName) {
                    sWhere += " and åº“存组织 like '%" + HStockOrgName + "%'";
                }
                if (HBillNo) {
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                }
                if (HDept) {
                    sWhere += " and éƒ¨é—¨ like '%" + HDept + "%'";
                }
                if (HMaterNumber) {
                    sWhere += " and ç‰©æ–™ä»£ç  like '%" + HMaterNumber + "%'";
                }
                if (HModelNumber) {
                    sWhere += " and æ¨¡å…·ä»£ç  like '%" + HModelNumber + "%'";
                }
                if (HWhName) {
                    sWhere += " and ä»“库 like '%" + HWhName + "%'";
                }
                if (HSupName) {
                    sWhere += " and å¾€æ¥å•ä½ like '%" + HSupName + "%'";
                }
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
@@ -473,9 +535,15 @@
            //#endregion
            //#region é‡ç½®è¿‡æ»¤æ¡ä»¶
            function set_ClearQuery() {
                $("#HDate").val("");//开始日期
                $("#HDate1").val("");//结束日期
                $("#HBillNo").val("");//单据号
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBillNo").val("");
                $("#HDept").val("");
                $("#HMaterNumber").val("");
                $("#HModelNumber").val("");
                $("#HWhName").val("");
                $("#HSupName").val("");
                $("#HStockOrgName").val("");
                sWhere = "";
                get_Display(sWhere);
            }

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldProdBackBillList.html

@@ -30,11 +30,11 @@
                    <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-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>更多</span>
                                    </div>
                                </div>-->
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">单据号</label>
                                    <div class="layui-input-block">
@@ -53,18 +53,55 @@
                                        <input type="date" class="layui-input" id="HEndDate" 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" name="HStockOrgName" id="HStockOrgName" 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">

                                <div class="layui-colla-content">
                                    <div class="layui-inline">
                                        <div class="layui-inline">
                                            <span>其他条件></span>
                                        </div>
                                    </div>

                                </div>-->
                                    <div class="layui-inline">
                                        <label class="layui-form-label">部门信息</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HDept" id="HDept" 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" name="HMaterNumber" id="HMaterNumber" 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" name="HModelNumber" id="HModelNumber" 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" name="HWhName" id="HWhName" 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" name="HSupName" id="HSupName" style="width:190px;">
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -179,6 +216,7 @@
                        , { field: '模具名称', title: '器具名称', width: 125 }
                        , { field: '规格型号', title: '规格型号', width: 125 }
                        , { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
                        , { field: '库存组织', title: '库存组织', width: 125 }
                        //, { field: '计量单位代码', title: '计量单位代码', width: 125 }
                        //, { field: '计量单位', title: '计量单位', width: 125 }
                        , { field: '收料仓库ID', title: '收料仓库ID', width: 200, hide: true }
@@ -459,17 +497,42 @@

            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery(table, option) {
                var HDate = $("#HBeginDate").val();//开始日期
                var HDate1 = $("#HEndDate").val();//结束日期
                var HBillNo = $("#HBillNo").val();//单据号
                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HDate + "'";
                var HBeginDate = $("#HBeginDate").val();//开始日期
                var HEndDate = $("#HEndDate").val();//结束日期
                var HStockOrgName = $("#HStockOrgName").val(); //组织
                var HBillNo = $("#HBillNo").val(); //单据号
                var HDept = $("#HDept").val();       //部门信息
                var HMaterNumber = $("#HMaterNumber").val();   //物料代码    
                var HModelNumber = $("#HModelNumber").val();    //器具代码
                var HWhName = $("#HWhName").val();  //仓库名称
                var HSupName = $("#HSupName").val();    //往来单位
                
                if (HBeginDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HBeginDate + "'";
                }
                if (HDate1) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HDate1 + "'";
                if (HEndDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HEndDate + "'";
                }
                if (HStockOrgName) {
                    sWhere += " and åº“存组织 like '%" + HStockOrgName + "%'";
                }
                if (HBillNo) {
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                }
                if (HDept) {
                    sWhere += " and éƒ¨é—¨ like '%" + HDept + "%'";
                }
                if (HMaterNumber) {
                    sWhere += " and ç‰©æ–™ä»£ç  like '%" + HMaterNumber + "%'";
                }
                if (HModelNumber) {
                    sWhere += " and æ¨¡å…·ä»£ç  like '%" + HModelNumber + "%'";
                }
                if (HWhName) {
                    sWhere += " and ä»“库 like '%" + HWhName + "%'";
                }
                if (HSupName) {
                    sWhere += " and å¾€æ¥å•ä½ like '%" + HSupName + "%'";
                }
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
@@ -477,9 +540,15 @@
            //#endregion
            //#region é‡ç½®è¿‡æ»¤æ¡ä»¶
            function set_ClearQuery() {
                $("#HDate").val("");//开始日期
                $("#HDate1").val("");//结束日期
                $("#HBillNo").val("");//单据号
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBillNo").val("");
                $("#HDept").val("");
                $("#HMaterNumber").val("");
                $("#HModelNumber").val("");
                $("#HWhName").val("");
                $("#HSupName").val("");
                $("#HStockOrgName").val("");
                sWhere = "";
                get_Display(sWhere);
            }

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldProdInBillList.html

@@ -58,6 +58,12 @@
                                        <input type="date" class="layui-input" id="HEndDate" 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" name="HStockOrgName" id="HStockOrgName" 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>
@@ -221,6 +227,7 @@
                    , { field: '使用寿命', title: '使用寿命', width: 200 }
                    , { field: '设计寿命', title: '设计寿命', width: 200 }
                    , { field: '剩余寿命', title: '剩余寿命', width: 200 }
                    , { field: '库存组织', title: '库存组织', width: 125 }
                    , { field: 'HWHID', title: 'HWHID', width: 200, hide: true }
                    , { field: '收料仓库代码', title: '仓库代码', width: 200 }
                    , { field: '收料仓库', title: '仓库名称', width: 200 }
@@ -653,6 +660,7 @@
                var HStatus = $("select[name='HStatus']").val();//状态
                var HBeginDate = $("#HBeginDate").val();//开始日期
                var HEndDate = $("#HEndDate").val();//结束日期
                var HStockOrgName = $("#HStockOrgName").val(); //组织
                var HBillNo = $("#HBillNo").val(); //单据号
                var HDept = $("#HDept").val();       //部门信息
                var HMaterNumber = $("#HMaterNumber").val();   //物料代码    
@@ -682,11 +690,14 @@
                if (HEndDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HEndDate + "'";
                }
                if (HStockOrgName) {
                    sWhere += " and åº“存组织 like '%" + HStockOrgName + "%'";
                }
                if (HBillNo) {
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                }
                if (HDept) {
                    sWhere += " and éƒ¨é—¨åç§° like '%" + HDept + "%'";
                    sWhere += " and éƒ¨é—¨ like '%" + HDept + "%'";
                }
                if (HMaterNumber) {
                    sWhere += " and ç‰©æ–™ä»£ç  like '%" + HMaterNumber + "%'";
@@ -714,6 +725,9 @@
                $("#HDept").val("");
                $("#HMaterNumber").val("");
                $("#HModelNumber").val("");
                $("#HWhName").val("");
                $("#HSupName").val("");
                $("#HStockOrgName").val("");
                sWhere = "";
                get_Display(sWhere);
            }

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldProdMoveBillList.html

@@ -31,11 +31,11 @@
                    <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-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>更多</span>
                                    </div>
                                </div>-->
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">单据号</label>
                                    <div class="layui-input-block">
@@ -54,18 +54,54 @@
                                        <input type="date" class="layui-input" id="HEndDate" 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" name="HStockOrgName" id="HStockOrgName" 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">
                                <div class="layui-colla-content">
                                    <div class="layui-inline">
                                        <div class="layui-inline">
                                            <span>其他条件></span>
                                        </div>
                                    </div>

                                </div>-->
                                    <div class="layui-inline">
                                        <label class="layui-form-label">部门信息</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HDept" id="HDept" 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" name="HMaterNumber" id="HMaterNumber" 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" name="HModelNumber" id="HModelNumber" 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" name="HWhName" id="HWhName" 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" name="HSupName" id="HSupName" style="width:190px;">
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -178,6 +214,7 @@
                        , { field: '调拨类型', title: '调拨类型', width: 100 }
                        , { field: '调入组织', title: '调入组织', width: 125 }
                        , { field: '调出组织', title: '调出组织', width: 125 }
                        , { field: '库存组织', title: '库存组织', width: 125 }
                        , { field: 'HWHID', title: 'HWHID', width: 200, hide: true }
                        , { field: '调入仓库代码', title: '调入仓库代码', width: 125 }
                        , { field: '调入仓库', title: '调入仓库', width: 125 }
@@ -457,27 +494,58 @@
            }
            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery(table, option) {
                var HDate = $("#HBeginDate").val();//开始日期
                var HDate1 = $("#HEndDate").val();//结束日期
                var HBillNo = $("#HBillNo").val();//单据号
                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HDate + "'";
                var HBeginDate = $("#HBeginDate").val();//开始日期
                var HEndDate = $("#HEndDate").val();//结束日期
                var HStockOrgName = $("#HStockOrgName").val(); //组织
                var HBillNo = $("#HBillNo").val(); //单据号
                var HDept = $("#HDept").val();       //部门信息
                var HMaterNumber = $("#HMaterNumber").val();   //物料代码    
                var HModelNumber = $("#HModelNumber").val();    //器具代码
                var HWhName = $("#HWhName").val();  //仓库名称
                //var HSupName = $("#HSupName").val();    //往来单位
                
                if (HBeginDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HBeginDate + "'";
                }
                if (HDate1) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HDate1 + "'";
                if (HEndDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HEndDate + "'";
                }
                if (HStockOrgName) {
                    sWhere += " and åº“存组织 like '%" + HStockOrgName + "%'";
                }
                if (HBillNo) {
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                }
                if (HDept) {
                    sWhere += " and éƒ¨é—¨ like '%" + HDept + "%'";
                }
                if (HMaterNumber) {
                    sWhere += " and ç‰©æ–™ä»£ç  like '%" + HMaterNumber + "%'";
                }
                if (HModelNumber) {
                    sWhere += " and æ¨¡å…·ä»£ç  like '%" + HModelNumber + "%'";
                }
                if (HWhName) {
                    sWhere += " and å™¨å…·ä»“库 like '%" + HWhName + "%'";
                }
                //if (HSupName) {
                //    sWhere += " and å¾€æ¥å•ä½ like '%" + HSupName + "%'";
                //}
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
            //#endregion
            //#region é‡ç½®è¿‡æ»¤æ¡ä»¶
            function set_ClearQuery() {
                $("#HDate").val("");//开始日期
                $("#HDate1").val("");//结束日期
                $("#HBillNo").val("");//单据号
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBillNo").val("");
                $("#HDept").val("");
                $("#HMaterNumber").val("");
                $("#HModelNumber").val("");
                $("#HWhName").val("");
                $("#HSupName").val("");
                $("#HStockOrgName").val("");
                sWhere = "";
                get_Display(sWhere);
            }

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldProdOutBillList.html

@@ -31,11 +31,11 @@
                    <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-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>更多</span>
                                    </div>
                                </div>-->
                                 </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">单据号</label>
                                    <div class="layui-input-block">
@@ -54,18 +54,53 @@
                                        <input type="date" class="layui-input" id="HEndDate" 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" name="HStockOrgName" id="HStockOrgName" 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">
                                <div class="layui-colla-content">
                                    <div class="layui-inline">
                                        <div class="layui-inline">
                                            <span>其他条件></span>
                                        </div>
                                    </div>

                                </div>-->
                                    <div class="layui-inline">
                                        <label class="layui-form-label">部门信息</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HDept" id="HDept" 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" name="HMaterNumber" id="HMaterNumber" 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" name="HModelNumber" id="HModelNumber" 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" name="HWhName" id="HWhName" 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" name="HSupName" id="HSupName" style="width:190px;">
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -180,6 +215,7 @@
                        , { field: '模具名称', title: '器具名称', width: 125 }
                        , { field: '规格型号', title: '规格型号', width: 125 }
                        , { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
                        , { field: '库存组织', title: '库存组织', width: 125 }
                        //, { field: '计量单位代码', title: '计量单位代码', width: 125 }
                        //, { field: '计量单位', title: '计量单位', width: 125 }
                        , { field: 'HWHSonID', title: 'HWHSonID', width: 200, hide: true }
@@ -458,17 +494,42 @@

            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery(table, option) {
                var HDate = $("#HBeginDate").val();//开始日期
                var HDate1 = $("#HEndDate").val();//结束日期
                var HBillNo = $("#HBillNo").val();//单据号
                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HDate + "'";
                var HBeginDate = $("#HBeginDate").val();//开始日期
                var HEndDate = $("#HEndDate").val();//结束日期
                var HStockOrgName = $("#HStockOrgName").val(); //组织
                var HBillNo = $("#HBillNo").val(); //单据号
                var HDept = $("#HDept").val();       //部门信息
                var HMaterNumber = $("#HMaterNumber").val();   //物料代码    
                var HModelNumber = $("#HModelNumber").val();    //器具代码
                var HWhName = $("#HWhName").val();  //仓库名称
                var HSupName = $("#HSupName").val();    //往来单位
                
                if (HBeginDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HBeginDate + "'";
                }
                if (HDate1) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HDate1 + "'";
                if (HEndDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HEndDate + "'";
                }
                if (HStockOrgName) {
                    sWhere += " and åº“存组织 like '%" + HStockOrgName + "%'";
                }
                if (HBillNo) {
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                }
                if (HDept) {
                    sWhere += " and éƒ¨é—¨ like '%" + HDept + "%'";
                }
                if (HMaterNumber) {
                    sWhere += " and ç‰©æ–™ä»£ç  like '%" + HMaterNumber + "%'";
                }
                if (HModelNumber) {
                    sWhere += " and æ¨¡å…·ä»£ç  like '%" + HModelNumber + "%'";
                }
                if (HWhName) {
                    sWhere += " and ä»“库 like '%" + HWhName + "%'";
                }
                if (HSupName) {
                    sWhere += " and å¾€æ¥å•ä½ like '%" + HSupName + "%'";
                }
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
@@ -476,9 +537,15 @@
            //#endregion
            //#region é‡ç½®è¿‡æ»¤æ¡ä»¶
            function set_ClearQuery() {
                $("#HDate").val("");//开始日期
                $("#HDate1").val("");//结束日期
                $("#HBillNo").val("");//单据号
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBillNo").val("");
                $("#HDept").val("");
                $("#HMaterNumber").val("");
                $("#HModelNumber").val("");
                $("#HWhName").val("");
                $("#HSupName").val("");
                $("#HStockOrgName").val("");
                sWhere = "";
                get_Display(sWhere);
            }

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldRepairInBillList.html

@@ -31,11 +31,11 @@
                    <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-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>更多</span>
                                    </div>
                                </div>-->
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">单据号</label>
                                    <div class="layui-input-block">
@@ -54,18 +54,53 @@
                                        <input type="date" class="layui-input" id="HEndDate" 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" name="HStockOrgName" id="HStockOrgName" 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">
                                <div class="layui-colla-content">
                                    <div class="layui-inline">
                                        <div class="layui-inline">
                                            <span>其他条件></span>
                                        </div>
                                    </div>

                                </div>-->
                                    <div class="layui-inline">
                                        <label class="layui-form-label">部门信息</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HDept" id="HDept" 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" name="HMaterNumber" id="HMaterNumber" 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" name="HModelNumber" id="HModelNumber" 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" name="HWhName" id="HWhName" 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" name="HSupName" id="HSupName" style="width:190px;">
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -202,6 +237,7 @@
                        , { field: 'HKeeperID', title: 'HKeeperID', width: 200, hide: true }
                        , { field: '发料人代码', title: '发料人代码', width: 180, hide: true}
                        , { field: '发料人', title: '发料人', width: 125, hide: true }
                        , { field: '库存组织', title: '库存组织', width: 125 }
                        , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
                        , { field: '部门代码', title: '部门代码', width: 115 }
                        , { field: '部门', title: '部门', width: 125 }
@@ -216,9 +252,6 @@
                        , { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
                        , { field: '计量单位代码', title: '计量单位代码', width: 125, hide: true }
                        , { field: '计量单位', title: '计量单位', width: 125, hide: true }
                        , { field: 'HWHID', title: 'HWHID', width: 200, hide: true }
                        , { field: '仓库代码', title: '仓库代码', width: 125 }
                        , { field: '仓库', title: '仓库', width: 125 }
                        , { field: 'HSPID', title: 'HSPID', width: 200, hide: true }
                        , { field: '仓位代码', title: '仓位代码', width: 125, hide: true }
                        , { field: '仓位', title: '仓位', width: 125, hide: true }
@@ -275,26 +308,56 @@
            }
            //快速过滤
            function get_FastQuery(table, option) {
                var HDate = $("#HBeginDate").val();//开始日期
                var HDate1 = $("#HEndDate").val();//结束日期
                var HBillNo = $("#HBillNo").val();//单据号
                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HDate + "'";
                var HBeginDate = $("#HBeginDate").val();//开始日期
                var HEndDate = $("#HEndDate").val();//结束日期
                var HStockOrgName = $("#HStockOrgName").val(); //组织
                var HBillNo = $("#HBillNo").val(); //单据号
                var HDept = $("#HDept").val();       //部门信息
                var HMaterNumber = $("#HMaterNumber").val();   //物料代码    
                var HModelNumber = $("#HModelNumber").val();    //器具代码
                var HWhName = $("#HWhName").val();  //仓库名称
                //var HSupName = $("#HSupName").val();    //往来单位
                if (HBeginDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HBeginDate + "'";
                }
                if (HDate1) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HDate1 + "'";
                if (HEndDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HEndDate + "'";
                }
                if (HStockOrgName) {
                    sWhere += " and åº“存组织 like '%" + HStockOrgName + "%'";
                }
                if (HBillNo) {
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                }
                if (HDept) {
                    sWhere += " and éƒ¨é—¨ like '%" + HDept + "%'";
                }
                if (HMaterNumber) {
                    sWhere += " and ç‰©æ–™ä»£ç  like '%" + HMaterNumber + "%'";
                }
                if (HModelNumber) {
                    sWhere += " and æ¨¡å…·ä»£ç  like '%" + HModelNumber + "%'";
                }
                if (HWhName) {
                    sWhere += " and ä»“库 like '%" + HWhName + "%'";
                }
                //if (HSupName) {
                //    sWhere += " and å¾€æ¥å•ä½ like '%" + HSupName + "%'";
                //}
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
            //重置过滤条件
            function set_ClearQuery() {
                $("#HDate").val("");//开始日期
                $("#HDate1").val("");//结束日期
                $("#HBillNo").val("");//单据号
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBillNo").val("");
                $("#HDept").val("");
                $("#HMaterNumber").val("");
                $("#HModelNumber").val("");
                $("#HWhName").val("");
                $("#HSupName").val("");
                $("#HStockOrgName").val("");
                sWhere = "";
                get_Display(sWhere);
            }

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldRepairOutBillList.html

@@ -31,11 +31,11 @@
                    <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 class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>更多</span>
                                    </div>
                                </div>
                            </div>-->
                                <div class="layui-inline">
                                    <label class="layui-form-label">单据号</label>
                                    <div class="layui-input-block">
@@ -54,18 +54,55 @@
                                        <input type="date" class="layui-input" id="HEndDate" 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" name="HStockOrgName" id="HStockOrgName" 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">
                                <div class="layui-inline">

                                <div class="layui-colla-content">
                                    <div class="layui-inline">
                                        <span>其他条件></span>
                                        <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="text" class="layui-input" name="HDept" id="HDept" 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" name="HMaterNumber" id="HMaterNumber" 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" name="HModelNumber" id="HModelNumber" 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" name="HWhName" id="HWhName" 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" name="HSupName" id="HSupName" style="width:190px;">
                                        </div>
                                    </div>
                                </div>

                            </div>-->
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -202,6 +239,7 @@
                        , { field: 'HKeeperID', title: 'HKeeperID', width: 200, hide: true }
                        , { field: '发料人代码', title: '发料人代码', width: 180, hide: true }
                        , { field: '发料人', title: '发料人', width: 125, hide: true }
                        , { field: '库存组织', title: '库存组织', width: 125 }
                        , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
                        , { field: '部门代码', title: '部门代码', width: 115 }
                        , { field: '部门', title: '部门', width: 125 }
@@ -275,26 +313,57 @@
            }
            //快速过滤
            function get_FastQuery(table, option) {
                var HDate = $("#HBeginDate").val();//开始日期
                var HDate1 = $("#HEndDate").val();//结束日期
                var HBillNo = $("#HBillNo").val();//单据号
                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HDate + "'";
                var HBeginDate = $("#HBeginDate").val();//开始日期
                var HEndDate = $("#HEndDate").val();//结束日期
                var HStockOrgName = $("#HStockOrgName").val(); //组织
                var HBillNo = $("#HBillNo").val(); //单据号
                var HDept = $("#HDept").val();       //部门信息
                var HMaterNumber = $("#HMaterNumber").val();   //物料代码    
                var HModelNumber = $("#HModelNumber").val();    //器具代码
                var HWhName = $("#HWhName").val();  //仓库名称
                //var HSupName = $("#HSupName").val();    //往来单位
                
                if (HBeginDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HBeginDate + "'";
                }
                if (HDate1) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HDate1 + "'";
                if (HEndDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HEndDate + "'";
                }
                if (HStockOrgName) {
                    sWhere += " and åº“存组织 like '%" + HStockOrgName + "%'";
                }
                if (HBillNo) {
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                }
                if (HDept) {
                    sWhere += " and éƒ¨é—¨ like '%" + HDept + "%'";
                }
                if (HMaterNumber) {
                    sWhere += " and ç‰©æ–™ä»£ç  like '%" + HMaterNumber + "%'";
                }
                if (HModelNumber) {
                    sWhere += " and æ¨¡å…·ä»£ç  like '%" + HModelNumber + "%'";
                }
                if (HWhName) {
                    sWhere += " and ä»“库 like '%" + HWhName + "%'";
                }
                //if (HSupName) {
                //    sWhere += " and å¾€æ¥å•ä½ like '%" + HSupName + "%'";
                //}
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
            //重置过滤条件
            function set_ClearQuery() {
                $("#HDate").val("");//开始日期
                $("#HDate1").val("");//结束日期
                $("#HBillNo").val("");//单据号
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBillNo").val("");
                $("#HDept").val("");
                $("#HMaterNumber").val("");
                $("#HModelNumber").val("");
                $("#HWhName").val("");
                $("#HSupName").val("");
                $("#HStockOrgName").val("");
                sWhere = "";
                get_Display(sWhere);
            }

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldScrapInBillList.html

@@ -39,14 +39,9 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">状态</label>
                                    <label class="layui-form-label">单据号</label>
                                    <div class="layui-input-block">
                                        <select name="HStatus" lay-filter="HStatus" style="width:190px;">
                                            <option value="-1" selected="selected">全部</option>
                                            <option value="0">未审核</option>
                                            <option value="1">已审核</option>
                                            <option value="2">已关闭</option>
                                        </select>
                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
@@ -61,6 +56,12 @@
                                        <input type="date" class="layui-input" id="HEndDate" 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" name="HStockOrgName" id="HStockOrgName" 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>
@@ -73,34 +74,52 @@
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">单据号</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" 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" name="HDept" id="HDept" 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" name="HMaterNumber" id="HMaterNumber" 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" name="HModelNumber" id="HModelNumber" 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" name="HWhName" id="HWhName" 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" name="HSupName" id="HSupName" style="width:190px;">
                                        </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="btn-Add"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>预览</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                            </div>
                        </script>
                            <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="btn-Add"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>预览</button>
                                    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>打印</button>
                                    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>审核</button>
                                    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>反审核</button>
                                    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                    <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                    <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                </div>
                            </script>
                         </div>
                    </form>
                </div>
            </div>
@@ -207,6 +226,7 @@
                    , { field: 'HKeeperID', title: 'HKeeperID', width: 200, hide: true }
                    , { field: '保管员代码', title: '保管员代码', width: 200 }
                    , { field: '保管员名称', title: '保管员名称', width: 200 }
                    , { field: '库存组织', title: '库存组织', width: 125 }
                    , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
                    , { field: '部门代码', title: '部门代码', width: 200 }
                    , { field: '部门名称', title: '部门名称', width: 200 }
@@ -514,40 +534,43 @@
            }

                function get_FastQuery(table, option) {
                var HStatus = $("select[name='HStatus']").val();//状态
                var HBeginDate = $("#HBeginDate").val();//开始日期
                var HEndDate = $("#HEndDate").val();//结束日期
                var HBillNo = $("#HBillNo").val(); //单据号
                var HDept = $("#HDept").val();       //部门信息
                if (HStatus) {
                    switch (HStatus) {
                        case '-1':   //全部
                            sWhere += "";
                            break;
                        case '0':    //未审核
                            sWhere += " and å®¡æ ¸äºº=''";
                            break;
                        case '1':    //已审核
                            sWhere += " and å®¡æ ¸äºº<>''";
                            break;
                        case '2':    //已关闭
                            sWhere += " and å…³é—­äºº<>''";
                        default:

                    var HBeginDate = $("#HBeginDate").val();//开始日期
                    var HEndDate = $("#HEndDate").val();//结束日期
                    var HStockOrgName = $("#HStockOrgName").val(); //组织
                    var HBillNo = $("#HBillNo").val(); //单据号
                    var HDept = $("#HDept").val();       //部门信息
                    var HMaterNumber = $("#HMaterNumber").val();   //物料代码    
                    var HModelNumber = $("#HModelNumber").val();    //器具代码
                    var HWhName = $("#HWhName").val();  //仓库名称
                    var HSupName = $("#HSupName").val();    //往来单位
                    
                    if (HBeginDate) {
                        sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HBeginDate + "'";
                    }
                }
                if (HBeginDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HBeginDate + "'";
                }
                if (HEndDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HEndDate + "'";
                }
                if (HBillNo) {
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                }
                if (HDept) {
                    sWhere += " and éƒ¨é—¨åç§° like '%" + HDept + "%'";
                }
                    if (HEndDate) {
                        sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HEndDate + "'";
                    }
                    if (HStockOrgName) {
                        sWhere += " and åº“存组织 like '%" + HStockOrgName + "%'";
                    }
                    if (HBillNo) {
                        sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                    }
                    if (HDept) {
                        sWhere += " and éƒ¨é—¨åç§° like '%" + HDept + "%'";
                    }
                    if (HMaterNumber) {
                        sWhere += " and ç‰©æ–™ä»£ç  like '%" + HMaterNumber + "%'";
                    }
                    if (HModelNumber) {
                        sWhere += " and æ¨¡å…·ä»£ç  like '%" + HModelNumber + "%'";
                    }
                    if (HWhName) {
                        sWhere += " and ä»“库名称 like '%" + HWhName + "%'";
                    }
                    if (HSupName) {
                        sWhere += " and å¾€æ¥å•ä½ like '%" + HSupName + "%'";
                    }
                var index = layer.load(0);
                get_Display(sWhere);
                //调用接口后清空sWhere缓存
@@ -555,11 +578,15 @@
            }
                //重置过滤条件
                function set_ClearQuery() {
                $('#HStatus').find("option[value='-1']").attr("selected", true);
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBillNo").val("");
                $("#HDept").val("");
                    $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                    $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                    $("#HBillNo").val("");
                    $("#HDept").val("");
                    $("#HMaterNumber").val("");
                    $("#HModelNumber").val("");
                    $("#HWhName").val("");
                    $("#HSupName").val("");
                    $("#HStockOrgName").val("");
                sWhere = "";
                get_Display(sWhere);
            }

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldScrapOutBillList.html

@@ -38,13 +38,13 @@
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HDate">
                                        <input type="date" class="layui-input" id="HBeginDate">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">结束日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HDate1">
                                        <input type="date" class="layui-input" id="HEndDate">
                                    </div>
                                </div>
                                <div class="layui-inline">
@@ -53,16 +53,12 @@
                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
                                    </div>
                                </div>
                                <!--<div class="layui-inline">
                                    <label class="layui-form-label">单据类型</label>
                                <div class="layui-inline">
                                    <label class="layui-form-label">组织名称</label>
                                    <div class="layui-input-block">
                                        <select name="HBillType" id="HBillType">
                                            <option value="">所有</option>
                                            <option value="ZHXJ">下架找货单</option>
                                            <option value="ZHSJ">上架归还单</option>
                                        </select>
                                        <input type="text" class="layui-input" name="HStockOrgName" id="HStockOrgName" style="width:190px;">
                                    </div>
                                </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>
@@ -72,6 +68,36 @@
                                    <div class="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="text" class="layui-input" name="HDept" id="HDept" 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" name="HMaterNumber" id="HMaterNumber" 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" name="HModelNumber" id="HModelNumber" 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" name="HWhName" id="HWhName" 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" name="HSupName" id="HSupName" style="width:190px;">
                                        </div>
                                    </div>
                                </div>
@@ -180,9 +206,15 @@

            //重置按钮
            form.on('submit(btnReSearch)', function (data) {
                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBillNo").val("");//单据号
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBillNo").val("");
                $("#HDept").val("");
                $("#HMaterNumber").val("");
                $("#HModelNumber").val("");
                $("#HWhName").val("");
                $("#HSupName").val("");
                $("#HStockOrgName").val("");
                sWhere = "";
                get_Display(sWhere);
            });
@@ -232,6 +264,7 @@
                        , { field: 'HKeeperID', title: 'HKeeperID', width: 200, hide: true }
                        , { field: '发货员代码', title: '发货员代码', width: 200 }
                        , { field: '发货员名称', title: '发货员名称', width: 200 }
                        , { field: '库存组织', title: '库存组织', width: 125 }
                        , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
                        , { field: '部门代码', title: '部门代码', width: 115 }
                        , { field: '部门名称', title: '部门名称', width: 200 }
@@ -310,19 +343,43 @@

            // å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery() {
                var HDate = $("#HDate").val();//开始日期
                var HDate1 = $("#HDate1").val();//结束日期
                var HBillNo = $("#HBillNo").val();//单据号
                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HDate + "'";
                var HBeginDate = $("#HBeginDate").val();//开始日期
                var HEndDate = $("#HEndDate").val();//结束日期
                var HStockOrgName = $("#HStockOrgName").val(); //组织
                var HBillNo = $("#HBillNo").val(); //单据号
                var HDept = $("#HDept").val();       //部门信息
                var HMaterNumber = $("#HMaterNumber").val();   //物料代码    
                var HModelNumber = $("#HModelNumber").val();    //器具代码
                var HWhName = $("#HWhName").val();  //仓库名称
                var HSupName = $("#HSupName").val();    //往来单位
                
                if (HBeginDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HBeginDate + "'";
                }
                if (HDate1) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HDate1 + "'";
                if (HEndDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HEndDate + "'";
                }
                if (HStockOrgName) {
                    sWhere += " and åº“存组织 like '%" + HStockOrgName + "%'";
                }
                if (HBillNo) {
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                }

                if (HDept) {
                    sWhere += " and éƒ¨é—¨åç§° like '%" + HDept + "%'";
                }
                if (HMaterNumber) {
                    sWhere += " and ç‰©æ–™ä»£ç  like '%" + HMaterNumber + "%'";
                }
                if (HModelNumber) {
                    sWhere += " and æ¨¡å…·ä»£ç  like '%" + HModelNumber + "%'";
                }
                if (HWhName) {
                    sWhere += " and ä»“库名称 like '%" + HWhName + "%'";
                }
                if (HSupName) {
                    sWhere += " and å¾€æ¥å•ä½ like '%" + HSupName + "%'";
                }
                get_Display(sWhere);
                //调用接口后清空sWhere缓存
                sWhere = "";

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

@@ -31,11 +31,11 @@
                    <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-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>更多</span>
                                    </div>
                                </div>-->
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">单据号</label>
                                    <div class="layui-input-block">
@@ -54,18 +54,54 @@
                                        <input type="date" class="layui-input" id="HEndDate" 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" name="HStockOrgName" id="HStockOrgName" 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">
                                <div class="layui-colla-content">
                                    <div class="layui-inline">
                                        <div class="layui-inline">
                                            <span>其他条件></span>
                                        </div>
                                    </div>

                                </div>-->
                                    <div class="layui-inline">
                                        <label class="layui-form-label">部门信息</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HDept" id="HDept" 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" name="HMaterNumber" id="HMaterNumber" 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" name="HModelNumber" id="HModelNumber" 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" name="HWhName" id="HWhName" 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" name="HSupName" id="HSupName" style="width:190px;">
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -180,6 +216,7 @@
                        , { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
                        //, { field: '计量单位代码', title: '计量单位代码', width: 125 }
                        //, { field: '计量单位', title: '计量单位', width: 125 }
                        , { field: '库存组织', title: '库存组织', width: 125 }
                        , { field: '收料仓库ID', title: '收料仓库ID', width: 200, hide: true }
                        , { field: '收料仓库代码', title: '收料仓库代码', width: 125 }
                        , { field: '收料仓库', title: '收料仓库', width: 125 }
@@ -402,17 +439,42 @@

            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery(table, option) {
                var HDate = $("#HBeginDate").val();//开始日期
                var HDate1 = $("#HEndDate").val();//结束日期
                var HBillNo = $("#HBillNo").val();//单据号
                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HDate + "'";
                var HBeginDate = $("#HBeginDate").val();//开始日期
                var HEndDate = $("#HEndDate").val();//结束日期
                var HStockOrgName = $("#HStockOrgName").val(); //组织
                var HBillNo = $("#HBillNo").val(); //单据号
                var HDept = $("#HDept").val();       //部门信息
                var HMaterNumber = $("#HMaterNumber").val();   //物料代码    
                var HModelNumber = $("#HModelNumber").val();    //器具代码
                var HWhName = $("#HWhName").val();  //仓库名称
                var HSupName = $("#HSupName").val();    //往来单位
               
                if (HBeginDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HBeginDate + "'";
                }
                if (HDate1) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HDate1 + "'";
                if (HEndDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HEndDate + "'";
                }
                if (HStockOrgName) {
                    sWhere += " and åº“存组织 like '%" + HStockOrgName + "%'";
                }
                if (HBillNo) {
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                }
                if (HDept) {
                    sWhere += " and éƒ¨é—¨ like '%" + HDept + "%'";
                }
                if (HMaterNumber) {
                    sWhere += " and ç‰©æ–™ä»£ç  like '%" + HMaterNumber + "%'";
                }
                if (HModelNumber) {
                    sWhere += " and æ¨¡å…·ä»£ç  like '%" + HModelNumber + "%'";
                }
                if (HWhName) {
                    sWhere += " and ä»“库 like '%" + HWhName + "%'";
                }
                if (HSupName) {
                    sWhere += " and å¾€æ¥å•ä½ like '%" + HSupName + "%'";
                }
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
@@ -420,9 +482,15 @@
            //#endregion
            //#region é‡ç½®è¿‡æ»¤æ¡ä»¶
            function set_ClearQuery() {
                $("#HDate").val("");//开始日期
                $("#HDate1").val("");//结束日期
                $("#HBillNo").val("");//单据号
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBillNo").val("");
                $("#HDept").val("");
                $("#HMaterNumber").val("");
                $("#HModelNumber").val("");
                $("#HWhName").val("");
                $("#HSupName").val("");
                $("#HStockOrgName").val("");
                sWhere = "";
                get_Display(sWhere);
            }