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_MouldProdInBillList.html |  201 ++++++++++++++++++++++++++++++++-----------------
 1 files changed, 130 insertions(+), 71 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillList.html"
index a2e1f6e..aafdd53 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillList.html"
@@ -15,6 +15,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>
 </head>
 <body>
     <div class="layui-fluid">
@@ -27,6 +28,12 @@
                                 <div class="layui-colla-title 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="HBillNo" id="HBillNo" style="width:190px;">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
@@ -52,7 +59,13 @@
                                         <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>
@@ -64,15 +77,33 @@
                                         </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">鐗╂枡浠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>
@@ -102,7 +133,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 () {
             //#region 鍏叡鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
@@ -113,6 +144,7 @@
                 , laypage = layui.laypage
                 , laydate = layui.laydate
                 , util = layui.util
+                , soulTable = layui.soulTable
             //鏌ヨ鏉′欢
             var sWhere = "";
             var option = [];
@@ -180,65 +212,66 @@
                 $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                 var columns = [
                     { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
-                    , { field: 'hmainid', title: '鍗曟嵁ID', width: 200, hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 125, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200, sort: true }
-                    , { field: 'HBillType', title: '鍗曟嵁绫诲瀷', width: 200, hide: true }
-                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 110 }
-                    , { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
-                    , { field: '妯″叿浠g爜', title: '鍣ㄥ叿浠g爜', width: 200 }
-                    , { field: '妯″叿鍚嶇О', title: '鍣ㄥ叿鍚嶇О', width: 200 }
-                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 200 }
-                    , { field: '鎵规', title: '鎵规', width: 200 }
-                    , { field: '搴旀敹鏁伴噺', title: '搴旀敹鏁伴噺', width: 200, totalRow: true }
-                    , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', width: 200, totalRow: true }
-                    , { field: '鍗曚环', title: '鍗曚环', width: 200 }
-                    , { field: '閲戦', title: '閲戦', width: 200, totalRow: true }
-                    , { field: '浣跨敤瀵垮懡', title: '浣跨敤瀵垮懡', width: 200 }
-                    , { field: '璁捐瀵垮懡', title: '璁捐瀵垮懡', width: 200 }
-                    , { field: '鍓╀綑瀵垮懡', title: '鍓╀綑瀵垮懡', width: 200 }
-                    , { field: 'HWHID', title: 'HWHID', width: 200, hide: true }
-                    , { field: '鏀舵枡浠撳簱浠g爜', title: '浠撳簱浠g爜', width: 200 }
-                    , { field: '鏀舵枡浠撳簱', title: '浠撳簱鍚嶇О', width: 200 }
-                    , { field: 'HSPID', title: 'HWHID', width: 200, hide: true }
-                    , { field: '鏀舵枡浠撲綅浠g爜', title: '浠撲綅浠g爜', width: 200 }
-                    , { field: '鏀舵枡浠撲綅', title: '浠撲綅鍚嶇О', width: 200 }
-                    , { field: 'HSecManagerID', title: 'HSecManagerID', width: 200, hide: true }
-                    , { field: '楠屾敹鍛樹唬鐮�', title: '楠屾敹鍛樹唬鐮�', width: 200 }
-                    , { field: '楠屾敹鍛�', title: '楠屾敹鍛樺悕绉�', width: 200 }
-                    , { field: 'HKeeperID', title: 'HKeeperID', width: 200, hide: true }
-                    , { field: '淇濈鍛樹唬鐮�', title: '淇濈鍛樹唬鐮�', width: 200 }
-                    , { field: '淇濈鍛�', title: '淇濈鍛樺悕绉�', width: 200 }
-                    , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
-                    , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 200 }
-                    , { field: '閮ㄩ棬', title: '閮ㄩ棬鍚嶇О', width: 200 }
-                    , { 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: '鎽樿', title: '鎽樿', width: 200 }
-                    , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 200 }
-                    , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 }
-                    , { field: '绾㈣摑鍗曟爣璁�', title: '绾㈣摑鍗曟爣璁�', width: 200 }
-                    , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
-                    , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
-                    , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
-                    , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: '淇敼浜�', title: '淇敼浜�', width: 200 }
-                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
-                    , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 }
-                    , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 200 }
-                    , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
-                    , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 }
-                    , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
-                    , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
-                    , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
-                    , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
-                    , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 }
+                    , { field: 'hmainid', title: '鍗曟嵁ID', width: 200, 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: 200, sort: true, sort: true }
+                    , { field: 'HBillType', title: '鍗曟嵁绫诲瀷', width: 200, hide: true, sort: true }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 110, sort: true }
+                    , { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true, sort: true }
+                    , { field: '妯″叿浠g爜', title: '鍣ㄥ叿浠g爜', width: 200, sort: true }
+                    , { field: '妯″叿鍚嶇О', title: '鍣ㄥ叿鍚嶇О', width: 200, sort: true }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 200, sort: true }
+                    , { field: '鎵规', title: '鎵规', width: 200, sort: true }
+                    , { field: '搴旀敹鏁伴噺', title: '搴旀敹鏁伴噺', width: 200, totalRow: true, sort: true }
+                    , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', width: 200, totalRow: true, sort: true }
+                    , { field: '鍗曚环', title: '鍗曚环', width: 200, sort: true }
+                    , { field: '閲戦', title: '閲戦', width: 200, totalRow: true, sort: true }
+                    , { field: '浣跨敤瀵垮懡', title: '浣跨敤瀵垮懡', width: 200, sort: true }
+                    , { field: '璁捐瀵垮懡', title: '璁捐瀵垮懡', width: 200, sort: true }
+                    , { field: '鍓╀綑瀵垮懡', title: '鍓╀綑瀵垮懡', width: 200, sort: true }
+                    , { field: '搴撳瓨缁勭粐', title: '搴撳瓨缁勭粐', width: 125, sort: true }
+                    , { field: 'HWHID', title: 'HWHID', width: 200, hide: true, sort: true }
+                    , { field: '鏀舵枡浠撳簱浠g爜', title: '浠撳簱浠g爜', width: 200, sort: true }
+                    , { field: '鏀舵枡浠撳簱', title: '浠撳簱鍚嶇О', width: 200, sort: true }
+                    , { field: 'HSPID', title: 'HWHID', width: 200, hide: true, sort: true }
+                    , { field: '鏀舵枡浠撲綅浠g爜', title: '浠撲綅浠g爜', width: 200, sort: true }
+                    , { field: '鏀舵枡浠撲綅', title: '浠撲綅鍚嶇О', width: 200, sort: true }
+                    , { field: 'HSecManagerID', title: 'HSecManagerID', width: 200, hide: true, sort: true }
+                    , { field: '楠屾敹鍛樹唬鐮�', title: '楠屾敹鍛樹唬鐮�', width: 200, sort: true }
+                    , { field: '楠屾敹鍛�', title: '楠屾敹鍛樺悕绉�', width: 200, sort: true }
+                    , { field: 'HKeeperID', title: 'HKeeperID', width: 200, hide: true, sort: true }
+                    , { field: '淇濈鍛樹唬鐮�', title: '淇濈鍛樹唬鐮�', width: 200, sort: true }
+                    , { field: '淇濈鍛�', title: '淇濈鍛樺悕绉�', width: 200, sort: true }
+                    , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true, sort: true }
+                    , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 200, sort: true }
+                    , { field: '閮ㄩ棬', title: '閮ㄩ棬鍚嶇О', width: 200, 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: '鎽樿', title: '鎽樿', width: 200, sort: true }
+                    , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 200, sort: true }
+                    , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200, sort: true }
+                    , { field: '绾㈣摑鍗曟爣璁�', title: '绾㈣摑鍗曟爣璁�', width: 200, sort: true }
+                    , { field: 'hsubid', title: 'hsubid', width: 200, hide: true, sort: true }
+                    , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200, 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: 200, 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: 200, 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: 200, 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: 200, 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: 200, sort: true }
+                    , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200, sort: true }
+                    , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200, sort: true }
+                    , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true, sort: true }
+                    , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true, sort: true }
+                    , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200, sort: true }
+                    , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200, sort: true }
+                    , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200, sort: true }
                 ];
                 option = {
                     elem: '#mainTable'
@@ -251,7 +284,7 @@
                     , cols: [columns]
                     , limits: [50, 500, 5000, 20000]
                     , done: function (res, curr, count) {
-
+                        soulTable.render(this);
                     }
                 };
                 //璁剧疆鍒楀
@@ -434,7 +467,7 @@
                     var InterID = data[0].hmainid.toString();
                     $.ajax({
                         type: "GET",
-                        url: GetWEBURL() + "Sc_MouldProdInHouseBill/AuditMouldProdInHouseBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        url: GetWEBURL() + "/Sc_MouldProdInHouseBill/AuditMouldProdInHouseBills", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                         data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag":1 },
                         success: function (result) {
                             if (result.count == 1) {
@@ -467,7 +500,7 @@
                     var InterID = data[0].hmainid.toString();
                     $.ajax({
                         type: "GET",
-                        url: GetWEBURL() + "Sc_MouldProdInHouseBill/AuditMouldProdInHouseBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        url: GetWEBURL() + "Sc_MouldProdInHouseBill/AuditMouldProdInHouseBills", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                         data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 2 },
                         success: function (result) {
                             if (result.count == 1) {
@@ -629,8 +662,13 @@
                 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();   //鐗╂枡浠g爜    
+                var HModelNumber = $("#HModelNumber").val();    //鍣ㄥ叿浠g爜
+                var HWhName = $("#HWhName").val();  //浠撳簱鍚嶇О
+                var HSupName = $("#HSupName").val();    //寰�鏉ュ崟浣�
                 if (HStatus) {
                     switch (HStatus) {
                         case '-1':   //鍏ㄩ儴
@@ -654,17 +692,33 @@
                 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 鐗╂枡浠g爜 like '%" + HMaterNumber + "%'";
+                }
+                if (HModelNumber) {
+                    sWhere += " and 妯″叿浠g爜 like '%" + HModelNumber + "%'";
+                }
+                if (HWhName) {
+                    sWhere += " and 鏀舵枡浠撳簱 like '%" + HWhName + "%'";
+                }
+                if (HSupName) {
+                    sWhere += " and 寰�鏉ュ崟浣� like '%" + HSupName + "%'";
                 }
                 var index = layer.load(0);
                 get_Display(sWhere);
                 //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
                 sWhere = "";
             }
+           
             //閲嶇疆杩囨护鏉′欢
             function set_ClearQuery() {
                 $('#HStatus').find("option[value='-1']").attr("selected", true);
@@ -672,6 +726,11 @@
                 $("#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