From 8efae3a9a206740295d268b4ed6b28f85acd645c Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期一, 01 十一月 2021 16:49:56 +0800
Subject: [PATCH] 1

---
 WebTM/views/质量管理/来料检验单/QC_Add_Edit_POStockInCheckBill.html |  448 ++++++++++++++---------
 WebTM/views/质量管理/来料检验单/QC_POStockInCheckBillList.html      |  648 +++++++++++++++------------------
 WebTM/layuiadmin/Scripts/webConfig.js                      |    6 
 3 files changed, 572 insertions(+), 530 deletions(-)

diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 746abcc..802a542 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -2,13 +2,13 @@
 function GetWEBURL() {
     //var WEBURL = "http://192.168.16.80:8011/";          //鍔炲叕瀹ゆ湇鍔″櫒
     //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch鏈湴
-    //var WEBURL = "http://localhost:8085/API/";   //zgq鏈湴
+    var WEBURL = "http://localhost:8085/API/";   //zgq鏈湴
     //var WEBURL = "http://localhost:8080/API/";   //棰滄檽鍐涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/lubao";   //棰滄檽鍐涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄩ湶鏈湴閰嶇疆
-    var WEBURL = "http://localhost:8082/LuBaoAPI/";    //绔犵传鏌旀湰鍦伴厤缃�
+    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //绔犵传鏌旀湰鍦伴厤缃�
     //var WEBURL = "http://10.1.4.155/API/";   //姹熶赴瀹㈡埛NEW
-    var WEBURL = "http://47.96.97.237/API/";   //鏅轰簯鏈嶅姟鍣�
+    //var WEBURL = "http://47.96.97.237/API/";   //鏅轰簯鏈嶅姟鍣�
     //var WEBURL = "http://183.129.128.86:9090/API/";   //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ缃�
     //var WEBURL = "http://192.168.1.253:8080/API/";   //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ唴缃�
     //var WEBURL = "http://220.189.218.154:8092/API/";   //涓镐簳鍥涚淮灏旀湇鍔″櫒
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBill.html"
index 66894c1..0ddee79 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBill.html"
@@ -8,190 +8,273 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <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">
+        .layui-form-item .layui-inline {
+            margin-right: 0;
+        }
+
+        html {
+            background-color: white;
+            color: white;
+        }
+
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+    </style>
 </head>
 <body>
 
-    <div id="layout1" class="layui-fluid">
-        <div class="layui-row layui-col-space15">
-            <div class="layui-col-md12">
-                <div class="layui-card">
-                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
-                        <div class="layui-card-header">
-                            <div class="layui-btn-group">
-
-                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
-                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
+   
 
 
+  <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 15px;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" lay-filter="component-form-group" action="">
+                    <div class="layui-card-header">
+                        <div class="layui-btn-group">
+                            <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <h1 style="text-align: center; padding: 10px 0;"><b>鏉ユ枡妫�楠屽崟</b></h1>
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID" value="0">
+                                                <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">渚涘簲鍟�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                       
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">浜у搧鍐呯爜</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HMaterName" id="HMaterName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍏ュ簱鏁伴噺</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HInStockQty" id="HInStockQty" autocomplete="off">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍚堟牸鏁伴噺</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HRightQty" id="HRightQty" autocomplete="off">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">妫�楠屽憳</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HFirstCheckEmpName" id="HFirstCheckEmpName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HFirstCheckEmp" id="HFirstCheckEmp" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鎶芥鏁伴噺</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HCheckQty" id="HCheckQty" autocomplete="off">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">涓嶅悎鏍兼暟閲�</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HBadQty" id="HBadQty" autocomplete="off">
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">閽㈡潗鐐夊彿</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HSteelStoveNo" id="HSteelStoveNo" autocomplete="off">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">澶栬</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HAspect" id="HAspect" autocomplete="off">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">灏哄</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HSize" id="HSize" autocomplete="off">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">閽㈠巶鎶ュ憡涓婁紶</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HSteelCompReport" id="HSteelCompReport" autocomplete="off">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍒ゅ畾缁撹</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HCheckerResult" id="HCheckerResult" autocomplete="off">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs7 layui-inline">
+                                            <label class="layui-form-label">澶囨敞</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
                             </div>
 
-                        </div>
-                        <div class="layui-card-body">
-                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
-                                <!--<ul class="layui-tab-title">
-                                <li class="layui-this">鍩烘湰淇℃伅</li>-->
-                                <!--<li>鍏朵粬淇℃伅</li>-->
-                                <!--</ul>-->
-                                <h1 style="text-align:center;"><b>鏉ユ枡妫�楠屽崟</b></h1>
-                                <div class="layui-tab-content">
-                                    <div class="layui-tab-item layui-show">
 
-                                        <div class="layui-form-item">
-                                            <div class="layui-row">
-                                                <div class="layui-col-xs2">
-                                                    <label class="layui-form-label">鍗� 鎹� 鍙凤細</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
-                                                        <input id="HInterID" name="HInterID" value="0" type="hidden" />
-                                                    </div>
-                                                </div>
-                                                <div class="layui-col-xs2">
-                                                    <label class="layui-form-label">鍗曟嵁鏃ユ湡锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HDate" id="HDate" readonly="readonly" autocomplete="off" disabled>
-                                                    </div>
-                                                </div>
-                                                <div class="layui-col-xs2">
-                                                    <label class="layui-form-label">渚涘簲鍟嗭細</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HSupName" id="HSupName" autocomplete="off">
-                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupID-BT">
-                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                        </button>
-                                                        <input id="HSupID" name="HSupID" type="hidden" />
-
-                                                    </div>
-                                                </div>
-                                                <div class="layui-col-xs2">
-                                                    <label class="layui-form-label">浜у搧鍐呯爜锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input type="text" name="HMater" id="HMater" lay-verify="HMater" readonly="readonly" autocomplete="off" class="layui-input">
-                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HMateria-BT">
-                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                        </button>
-                                                        <input id="HMaterID" name="HMaterID" type="hidden" />
-                                                        <input id="HMaterNumber" name="HMaterNumber" type="hidden" />
-                                                    </div>
-                                                </div>
-                                                <div class="layui-col-xs2">
-                                                    <label class="layui-form-label">鍏ュ簱鏁伴噺锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input type="text" name="HInStockQty" id="HInStockQty" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" autocomplete="off" class="layui-input">
-                                                    </div>
-                                                </div>
-                                                <div class="layui-col-xs2">
-                                                    <label class="layui-form-label">鍚堟牸鏁伴噺锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input type="text" name="HRightQty" id="HRightQty" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify=""  autocomplete="off" class="layui-input">
-                                                    </div>
-                                                </div>
-
-
+                            <!--鍒跺崟淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
                                             </div>
-                                            <!--<button class="layui-btn" data-type="reload">閫夋嫨</button>-->
                                         </div>
-                                        <div class="layui-form-item">
-                                            <div class="layui-row">
-                                                <div class="layui-col-xs2">
-                                                    <label class="layui-form-label">妫�楠屽憳锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input type="text" name="HEmpName" id="HEmpName" lay-verify="" autocomplete="off" class="layui-input">
-
-                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmployeeID-BT">
-                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                        </button>
-                                                        <input id="HFirstCheckEmp" name="HFirstCheckEmp" type="hidden" />
-
-                                                    </div>
-                                                </div>
-
-                                                <div class="layui-col-xs2">
-                                                    <label class="layui-form-label"> 鎶芥鏁伴噺锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HCheckQty" onkeyup="this.value=this.value.replace(/\D/g,'')" value="0" lay-verify="" id="HCheckQty" autocomplete="off">
-
-                                                    </div>
-                                                </div>
-                                                <div class="layui-col-xs2">
-                                                    <label class="layui-form-label"> 涓嶅悎鏍兼暟閲忥細</label>
-                                                    <div class="layui-input-inline">
-                                                        <input type="text" name="HBadQty" id="HBadQty" onkeyup="this.value=this.value.replace(/\D/g,'')" value="0" lay-verify="" autocomplete="off" class="layui-input">
-
-                                                    </div>
-                                                </div>
-                                                <div class="layui-col-xs2">
-                                                    <label class="layui-form-label"> 閽㈡潗鐐夊彿锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HSteelStoveNo" lay-verify="" id="HSteelStoveNo"  autocomplete="off">
-
-                                                    </div>
-                                                </div>
-                                                <div class="layui-col-xs2">
-                                                    <label class="layui-form-label"> 澶栬锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HAspect" lay-verify="" id="HAspect"  autocomplete="off">
-                                                    </div>
-                                                </div>
-                                                <div class="layui-col-xs2">
-                                                    <label class="layui-form-label"> 灏哄锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HSize" lay-verify="" id="HSize"   autocomplete="off">
-                                                    </div>
-                                                </div>
-
-                                          
-
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浣滃簾浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HDeleteMan " id="HDeleteMan " style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
 
-                                        <div class="layui-form-item">
-                                            <div class="layui-row">
-                                                <div class="layui-col-xs2">
-                                                    <label class="layui-form-label"> 閽㈠巶鎶ュ憡涓婁紶锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HSteelCompReport" lay-verify="" id="HSteelCompReport"  autocomplete="off">
-                                                    </div>
-                                                </div>
 
-                                                <div class="layui-col-xs2">
-                                                    <label class="layui-form-label"> 鍒ゅ畾缁撹锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HCheckerResult" lay-verify="" id="HCheckerResult"   autocomplete="off">
-                                                    </div>
-                                                </div>
+                                    </div>
+
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
                                             </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
                                             </div>
-
-                                                <div class="layui-form-item">
-                                                    <div class="layui-row">
-
-                                                        <div class="layui-colorpicker-xs">
-                                                            <label class="layui-form-label"> 澶囨敞锛�</label>
-                                                            <div class="layui-input-block">
-                                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
-                                                            </div>
-                                                        </div>
-                                                    </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-row">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
+                                                <div class="layui-input-block" style="margin-left: 120px;">
+                                                    <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
                                                 </div>
                                             </div>
                                         </div>
                                     </div>
-                        </div>
-
-                        <table class="layui-hide" 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-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
-
+                                </div>
                             </div>
-                        </script>
-                        <script type="text/html" id="xuhao">
-                            {{d.LAY_TABLE_INDEX+1}}
-                        </script>
-                    </form>
-                </div>
+                        </div>
+                    </div>
+
+                    <table class="layui-hide" 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-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+
+                        </div>
+                    </script>
+                    <script type="text/html" id="xuhao">
+                        {{d.LAY_TABLE_INDEX+1}}
+                    </script>
+                </form>
             </div>
         </div>
     </div>
@@ -199,10 +282,7 @@
         <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
         <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
     </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>
 
         //鑾峰彇鍙傛暟
@@ -266,8 +346,21 @@
             //鍒ゆ柇鏄惁鏂板
             if (hID == null || hID == 0)
             {
+                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                $("#HCheckDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HChecker").val(sessionStorage["HUserName"]);
+                $("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HUpDater").val(sessionStorage["HUserName"]);
+                $("#HCloseDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HDeleteDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HCloseMan").val(sessionStorage["HUserName"]);
+                $("#HDeleteMan").val(sessionStorage["HUserName"]);
                 //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
-                option.data = [{ "HQCCheckClassID": 0, "HQCCheckItemID": 0, "HQCRelValue": "  ", "HResult": "   ", "HQCStd": 0, "HProcCheckEmp": 0, "HProcCheckTime": "  ", "HRemark": "  " }];
+                option.data = [{
+                    "HQCCheckClassID": " ", "HQCCheckItemID": " ", "HQCRelValue": "  ", "HResult": "   "
+                    , "HQCStd": 0, "HProcCheckEmp": 0, "HProcCheckTime": "  ", "HRemark": "  "
+                }];
                 table.render(option);
             }
             else
@@ -303,7 +396,10 @@
                 var checkStatus = table.checkStatus('mainTable')
                     ,data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HQCCheckClassID": 0, "HQCCheckItemID": 0, "HQCRelValue": "  ", "HResult": "   ", "HQCStd": 0, "HProcCheckEmp": "  ", "HProcCheckTime": "  ", "HRemark": "  " };
+                var NewRow = {
+                    "HQCCheckClassID": " ", "HQCCheckItemID": " ", "HQCRelValue": "  ", "HResult": "   "
+                    , "HQCStd": 0, "HProcCheckEmp": 0, "HProcCheckTime": "  ", "HRemark": "  "
+                };
                 switch (obj.event) {
                     case 'btn-AddLine':
                         //table.cache["mainTable"].push(AddRow[rows]);
@@ -311,7 +407,7 @@
                         option.data = table.cache["mainTable"];
                         table.render(option);
                         rows++;
-                        layer.msg('澧炲姞涓�琛屾寜閽紒')
+                        //layer.msg('澧炲姞涓�琛屾寜閽紒')
                         break;
                     case 'btn-CopyLine':
                         var copydata = JSON.stringify(data);
@@ -2308,7 +2404,7 @@
                             var data = result.data.h_v_QC_Edit_POStockInCheckBillList[0];
                             form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                                 "HBillNo": data.鍗曟嵁鍙�
-                                , "HDate": data.鏃ユ湡
+                                , "HDate": formatDate(data.鏃ユ湡)
                                 , "HSupID": data.HSupID
                                 , "HSupName": data.渚涘簲鍟嗗悕绉�
                                 , "HMater": data.浜у搧鍚嶇О
@@ -2501,7 +2597,17 @@
                 }    
 
             })
+            function formatDate(date) {
+                var d = new Date(date),
+                    month = '' + (d.getMonth() + 1),
+                    day = '' + d.getDate(),
+                    year = d.getFullYear();
 
+                if (month.length < 2) month = '0' + month;
+                if (day.length < 2) day = '0' + day;
+
+                return [year, month, day].join('-');
+            }
             form.on('submit(Saver)', function (data) {//淇濆瓨
                 //debugger;
                 var sMainStr = JSON.stringify(data.field);
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_POStockInCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_POStockInCheckBillList.html"
index 8226a51..7db3ce2 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_POStockInCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_POStockInCheckBillList.html"
@@ -1,36 +1,23 @@
 锘�<!DOCTYPE html>
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>鏉ユ枡妫�楠屽崟鍒楄〃</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <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/zgqCustom/zgqCustom.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>
+
 </head>
 <body>
-    <div class="layui-card layadmin-header">
-        <div class="layui-breadcrumb" lay-filter="breadcrumb">
-            <a lay-href="">涓婚〉</a>
-            <!--<a><cite>閲囪喘璁㈠崟</cite></a>
-            <a><cite>閲囪喘璁㈠崟琛ㄦ牸</cite></a>
-            <a><cite>閲囪喘璁㈠崟琛ㄦ牸鐨勯噸杞�</cite></a>-->
-        </div>
-    </div>
-
-
     <div class="layui-fluid">
         <div class="layui-col-md12">
             <div class="layui-card" style="padding: 1px">
@@ -39,36 +26,41 @@
                         <div class="layui-collapse">
                             <div class="layui-colla-item">
                                 <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" style="width: 85px;">鍗曟嵁鍙�</label>
                                     <div class="layui-input-block" style="margin-left: 120px;">
                                         <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
-                                    </div>
-                                </div>
-                                <div class="layui-inline">
-                                    <label class="layui-form-label" style="width: 85px;">寮�濮嬫棩鏈�</label>
-                                    <div class="layui-input-block" style="margin-left: 120px;">
-                                        <input type="text" class="layui-input" name="HDate1" id="HDate1">
-                                    </div>
-                                </div>
-                                <div class="layui-inline">
-                                    <label class="layui-form-label" style="width: 85px;">缁撴潫鏃ユ湡</label>
-                                    <div class="layui-input-block" style="margin-left: 120px;">
-                                        <input type="text" class="layui-input" name="HDate2" id="HDate2">
                                     </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>
                         </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-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-form"></i>鍒犻櫎</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_PrintReport"><i class="layui-icon layui-icon-print"></i>棰勮</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><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-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="get_Exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
                             </div>
                         </script>
                     </form>
@@ -76,372 +68,316 @@
             </div>
         </div>
     </div>
-
-    <!--<script src="../../layuiadmin/layui/lay/modules/mobile/jquery-3.3.1.min.js"></script>-->
-
     <script>
-        var _cur_page = 1;
-        var sql = " ";
-        //var options = document.getElementById('HStatus').children;
-        function getUrlVars() {
-            var vars = [], hash;
-            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
-            for (var i = 0; i < hashes.length; i++) {
-                hash = hashes[i].split('=');
-                vars.push(hash[0]);
-                vars[hash[0]] = hash[1];
-            }
-            return vars;
-        }
-
-        function f_alert(sMsg) {
-            layer.alert(sMsg, { icon: 5 });
-            //layer.open({
-            //    type: 1
-            //  , offset: 'auto' //鍏蜂綋閰嶇疆鍙傝�冿細http://www.layui.com/doc/modules/layer.html#offset
-            //  , id: 'layerDemo' //闃叉閲嶅寮瑰嚭
-            //  , content: '<div style="padding: 20px 100px;">' + sMsg + '</div>'
-            //  , shade: 0 //涓嶆樉绀洪伄缃�
-            //  , yes: function () {
-            //      layer.closeAll();
-            //  }
-            //});
-        }
-        var params = getUrlVars();
-        var type = params[params[0]];
-        //switch (type) {
-        //    case "UnConfirm":
-        //        options[1].selected = true;
-        //        sql += " and 鐘舵�� like ^^%鏈‘璁�%^^";
-        //        //$("#HStatus").attr("disabled", true)
-        //        break;
-        //    case "ReConfirm":
-        //        options[2].selected = true;
-        //        sql += " and 鐘舵�� like ^^%宸茬‘璁�%^^";
-        //        sql += " and 鏈叧鑱旀暟閲� > 0";
-        //        break;
-        //    case "ReBack":
-        //        options[3].selected = true;
-        //        sql += " and 鐘舵�� like ^^%宸查┏鍥�%^^";
-        //        break;
-        //}
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
-            index: 'lib/index' //涓诲叆鍙fā鍧�
-        }).use(['index', 'form', 'laydate', 'code', 'table', 'element', 'layer'], function () {
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
-                , laydate = layui.laydate
                 , table = layui.table
                 , form = layui.form
-                , element = layui.element;
-            //甯歌鐢ㄦ硶
-            laydate.render({
-                elem: '#HDate1'
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+            var option = [];
+            var sWhere = "";
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+            //#endregion
+
+            //#region 澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //鏂板鎸夐挳
+                    case 'set_AddNew': set_AddNew();
+                        break;
+                    //缂栬緫鎸夐挳
+                    case 'set_ShowBill': set_ShowBill();
+                        break;
+                    //鍒犻櫎鎸夐挳
+                    case 'set_DeleteBill': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    ////瀹℃牳鎸夐挳
+                    //case 'btn-Audit': set_CheckBill();
+                    //    break;
+                    ////鍙嶅鏍告寜閽�
+                    //case 'btn-DeAudit': set_AbandonCheck();
+                    //    break;
+                    ////棰勮鎸夐挳
+                    //case 'get_PrintReport': get_PrintReport();
+                    //    break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                };
             });
-            laydate.render({
-                elem: '#HDate2'
-            });
-            //layui.code();
-            RoadHBillNo(sql);
-            layer.load(3)
-            $("#HDate1").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
-            $("#HDate2").val(Format(new Date(), "yyyy-MM-dd"));
-            //鏂规硶绾ф覆鏌�
-            table.render({
-                elem: '#mainTable'
-                , dateType: 'json'
-                , colFilterRecord: true//鏄惁寮�鍚瓧娈电瓫閫夌殑璁板繂鍔熻兘
-                , data: []
-                //  , url:  GetWEBURL()+'GetPOOrderBill'
-                , toolbar: '#toolbarDemo' //寮�鍚ご閮ㄥ伐鍏锋爮锛屽苟涓哄叾缁戝畾宸︿晶妯℃澘
-                , defaultToolbar: ['filter', 'exports', 'print']
-                // , where: { msg: "", NowPage: 1, OnePage: 10 }
-                , cellMinWidth: 100
-                , cols: [[
-                    { type: 'checkbox', fixed: 'left' }
-                    , { field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true }
-                    , { field: 'hsubid', title: 'hsubid', hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 120 }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
-                    , { field: '琛ㄥご澶囨敞 ', title: '琛ㄥご澶囨敞', width: 105 }
-                    , { field: '渚涘簲鍟嗗悕绉�', title: '渚涘簲鍟嗗悕绉�' }
-                    , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
-                    , { field: '浜у搧鍐呯爜', title: '浜у搧鍐呯爜' }
-                    , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
-                    , { field: '浜у搧鍨嬪彿', title: '浜у搧鍨嬪彿', width: 115 }
-                    , { field: '妫�楠屽憳浠g爜', title: '妫�楠屽憳浠g爜', width: 115 }
-                    , { field: '妫�楠屽憳鍚嶇О', title: '妫�楠屽憳鍚嶇О' }
-                    , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 160 }
-                    , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 160 }
-                    , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 160 }
-                    , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 160 }
-                    , { field: '淇敼浜�', title: '淇敼浜�', width: 160 }
-                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 160 }
-                    , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 160 }
-                    , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 160 }
-                    , { field: '浣滃簾浜�', title: '浣滃簾浜�', hide: true, width: 160 }
-                    , { field: '浣滃簾鏃ユ湡 ', title: '浣滃簾鏃ユ湡', width: 215 }
-                    , { field: '鍗曟嵁绫诲瀷 ', title: '鍗曟嵁绫诲瀷 ', width: 115 }
-                ]]
-                //, skin: 'row' //琛ㄦ牸椋庢牸
-                // , even: true
-                , page: true //鏄惁鏄剧ず鍒嗛〉
-                , limits: [10, 20, 50, 100]
-                , limit: 50 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
-                //, height: 500
-                , done: function (res, curr, count) {
-                    _cur_page = curr;
-                    layer.closeAll("loading");
-                }
-            });
+            //#endregion
+
             //#region 閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
+                //娓呯┖杩囨护鏉′欢
                 set_ClearQuery();
             });
             //#endregion
 
             //#region 鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
-                get_FastQuery();
+                get_FastQuery(table, option);
             });
             //#endregion
 
-            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
-            function set_ClearQuery() {
-                $("#HBillNo").val("");
-                $("#HNumber").val("");
-                $("#HName").val("");
-                $("#HDate1").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
-                $("#HDate2").val(Format(new Date(), "yyyy-MM-dd"));
-                sqlWhere = "";
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
             }
             //#endregion
-            //澶村伐鍏锋爮浜嬩欢
-            table.on('toolbar(mainTable)', function (obj) {
-                var checkStatus = table.checkStatus(obj.config.id);
-                switch (obj.event) {
-                    case 'btn-getCheckData':
-                        var data = checkStatus.data;
-                        layer.alert(JSON.stringify(data));
-                        break;
-                    case 'btn-Edit':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var hID = data[0].hmainid.toString();
-                            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                            layer.open({
-                                type: 2
-                                , area: ['100%', '100%']
-                                , title: '缂栬緫鏉ユ枡妫�楠屽崟'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: '../鏉ユ枡妫�楠屽崟/QC_Add_Edit_POStockInCheckBill.html?hID=' + hID
-                                , resize: false
-                                , cancel: function () {
-                                    //$(".layui-btn").removeClass("layui-btn-disabled");
-                                }
-                            })
 
-                        } else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                        }
-
-                        break;
-                    case 'btn-Delete':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var InterID = data[0].hmainid.toString();
-                            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                                var index = layer.load();
-                                //閫昏緫鍒犻櫎鏂规硶
-                                $.ajax({
-                                    url: GetWEBURL() + 'DeltetQC_POStockInCheck',
-                                    type: "GET",
-                                    data: { "HInterID": InterID },
-                                    success: function (result) {
-                                        console.log('gouba' + result);
-                                        if (result.count == 1) {
-                                            layer.msg(result.Message, { icon: 1 }, function () {
-                                                // 寰楀埌frame绱㈠紩
-                                                var index = layer.getFrameIndex(window.name);
-                                                //鍏抽棴褰撳墠frame
-                                                layer.close(index);
-                                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                                window.location.reload();
-                                            });
-
-                                        } else {
-                                            layer.alert(result.code + result.Message, { icon: 5 });
-                                            layer.close(index);
-                                        }
-                                    }, error: function () {
-                                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                                        layer.close(index);
-                                    }
-                                });
-                            })
-                        }
-                        else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                        }
-                        break;
-                    case 'get_Refresh':
-                        set_ClearQuery();
-                        RoadHBillNo(sqlWhere);
-                        break;
-                    case 'get_Exit':
-                        Pub_Close(2);
-                        break;
-
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
+            $("#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
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true }
+                        , { field: 'hsubid', title: 'hsubid', hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 170 }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
+                        , { field: '琛ㄥご澶囨敞 ', title: '琛ㄥご澶囨敞', width: 105 }
+                        , { field: '渚涘簲鍟嗗悕绉�', title: '渚涘簲鍟嗗悕绉�', width: 105}
+                        , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 105}
+                        , { field: '浜у搧鍐呯爜', title: '浜у搧鍐呯爜' }
+                        , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
+                        , { field: '浜у搧鍨嬪彿', title: '浜у搧鍨嬪彿', width: 115 }
+                        , { field: '妫�楠屽憳浠g爜', title: '妫�楠屽憳浠g爜', width: 115 }
+                        , { field: '妫�楠屽憳鍚嶇О', title: '妫�楠屽憳鍚嶇О', width: 115 }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 160 }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 160 }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 160 }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 160 }
+                        , { field: '淇敼浜�', title: '淇敼浜�', width: 160 }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 160 }
+                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 160 }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 160 }
+                        , { field: '浣滃簾浜�', title: '浣滃簾浜�', hide: true, width: 160 }
+                        , { field: '浣滃簾鏃ユ湡 ', title: '浣滃簾鏃ユ湡', width: 215 }
+                        , { field: '鍗曟嵁绫诲瀷 ', title: '鍗曟嵁绫诲瀷 ', width: 115 }
+                    ]]
                 };
-            });
+            }
 
+            //var index = layer.load(0, { shade: false });
 
-
-            ///鍔犺浇鏄剧ず鏁版嵁
-            function RoadHBillNo(sqlWhere) {
+            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            function get_Display(sWhere) {
                 var ajaxLoad = layer.load();
-                where = sqlWhere;
                 $.ajax({
-                    type: "get",
-                    url: GetWEBURL() + "/QC_Management/MES_QC_POStockInCheckBillList_Json",
-                    async: true,
-                    data: { "sqlWhere": sqlWhere },//"HSupNo": sessionStorage["HUserName"],
-                    success: function (result) {
-                        if (result.count == 1) {
-                            ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
-                            table.reload('mainTable', {
-                                data: ajaxReturnData
-                                , height: 'full-10'
-                                , page: {
-                                    curr: _cur_page //蹇呴』浠庣 1 椤靛紑濮�
-                                }
-                                , loading: false
-                                , done: function (index, res) {
-
-                                }
-                            });
+                    url: GetWEBURL() + '/QC_Management/MES_QC_POStockInCheckBillList_Json',
+                    type: "GET",
+                    data: { "sqlWhere": sWhere },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
                             layer.close(ajaxLoad);
                         } else {
                             layer.close(ajaxLoad);
-                            layer.alert(result.code + result.Message, { icon: 5 });
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
-
-                    },
-                    error: function (result) {
+                    }, error: function () {
                         layer.close(ajaxLoad);
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-            };
-            //#region 蹇�熻繃婊�
-            function get_FastQuery() {
-                var sqlWhere = " and 1=1 ";
-                //if ($("#HStatus").val() != "")
-                //    sqlWhere += " and 鐘舵�� like ^^%" + $("#HStatus").val() + "%^^";
-                var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
-                var HNumber = $("#HNumber").val();//鐗╂枡浠g爜
-                var HName = $("#HName").val();//鐗╂枡鍚嶇О
-                var HModel = $("#HModel").val();//瑙勬牸鍨嬪彿
-                var HDate1 = $("#HDate1").val();//寮�濮嬫棩鏈�
-                var HDate2 = $("#HDate2").val();//缁撴潫鏃ユ湡
+            }
 
-                if (HBillNo)
-                    sqlWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
-                if (HNumber)
-                    sqlWhere += " and 鐗╂枡浠g爜 like '%" + HNumber + "%'";
-                if (HName)
-                    sqlWhere += " and 鐗╂枡鍚嶇О like '%" + HName + "%'";
-                if (HModel)
-                    sqlWhere += " and 瑙勬牸鍨嬪彿 like '%" + HModel + "%'";
-                if (HDate1) {
-                    sqlWhere += " and 鏃ユ湡 >= '" + HDate1 + "'";
-                }
-                if (HDate2) {
-                    sqlWhere += " and 鏃ユ湡 <= '" + HDate2 + "'";
-                }
-                var Time = $("#Time").val();
-                var dd = new Date();
-                var dt;
-                switch (Time) {
-                    case 1: dd = new Date(dd.setDate(dd.getDate() + 7));
-                    case 2: dd = new Date(dd.setDate(dd.getDate() + 14));
-                    case 3: dd = new Date(dd.setMonth(dd.getMonth() + 1));
-                    case 4: dd = new Date(dd.setMonth(dd.getMonth() + 2));
-                    case 5: dd = new Date(dd.setMonth(dd.getMonth() + 3));
-                    case 6: dd = new Date(dd.setMonth(dd.getMonth() + 6));
-                    case 7: dd = new Date(dd.setMonth(dd.getMonth() + 12));
-                    default: dd = new Date(dd.setDate(dd.getDate()));
-                }
-                dt = dd.getFullYear().toString();
-                if (dd.getMonth() + 1 < 10) {
-                    dt = dt + "-0" + (dd.getMonth() + 1).toString();
-                }
-                else {
-                    dt = dt + "-0" + (dd.getMonth() + 1).toString();
-                }
-                if (dd.getDate() < 10) {
-                    dt = dt + "-0" + dd.getDate().toString();
-                }
-                else {
-                    dt = dt + "-" + dd.getDate().toString();
-                }
-                //if (Time != 8) {
-                //    sqlWhere += " and 浜よ揣鏃ユ湡 <= ^^" + dt + "^^";
-                //}
-                sql = sqlWhere;
-                //浠庣涓�椤靛紑濮�
-                _cur_page = 1;
-                RoadHBillNo(sqlWhere);
-                sqlWhere = "";
+            ////閲嶇疆鎸夐挳
+            //form.on('submit(btnReSearch)', function (data) {
+            //    $("#HNumber").val("");
+            //    $("#HName").val("");
+            //    $("#btnSearch").click();
+            //});
+
+            //#region 鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '鏉ユ枡妫�楠屽崟-鏂板'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content:'../鏉ユ枡妫�楠屽崟/QC_Add_Edit_POStockInCheckBill.html?OperationType=1&linterid=&HSouceBillType='
+                })
             }
             //#endregion
-            var $ = layui.$, active = {
-                f_Query: function () { //鏌ヨ
 
-                },
-                f_Qrjq: function () { //鎺ュ彈
-
-                },
-                f_Bhjq: function () { //鎷掔粷
-
-                },
-                //JSreload: function () {
-                //    var demoReload = $('#test-table-demoReload');
-                //    //鎵ц閲嶈浇
-                //    table.JSreload('test-table-reload', {
-                //        page: {
-                //            curr: 1 //閲嶆柊浠庣 1 椤靛紑濮�
-                //        }
-                //      , where: {
-                //          key: {
-                //              id: demoReload.val()
-                //          }
-                //      }
-                //    });
-                //}
-            };
-            //閫�鍑烘寜閽�
-            form.on('submit(get_Exit)', function () {
-                if (OperationType == 1) {
-                    Pub_Close(2);
+            //#region 缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0];
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '鏉ユ枡妫�楠屽崟-缂栬緫'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content:'../鏉ユ枡妫�楠屽崟/QC_Add_Edit_POStockInCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
                 }
-                else if (OperationType == 2) {
-                    Pub_Close(1);
+            }
+            //#endregion
+
+            //#region 鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HItemID = data[0];
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        //閫昏緫鍒犻櫎鏂规硶
+                        $.ajax({
+                            url: GetWEBURL() + 'DeltetQC_POStockInCheck',
+                            type: "GET",
+                            data: { "HItemID": HItemID },
+                            success: function (result) {
+                                console.log('gouba' + result);
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(wait);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                layer.close(wait);
+                            }
+                        });
+                    })
                 }
-            })
-            $('.test-table-reload-btn .layui-btn').on('click', function () {
-                var type = $(this).data('type');
-                active[type] ? active[type].call(this) : '';
-            });
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+
+            }
+            //#endregion
+
+            //#region 娴忚
+            function get_PrintReport() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HItemID.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '璐ㄩ噺姹囨姤鍗�-娴忚'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../鏉ユ枡妫�楠屽崟/QC_Add_Edit_POStockInCheckBill.html?OperationType=4&linterid=' + linterid + '&HSouceBillType='
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹祻瑙堬紒');
+                }
+            }
+            //#endregion
+
+
+            //#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 + "'";
+                }
+                if (HDate1) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+                }
+                if (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+            //#region 閲嶇疆杩囨护鏉′欢
+            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("");
+                $("#HNumber").val("");
+                $("#HName").val("");
+                sWhere = "";
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                set_ClearQuery();
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            ////#region 娓呯┖杩囨护鏉′欢
+            //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("");
+
+            //}
+            ////#endregion
+
         });
-    </script>
-</body>
 
-</html>
\ No newline at end of file
+                    //#endregion
+
+
+                    //laydate.render({
+                    //    elem: '#HDate'
+                    //    , type: 'datetime'
+                    //    , trigger: 'click'
+                    //    , format:'yyyy-MM-dd HH:mm'
+                    //});
+
+
+                    //浠ヤ笂鏄痩ayui妯″潡
+
+
+
+
+
+    </script>
+
+</body>
+</html>

--
Gitblit v1.9.1