From b742f00aac8e1e1bb628232383c35e67f4a41e4e Mon Sep 17 00:00:00 2001
From: cwjbxqmz <1134865194@qq.com>
Date: 星期五, 26 一月 2024 15:21:28 +0800
Subject: [PATCH] 1

---
 WebTM/views/模治具管理/模治具管理/Sc_MouldOtherInBillList.html |  234 ++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 154 insertions(+), 80 deletions(-)

diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBillList.html"
index 1e687c3..5c6365a 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBillList.html"
@@ -1,4 +1,4 @@
-锘縡<!DOCTYPE html>
+锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -16,6 +16,7 @@
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/soulTable.slim.js"></script>
 
     <style type="text/css">
         input.layui-input.layui-unselect {
@@ -31,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">
@@ -54,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">鐗╂枡浠g爜</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">鍣ㄥ叿浠g爜</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>
@@ -85,6 +122,7 @@
             </div>
         </div>
     </div>
+    
     <!--<script src="../../../layuiadmin/layui/layui.js"></script>
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
@@ -94,7 +132,7 @@
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
-        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -104,6 +142,7 @@
                 , laypage = layui.laypage
                 , laydate = layui.laydate
                 , util = layui.util
+                , soulTable = layui.soulTable
             //鏌ヨ鏉′欢
             var sWhere = "";
             var option = [];
@@ -147,71 +186,75 @@
                     , cellMinWidth: 90
                     , limits: [50, 500, 5000, 20000]
                     , limit: 50
+                    , done: function (res, curr, count) {
+                        soulTable.render(this);
+                    }
                     , cols: [[
                         { type: 'checkbox', fixed: 'left' }
-                        , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
-                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 125, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
-                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 195 }
-                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 110 }
-                        , { field: 'HSupTypeID', title: 'HSupTypeID', width: 200, hide: true }
-                        , { field: '寰�鏉ョ被鍨嬪悕绉�', title: '寰�鏉ョ被鍨�', width: 200 }
-                        , { field: 'HSupID', title: 'HSupID', width: 200, hide: true }
-                        , { field: '寰�鏉ュ崟浣�', title: '寰�鏉ュ崟浣�', width: 200 }
-                        , { field: 'HWHID', title: 'HWHID', width: 200, hide: true }
-                        , { field: '浠撳簱浠g爜', title: '浠撳簱浠g爜', width: 125 }
-                        , { field: '浠撳簱', title: '浠撳簱', width: 125 }
-                        , { field: 'HSecManagerID', title: 'HSecManagerID', width: 200, hide: true }
-                        , { field: '棰嗘枡浜轰唬鐮�', title: '棰嗘枡浜轰唬鐮�', width: 180 }
-                        , { field: '棰嗘枡浜�', title: '棰嗘枡浜�', width: 125 }
-                        , { field: 'HKeeperID', title: 'HKeeperID', width: 200, hide: true }
-                        , { field: '鍙戞枡浜轰唬鐮�', title: '鍙戞枡浜轰唬鐮�', width: 180 }
-                        , { field: '鍙戞枡浜�', title: '鍙戞枡浜�', width: 125 }
-                        , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
-                        , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 115 }
-                        , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 125 }
-                        , { field: '鎽樿', title: '鎽樿', width: 125 }
-                        , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 125 }
-                        , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 115 }
-                        , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
-                        , { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
-                        , { field: '妯″叿浠g爜', title: '鍣ㄥ叿浠g爜', width: 125 }
-                        , { field: '妯″叿鍚嶇О', title: '鍣ㄥ叿鍚嶇О', width: 125 }
-                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 125 }
-                        , { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
-                        //, { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 125 }
-                        //, { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 125 }
-                        , { field: '鏀舵枡浠撳簱ID', title: '鏀舵枡浠撳簱ID', width: 200, hide: true }
-                        , { field: '鏀舵枡浠撳簱浠g爜', title: '鏀舵枡浠撳簱浠g爜', width: 125 }
-                        , { field: '鏀舵枡浠撳簱', title: '鏀舵枡浠撳簱', width: 125 }
-                        , { field: 'HSPID', title: 'HSPID', width: 200, hide: true }
-                        , { field: '浠撲綅浠g爜', title: '浠撲綅浠g爜', width: 125 }
-                        , { field: '浠撲綅', title: '浠撲綅', width: 125 }
-                        , { field: '搴斿彂鏁伴噺', title: '搴斿彂鏁伴噺', width: 125 }
-                        , { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', width: 125 }
-                        , { field: '鍗曚环', title: '鍗曚环', width: 125 }
-                        , { field: '閲戦', title: '閲戦', width: 125 }
-                        , { field: '璁捐瀵垮懡', title: '璁捐瀵垮懡', width: 125 }
-                        , { field: '绱Н浣跨敤瀵垮懡', title: '绱Н浣跨敤瀵垮懡', width: 125 }
-                        , { field: '鍓╀綑瀵垮懡', title: '鍓╀綑瀵垮懡', width: 125 }
-                        , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 125 }
-                        , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 125 }
-                        , { field: '绾㈣摑鍗曟爣璁�', title: '绾㈣摑鍗曟爣璁�', width: 125 }
-                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 125 }
-                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 125 }
-                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                        , { field: '淇敼浜�', title: '淇敼浜�', width: 125 }
-                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 125 }
-                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                        , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 125 }
-                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                        , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 125 }
-                        , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 125 }
-                        , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
-                        , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
-                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 125 }
-                        , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 125 }
+                        , { field: 'hmainid', title: '鍗曟嵁ID', hide: true, sort: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 125, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 195, sort: true }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 110, sort: true }
+                        , { field: 'HSupTypeID', title: 'HSupTypeID', width: 200, hide: true, sort: true }
+                        , { field: '寰�鏉ョ被鍨嬪悕绉�', title: '寰�鏉ョ被鍨�', width: 200, sort: true }
+                        , { field: 'HSupID', title: 'HSupID', width: 200, hide: true, sort: true }
+                        , { field: '寰�鏉ュ崟浣�', title: '寰�鏉ュ崟浣�', width: 200, sort: true }
+                        , { field: 'HWHID', title: 'HWHID', width: 200, hide: true, sort: true }
+                        , { field: '浠撳簱浠g爜', title: '浠撳簱浠g爜', width: 125, sort: true }
+                        , { field: '浠撳簱', title: '浠撳簱', width: 125, sort: true }
+                        , { field: 'HSecManagerID', title: 'HSecManagerID', width: 200, hide: true, sort: true }
+                        , { field: '棰嗘枡浜轰唬鐮�', title: '棰嗘枡浜轰唬鐮�', width: 180, sort: true }
+                        , { field: '棰嗘枡浜�', title: '棰嗘枡浜�', width: 125, sort: true }
+                        , { field: 'HKeeperID', title: 'HKeeperID', width: 200, hide: true, sort: true }
+                        , { field: '鍙戞枡浜轰唬鐮�', title: '鍙戞枡浜轰唬鐮�', width: 180, sort: true }
+                        , { field: '鍙戞枡浜�', title: '鍙戞枡浜�', width: 125, sort: true }
+                        , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true, sort: true }
+                        , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 115, sort: true }
+                        , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 125, sort: true }
+                        , { field: '鎽樿', title: '鎽樿', width: 125, sort: true }
+                        , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 125, sort: true }
+                        , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 115, sort: true }
+                        , { field: 'hsubid', title: 'hsubid', width: 200, hide: true, sort: true }
+                        , { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true, sort: true }
+                        , { field: '妯″叿浠g爜', title: '鍣ㄥ叿浠g爜', width: 125, sort: true }
+                        , { field: '妯″叿鍚嶇О', title: '鍣ㄥ叿鍚嶇О', width: 125, sort: true }
+                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 125, sort: true }
+                        , { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true, sort: true }
+                        //, { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 125 , sort: true}
+                        //, { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 125 , sort: true}
+                        , { field: '搴撳瓨缁勭粐', title: '搴撳瓨缁勭粐', width: 125, sort: true }
+                        , { field: '鏀舵枡浠撳簱ID', title: '鏀舵枡浠撳簱ID', width: 200, hide: true, sort: true }
+                        , { field: '鏀舵枡浠撳簱浠g爜', title: '鏀舵枡浠撳簱浠g爜', width: 125, sort: true }
+                        , { field: '鏀舵枡浠撳簱', title: '鏀舵枡浠撳簱', width: 125, sort: true }
+                        , { field: 'HSPID', title: 'HSPID', width: 200, hide: true, sort: true }
+                        , { field: '浠撲綅浠g爜', title: '浠撲綅浠g爜', width: 125, sort: true }
+                        , { field: '浠撲綅', title: '浠撲綅', width: 125, sort: true }
+                        , { field: '搴斿彂鏁伴噺', title: '搴斿彂鏁伴噺', width: 125, sort: true }
+                        , { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', width: 125, sort: true }
+                        , { field: '鍗曚环', title: '鍗曚环', width: 125, sort: true }
+                        , { field: '閲戦', title: '閲戦', width: 125, sort: true }
+                        , { field: '璁捐瀵垮懡', title: '璁捐瀵垮懡', width: 125, sort: true }
+                        , { field: '绱Н浣跨敤瀵垮懡', title: '绱Н浣跨敤瀵垮懡', width: 125, sort: true }
+                        , { field: '鍓╀綑瀵垮懡', title: '鍓╀綑瀵垮懡', width: 125, sort: true }
+                        , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 125, sort: true }
+                        , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 125, sort: true }
+                        , { field: '绾㈣摑鍗曟爣璁�', title: '绾㈣摑鍗曟爣璁�', width: 125, sort: true }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 125, sort: true }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 125, sort: true }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+                        , { field: '淇敼浜�', title: '淇敼浜�', width: 125, sort: true }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 125, sort: true }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+                        , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 125, sort: true }
+                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+                        , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 125, sort: true }
+                        , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 125, sort: true }
+                        , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true, sort: true }
+                        , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true, sort: true }
+                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 125, sort: true }
+                        , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 125, sort: true }
                     ]]
                 };
             }
@@ -402,17 +445,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();   //鐗╂枡浠g爜
+                var HModelNumber = $("#HModelNumber").val();    //鍣ㄥ叿浠g爜
+                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 鐗╂枡浠g爜 like '%" + HMaterNumber + "%'";
+                }
+                if (HModelNumber) {
+                    sWhere += " and 妯″叿浠g爜 like '%" + HModelNumber + "%'";
+                }
+                if (HWhName) {
+                    sWhere += " and 浠撳簱 like '%" + HWhName + "%'";
+                }
+                if (HSupName) {
+                    sWhere += " and 寰�鏉ュ崟浣� like '%" + HSupName + "%'";
                 }
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -420,9 +488,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);
             }

--
Gitblit v1.9.1