From 09c9d21502dc83ed9573222e27400b6eba93272f Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期五, 31 十二月 2021 11:32:05 +0800
Subject: [PATCH] 完善 其他 分步式调入 查询

---
 WebTM/views/生产管理/生产退库单/Sc_ProductionReturnList.html         |    4 
 WebTM/views/验收入库/产品入库/Kf_ProductInBillList.html             |    4 
 WebTM/views/验收入库/委外入库/Kf_EntrustInBillList.html             |  165 ++++++++--------
 WebTM/views/采购管理/采购退料单/Cg_PurchaseReturnList.html           |    4 
 WebTM/views/领料发货/其他出库/Kf_OtherOutBillList.html              |    2 
 WebTM/views/销售管理/销售退货单/Kf_ICStockBillMainList.html          |    4 
 WebTM/views/index.html                                      |    2 
 WebTM/views/领料发货/领料出库/Kf_MateOutBackBillList.html           |    9 
 WebTM/views/验收入库/其他入库/Kf_OtherInBillList.html               |    8 
 WebTM/views/销售管理/销售退货单/Add_Edit_Kf_ICStockBillMainList.html |    5 
 WebTM/views/仓存管理/分步式调入单/Fb_StepFoldinBillList.html          |  335 +++++++++++++++++++++++++++++++++
 11 files changed, 438 insertions(+), 104 deletions(-)

diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index b6e9c45..a376254 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -202,7 +202,7 @@
                                         <dd><a lay-href="楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBillList.html">鍏朵粬鍏ュ簱鍗曠淮鎶�</a></dd>
                                         <dd><a lay-href="楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBillList.html">濮斿鍔犲伐鍏ュ簱鍗曠淮鎶�</a></dd>
                                         <dd><a lay-href="棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBillList.html">濮斿鍔犲伐鍑哄簱鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="浠撳瓨绠$悊/鍒嗘寮忚皟鍏ュ崟/Fb_StepFoldinBillList">鍒嗘寮忚皟鍏ュ崟缁存姢n</a></dd>
+                                        <dd><a lay-href="浠撳瓨绠$悊/鍒嗘寮忚皟鍏ュ崟/Fb_StepFoldinBillList.html">鍒嗘寮忚皟鍏ュ崟缁存姢</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillList.html"
index a1ca84d..630d212 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillList.html"
@@ -3,9 +3,344 @@
 <head>
     <meta charset="utf-8" />
     <title>鍒嗘寮忚皟鍏ュ崟缁存姢</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <!--<script src="../../../layuiadmin/layui/layui.js"></script>-->
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
 
+    <style type="text/css">
+        input.layui-input.layui-unselect {
+            padding-right: 0;
+        }
+    </style>
 </head>
 <body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <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>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                    <div class="layui-input-block">
+                                        <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="HBillNo" id="HBillNo" 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">
+                                        <label class="layui-form-label">閮ㄩ棬</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="HDeptID" id="HDeptID" 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="MaterialCode" id="MaterialCode" style="width:190px;">
+                                        </div>
+                                    </div>
+                                    <!--<hr />-->
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="MaterialName" id="MaterialName" 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="SpecificationModel" id="SpecificationModel" 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="HSourceBillNo" id="HSourceBillNo" 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="Warehouse" id="Warehouse" 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="Hmaker" id="Hmaker" 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>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
 
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , util = layui.util
+            //鏌ヨ鏉′欢
+            var sWhere = "";
+            var option = [];
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍔犺浇
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            // 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                //娓呯┖杩囨护鏉′欢
+                set_ClearQuery();
+            });
+            // 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+           
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+                //鍒濆鍖栨棩鏈�
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+            }
+            // 鍒濆鍖栬〃鏍兼柟娉�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , limits: [50, 500, 1000, 5000, 10000]
+                    , limit: 50
+                    , 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: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 110 }
+                        , { field: '浠撳簱浠g爜', title: '浠撳簱浠g爜', width: 125 }
+                        , { field: '浠撳簱鍚嶇О', title: '浠撳簱', width: 125 }
+                        , { field: '棰嗘枡浜轰唬鐮�', title: '棰嗘枡浜轰唬鐮�', width: 180 }
+                        , { field: '棰嗘枡浜�', title: '棰嗘枡浜�', width: 125 }
+                        , { field: '鍙戞枡浜轰唬鐮�', title: '鍙戞枡浜轰唬鐮�', width: 180 }
+                        , { field: '鍙戞枡浜�', title: '鍙戞枡浜�', width: 125 }
+                        , { field: 'HSecManagerID', title: 'HSecManagerID', width: 200, hide: true }
+                        , { field: 'HKeeperID', title: 'HKeeperID', width: 200, hide: true }
+                        , { 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: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
+                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 125 }
+                        , { field: 'HUnitID', title: 'Hunitid', width: 200, hide: true }
+                        //, { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 125 }
+                        //, { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 125 }
+                        , { field: '璋冩嫧绫诲瀷', title: '璋冩嫧绫诲瀷', width: 100 }
+                        , { field: '璋冨叆缁勭粐', title: '璋冨叆缁勭粐', width: 125 }
+                        , { field: 'HWHID', title: 'HWHID', 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, hide: true }
+                        , { field: '璋冨叆浠撲綅', title: '璋冨叆浠撲綅', width: 125, hide: true }
+                        , { field: 'HSCWHID', title: 'HSCWHID', width: 200, hide: true }
+                        , { field: '璋冨嚭浠撳簱浠g爜', title: '璋冨嚭浠撳簱浠g爜', width: 125 }
+                        , { field: '璋冨嚭浠撳簱', title: '璋冨嚭浠撳簱', width: 125 }
+                        , { field: 'HSCSPID', title: 'HSCSPID', width: 200, hide: true }
+                        , { field: '璋冨嚭浠撲綅浠g爜', title: '璋冨嚭浠撲綅浠g爜', width: 125, hide: true }
+                        , { field: '璋冨嚭浠撲綅', title: '璋冨嚭浠撲綅', width: 125, hide: true }
+                        , { 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 }
+                    ]]
+                };
+            }
+            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Kf_StepFoldinBill/GetStepFoldinBillList',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            // 蹇�熻繃婊�
+            function get_FastQuery() {
+                var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+                var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
+                var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+                var HDeptID = $("#HDeptID").val();//閮ㄩ棬
+                var MaterialCode = $("#MaterialCode").val();//鐗╂枡浠g爜
+                var MaterialName = $("#MaterialName").val();//鐗╂枡鍚嶇О
+                var SpecificationModel = $("#SpecificationModel").val();//瑙勬牸鍨嬪彿
+                var HSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍗曞彿
+                var Warehouse = $("#Warehouse").val();//浠撳簱
+                var Hmaker = $("#Hmaker").val();//鍒跺崟浜�
+                if (HDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+                }
+                if (HDate1) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+                }
+                if (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
+                if (HDeptID) {
+                    sWhere += " and 閮ㄩ棬 like '%" + HDeptID + "%'";
+                }
+                if (MaterialCode) {
+                    sWhere += " and 鐗╂枡浠g爜 like '%" + MaterialCode + "%'";
+                }
+                if (MaterialName) {
+                    sWhere += " and 鐗╂枡鍚嶇О like '%" + MaterialName + "%'";
+                }
+                if (SpecificationModel) {
+                    sWhere += " and 瑙勬牸鍨嬪彿 like '%" + SpecificationModel + "%'";
+                }
+                if (HSourceBillNo) {
+                    sWhere += " and 婧愬崟鍗曞彿 like '%" + HSourceBillNo + "%'";
+                }
+                if (Warehouse) {
+                    sWhere += " and 浠撳簱鍚嶇О like '%" + Warehouse + "%'";
+                }
+                if (Hmaker) {
+                    sWhere += " and 鍒跺崟浜� like '%" + Hmaker + "%'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+
+            // 閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#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("");//鍗曟嵁鍙�
+                $("#HDeptID").val();//閮ㄩ棬
+                $("#MaterialCode").val();//鐗╂枡浠g爜
+                $("#MaterialName").val();//鐗╂枡鍚嶇О
+                $("#SpecificationModel").val();//瑙勬牸鍨嬪彿
+                $("#HSourceBillNo").val();//婧愬崟鍗曞彿
+                $("#Warehouse").val();//浠撳簱
+                $("#Hmaker").val();//鍒跺崟浜�
+                sWhere = "";
+                get_Display(sWhere);
+            }
+
+            //#endregion
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+
+
+
+
+    </script>
 </body>
 </html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_ProductionReturnList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_ProductionReturnList.html"
index 87f2326..13009ba 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_ProductionReturnList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_ProductionReturnList.html"
@@ -300,8 +300,8 @@
 
             // 閲嶇疆杩囨护鏉′欢
             function set_ClearQuery() {
-                $("#HDate").val("");//寮�濮嬫棩鏈�
-                $("#HDate1").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("");//鍗曟嵁鍙�
                 $("#HDeptID").val();//閮ㄩ棬
                 $("#MaterialCode").val();//鐗╂枡浠g爜
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\351\200\200\346\226\231\345\215\225/Cg_PurchaseReturnList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\351\200\200\346\226\231\345\215\225/Cg_PurchaseReturnList.html"
index 88e0f41..24499ff 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\351\200\200\346\226\231\345\215\225/Cg_PurchaseReturnList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\351\200\200\346\226\231\345\215\225/Cg_PurchaseReturnList.html"
@@ -443,8 +443,8 @@
             }
             // 閲嶇疆杩囨护鏉′欢
             function set_ClearQuery() {
-                $("#HDate").val("");//寮�濮嬫棩鏈�
-                $("#HDate1").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("");//鍗曟嵁鍙�
                 $("#Hname").val("");//渚涘簲鍟�
                 $("#HDeptID").val();//閮ㄩ棬
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Add_Edit_Kf_ICStockBillMainList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Add_Edit_Kf_ICStockBillMainList.html"
index cffcf96..ce518e7 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Add_Edit_Kf_ICStockBillMainList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Add_Edit_Kf_ICStockBillMainList.html"
@@ -311,7 +311,7 @@
             //#region 杩涘叆椤甸潰鍗冲姞杞�
 
             //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
-            get_LoginIs();
+            //get_LoginIs();
 
 
 
@@ -397,11 +397,12 @@
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
                         var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        alert(JSON.stringify(checkStatus))
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
                         $("#HBillNo").val(checkStatus.data[0].HName);
-                        $("#Hmainid").val(checkStatus.data[0].HItemID);
+                        $("#Hmainid").val(checkStatus.data[0].hmainid);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) { }
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBillMainList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBillMainList.html"
index e0f52b4..b1dd755 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBillMainList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBillMainList.html"
@@ -355,8 +355,8 @@
 
             // 閲嶇疆杩囨护鏉′欢
             function set_ClearQuery() {
-                $("#HDate").val("");//寮�濮嬫棩鏈�
-                $("#HDate1").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("");//鍗曟嵁鍙�
                 $("#HCusID").val("");//瀹㈡埛
                 $("#HDeptID").val();//閮ㄩ棬
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html"
index fcb45a7..815b4ae 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html"
@@ -351,6 +351,8 @@
 
             // 閲嶇疆杩囨护鏉′欢
             function set_ClearQuery() {
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                 $("#HDate").val("");//寮�濮嬫棩鏈�
                 $("#HDate1").val("");//缁撴潫鏃ユ湡
                 $("#HBillNo").val("");//鍗曟嵁鍙�
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBackBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBackBillList.html"
index b7785f4..059007d 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBackBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBackBillList.html"
@@ -273,14 +273,7 @@
             //鍔犺浇缃戞牸
             function get_Display(sWhere) {
                 var wait = layer.load();//閬僵
-                var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
-                var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
-                if (HBeginDate) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
-                }
-                if (HEndDate) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
-                }
+              
                 $.ajax({
                     url: GetWEBURL() + '/Kf_MateOutBackBill/GetMateOutBillList',
                     type: "GET",
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBillList.html"
index 4148c03..2422c6a 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBillList.html"
@@ -401,8 +401,8 @@
             }
             // 閲嶇疆杩囨护鏉′欢
             function set_ClearQuery() {
-                $("#HDate").val("");//寮�濮嬫棩鏈�
-                $("#HDate1").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("");//鍗曟嵁鍙�
                 $("#HDeptID").val();//閮ㄩ棬
                 $("#MaterialCode").val();//鐗╂枡浠g爜
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList.html"
index f1aa3fb..8692a21 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList.html"
@@ -167,7 +167,7 @@
 
             // 鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
-                get_FastQuery(table, option);
+                get_FastQuery();
             });
 
             //澶村伐鍏锋爮浜嬩欢
@@ -363,7 +363,7 @@
             }
 
             // 蹇�熻繃婊�
-            function get_FastQuery(table, option) {
+            function get_FastQuery() {
                 var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
                 var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
                 var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
@@ -411,8 +411,8 @@
             }
             // 閲嶇疆杩囨护鏉′欢
             function set_ClearQuery() {
-                $("#HDate").val("");//寮�濮嬫棩鏈�
-                $("#HDate1").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("");//鍗曟嵁鍙�
                 $("#HDeptID").val();//閮ㄩ棬
                 $("#MaterialCode").val();//鐗╂枡浠g爜
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList.html"
index ca381cc..0ecfd4b 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList.html"
@@ -106,16 +106,20 @@
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+                                <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-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>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill"><i class="layui-icon layui-icon-search"></i>瀹℃牳</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck"><i class="layui-icon layui-icon-search"></i>鍙嶅鏍�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_PrintReport"><i class="layui-icon layui-icon-search"></i>棰勮</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event=""><i class="layui-icon layui-icon-search"></i>鎵撳嵃</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></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>
                             </div>
                         </script>
                     </form>
@@ -151,81 +155,25 @@
 
             //鍒濆鍖栫晫闈�
             set_ClearBill();
-
-            $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
-            $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
-
             //#endregion
 
             //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
 
-            //閲嶇疆鎸夐挳
-            //form.on('submit(btnReSearch)', function (data) {
-            //    $("#HBillType").val("");//鍗曟嵁绫诲瀷
-            //    $("#HBillNo").val("");//鍗曟嵁鍙�
-            //    $("#HSourceBillNo").val("");//婧愬崟鍙�
-            //    $("#HCreateBy").val("");//鍒跺崟浜�
-            //    $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-            //    $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            //    $("#btnSearch").click();
-            //});
-
             //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
-                //var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
-                //var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
-                //var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜�
-                //var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
-                //var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿
-                //if (HBillNo) {
-                //    sWhere += " and HBillNo like '%" + HBillNo + "%'";
-                //}
-                //if (HCreateBy) {
-                //    sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
-                //}
-                //if (BenginHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
-                //}
-                //if (EndHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
-                //}
-                var index = layer.load(0);
-                //$.ajax({
-                //    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                //    url: GetWEBURL1() + '/Kf_EntrustInBill/GetEntrustInBill',
-                //    type: "GET",
-                //    data: { "sWhere": sWhere },
-                //    success: function (data1) {
-                //        if (data1.count == 1) {
-                //            option.data = data1.data;
-                //            table.render(option);
-                //            layer.close(index);
-                //            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
-                //        } else {
-                //            layer.close(index);
-                //            layer.alert(data1.code + data1.Message, { icon: 5 });
-                //        }
-                //    }, error: function () {
-                //        layer.close(index);
-                //        layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
-                //    }
-                //});
-                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-                sWhere = "";
-                //$("#HBillType").val("");//鍗曟嵁绫诲瀷
-                //$("#HBillNo").val("");//鍗曟嵁鍙�
-                //$("#HSourceBillNo").val("");//婧愬崟鍙�
-                //$("#HCreateBy").val("");//鍒跺崟浜�
-                //$("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-                //$("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            // 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                //娓呯┖杩囨护鏉′欢
+                set_ClearQuery();
             });
 
             //鐩戝惉琛屽弻鍑讳簨浠�
             table.on('rowDouble(mainTable)', function (obj) {
                 layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
             });
-
-            //#endregion
+             //#endregion
 
             //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
 
@@ -235,6 +183,9 @@
                 set_InitGrid();
                 //鏌ヨ
                 get_Display(sWhere);
+                //鍒濆鍖栨棩鏈�
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
             }
 
             //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
@@ -340,22 +291,74 @@
                     ]]
                 };
             }
+            // 蹇�熻繃婊�
+            function get_FastQuery() {
+                var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+                var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
+                var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+                var HDeptID = $("#HDeptID").val();//閮ㄩ棬
+                var MaterialCode = $("#MaterialCode").val();//鐗╂枡浠g爜
+                var MaterialName = $("#MaterialName").val();//鐗╂枡鍚嶇О
+                var SpecificationModel = $("#SpecificationModel").val();//瑙勬牸鍨嬪彿
+                var HSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍗曞彿
+                var Warehouse = $("#Warehouse").val();//浠撳簱
+                var Hmaker = $("#Hmaker").val();//鍒跺崟浜�
+
+                if (HDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+                }
+                if (HDate1) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+                }
+                if (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
+                if (HDeptID) {
+                    sWhere += " and 閮ㄩ棬 like '%" + HDeptID + "%'";
+                }
+                if (MaterialCode) {
+                    sWhere += " and 鐗╂枡浠g爜 like '%" + MaterialCode + "%'";
+                }
+                if (MaterialName) {
+                    sWhere += " and 鐗╂枡鍚嶇О like '%" + MaterialName + "%'";
+                }
+                if (SpecificationModel) {
+                    sWhere += " and 瑙勬牸鍨嬪彿 like '%" + SpecificationModel + "%'";
+                }
+                if (HSourceBillNo) {
+                    sWhere += " and 婧愬崟鍗曞彿 like '%" + HSourceBillNo + "%'";
+                }
+                if (Warehouse) {
+                    sWhere += " and 鍙戣揣浠撳簱 like '%" + Warehouse + "%'";
+                }
+                if (Hmaker) {
+                    sWhere += " and 鍒跺崟浜� like '%" + Hmaker + "%'";
+                }
+
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            // 閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#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("");//鍗曟嵁鍙�
+                $("#HDeptID").val();//閮ㄩ棬
+                $("#MaterialCode").val();//鐗╂枡浠g爜
+                $("#MaterialName").val();//鐗╂枡鍚嶇О
+                $("#SpecificationModel").val();//瑙勬牸鍨嬪彿
+                $("#HSourceBillNo").val();//婧愬崟鍗曞彿
+                $("#Warehouse").val();//浠撳簱
+                $("#Hmaker").val();//鍒跺崟浜�
+                sWhere = "";
+            }
+
             //#endregion
 
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
+              //浠ヤ笂鏄痩ayui妯″潡
 
-            //浠ヤ笂鏄痩ayui妯″潡
-        });
-
-
-
+        })
 
     </script>
-
 </body>
 </html>

--
Gitblit v1.9.1