From f1df9507055716714a29c0e2773c778a1e342305 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期五, 16 七月 2021 17:40:50 +0800
Subject: [PATCH] 20210716v1

---
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapInBillList.html     |    6 
 WebTM/views/Baseset/基础资料/Sc_ICMOBillListView.html          |  117 +-
 WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html            |   19 
 WebTM/views/车间管理/委外工序发出单/Cj_StationEntrustInBill.html      |   19 
 WebTM/Properties/PublishProfiles/JFTM.pubxml.user          |   24 
 WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html         |  124 ++-
 WebTM/views/车间管理/委外工序发出单/Cj_StationEntrustInBillList.html  |  406 +++++++----
 WebTM/views/Baseset/基础资料/Gy_MaterialList.html              |    1 
 WebTM/views/车间管理/委外工序接收单/Cj_StationEntrustOutBill.html     |   19 
 WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html             |   19 
 WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html        |  373 +++++++---
 WebTM/views/车间管理/工序进站接收单/Cj_StationInBillList.html         |  533 ++++++++-------
 WebTM/views/车间管理/委外工序接收单/Cj_StationEntrustOutBillList.html |  364 +++++++---
 13 files changed, 1,225 insertions(+), 799 deletions(-)

diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index b5df938..1027b11 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -1560,7 +1560,7 @@
       <publishTime>07/13/2021 17:09:13</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldScrapInBillList.html">
-      <publishTime>07/14/2021 21:30:44</publishTime>
+      <publishTime>07/14/2021 21:36:58</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldScrapOutBillList.html">
       <publishTime>07/13/2021 17:09:13</publishTime>
@@ -1581,7 +1581,7 @@
       <publishTime>06/15/2021 16:41:12</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBillList.html">
-      <publishTime>07/14/2021 21:06:33</publishTime>
+      <publishTime>07/15/2021 11:19:05</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBill_PDA.html">
       <publishTime>06/28/2021 15:13:43</publishTime>
@@ -1662,7 +1662,7 @@
       <publishTime>07/13/2021 17:09:13</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldScrapInBillList.html">
-      <publishTime>07/14/2021 21:30:44</publishTime>
+      <publishTime>07/14/2021 21:36:58</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldScrapOutBillList.html">
       <publishTime>07/13/2021 17:09:13</publishTime>
@@ -1683,7 +1683,7 @@
       <publishTime>06/15/2021 16:41:12</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBillList.html">
-      <publishTime>07/14/2021 21:06:33</publishTime>
+      <publishTime>07/15/2021 11:19:05</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapOutBillList.html">
       <publishTime>06/09/2021 13:43:29</publishTime>
@@ -2148,10 +2148,10 @@
       <publishTime>03/29/2021 10:48:22</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill.html">
-      <publishTime>07/13/2021 16:34:54</publishTime>
+      <publishTime>07/15/2021 21:41:00</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBillList.html">
-      <publishTime>06/18/2021 16:00:26</publishTime>
+      <publishTime>07/15/2021 21:44:42</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill_PDA.html">
       <publishTime>05/10/2021 10:30:50</publishTime>
@@ -2166,10 +2166,10 @@
       <publishTime>05/10/2021 10:30:53</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill.html">
-      <publishTime>06/18/2021 16:06:11</publishTime>
+      <publishTime>07/15/2021 21:02:13</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillList.html">
-      <publishTime>06/18/2021 11:29:17</publishTime>
+      <publishTime>07/15/2021 21:35:00</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆/MES_StationInBill.html">
       <publishTime>07/07/2021 10:49:01</publishTime>
@@ -2199,16 +2199,16 @@
       <publishTime>03/23/2021 14:14:38</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html">
-      <publishTime>07/14/2021 13:23:07</publishTime>
+      <publishTime>07/15/2021 17:14:49</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBillList.html">
-      <publishTime>07/14/2021 13:23:04</publishTime>
+      <publishTime>07/15/2021 20:48:38</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html">
-      <publishTime>07/14/2021 13:23:07</publishTime>
+      <publishTime>07/15/2021 17:14:49</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBillList.html">
-      <publishTime>07/14/2021 13:23:04</publishTime>
+      <publishTime>07/15/2021 20:48:38</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Qk_OutProcessList.html">
       <publishTime>03/23/2021 14:14:38</publishTime>
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialList.html"
index 4d5428a..91afb32 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialList.html"
@@ -63,6 +63,7 @@
                 , { field: 'HItemID', width: 150, title: '鐗╂枡ID', hide: true }
                 , { field: 'HNumber', width: 150, title: '鐗╂枡浠g爜' }
                 , { field: 'HName', width: 150, title: '鐗╂枡鍚嶇О', sort: true }
+                , { field: 'HModel', width: 150, title: '瑙勬牸鍨嬪彿' }
               ]]
               , page: true
             });
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView.html"
index 2909b14..c3705c6 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView.html"
@@ -60,70 +60,69 @@
               , cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
               , cols: [[
                   { type: 'radio' }
-                  , { field: 'hmainid', width: 150, title: 'hmainid', hide: true, sort: true }
+                  , { field: 'hmainid', width: 150, title: 'hmainid', hide: true }
+                  , { field: 'HEntryID', width: 150, title: 'HEntryID', hide: true }
+                  , { field: 'HEmpID', width: 150, title: 'HEmpID', hide: true }
+                  , { field: 'HBomID', width: 150, title: 'HBomID', hide: true }
+                  , { field: 'HRoutingInterID', width: 150, title: 'HRoutingInterID', hide: true }
+                  , { field: 'hsubid', width: 150, title: 'hsubid', hide: true }
+                  , { field: 'HMaterID', width: 150, title: 'HMaterID', hide: true }
+                  , { field: 'HUnitID', width: 150, title: 'HUnitID', hide: true }
+                  , { field: 'HAuxPropID', width: 150, title: 'HAuxPropID', hide: true }
+                  , { field: 'HDeptID', width: 150, title: 'HDeptID', hide: true }
+                  , { field: 'HEntryCusID', width: 150, title: 'HEntryCusID', hide: true }
+                  , { field: 'HCenterID', width: 150, title: 'HCenterID', hide: true }
+                  , { field: '鏃ユ湡', width: 150, title: '鏃ユ湡' }
+                  , { field: '鍗曟嵁鍙�', width: 150, title: '鍗曟嵁鍙�' }
                   , { field: '璁㈠崟璺熻釜鍙�', width: 150, title: '璁㈠崟璺熻釜鍙�' }
-                  , { field: '鐢熶骇璁㈠崟鍙�', width: 150, title: '鐢熶骇璁㈠崟鍙�' }
-                  , { field: 'hdeptid', width: 150, title: 'hdeptid', hide: true }
-                  , { field: '鐢熶骇杞﹂棿浠g爜', width: 150, title: '鐢熶骇杞﹂棿浠g爜' }
-                  , { field: '鐢熶骇杞﹂棿鍚嶇О', width: 150, title: '鐢熶骇杞﹂棿鍚嶇О' }
-                  , { field: 'hmaterid', width: 150, title: 'hmaterid', hide: true }
-                  , { field: '鐗╂枡浠g爜', width: 150, title: '鐗╂枡浠g爜' }
-                  , { field: '鐗╂枡鍚嶇О', width: 150, title: '鐗╂枡鍚嶇О' }
-                  , { field: '瑙勬牸鍨嬪彿', width: 150, title: '瑙勬牸鍨嬪彿' }
-                  , { field: '鎵瑰彿', width: 150, title: '鎵瑰彿' }
-                  , { field: '娴佽浆鍗℃暟閲�', width: 150, title: '娴佽浆鍗℃暟閲�' }
-                  , { field: 'hunitid', width: 150, title: 'hunitid', hide: true }
-                  , { field: '璁¢噺鍗曚綅浠g爜', width: 150, title: '璁¢噺鍗曚綅浠g爜' }
-                  , { field: '璁¢噺鍗曚綅鍚嶇О', width: 150, title: '璁¢噺鍗曚綅鍚嶇О' }
+                  , { field: '鍗曟嵁绫诲瀷', width: 150, title: '鍗曟嵁绫诲瀷' }
+                  , { field: '鐘舵��', width: 150, title: '鐘舵��' }
+                  , { field: '涓氬姟鍛樹唬鐮�', width: 150, title: '涓氬姟鍛樹唬鐮�' }
+                  , { field: '涓氬姟鍛�', width: 150, title: '涓氬姟鍛�' }
+                  , { field: 'BOM鍗曠紪鐮�', width: 150, title: 'BOM鍗曠紪鐮�' }
+                  , { field: '宸ヨ壓璺嚎浠g爜', width: 150, title: '宸ヨ壓璺嚎浠g爜' }
+                  , { field: '宸ヨ壓璺嚎', width: 150, title: '宸ヨ壓璺嚎' }
+                  , { field: '榻愬鏁伴噺', width: 150, title: '榻愬鏁伴噺' }
                   , { field: '璁″垝鐢熶骇鏁伴噺', width: 150, title: '璁″垝鐢熶骇鏁伴噺' }
-                  , { field: 'hbomid', width: 150, title: 'hbomid' }
-                  , { field: 'BOM鍗曚唬鐮�', width: 150, title: 'BOM鍗曚唬鐮�' }
-                  , { field: 'HRoutingID', width: 150, title: 'HRoutingID' }
-                  , { field: '璁″垝寮�宸ユ棩鏈�', width: 150, title: '璁″垝寮�宸ユ棩鏈�' }
-                  , { field: '璁″垝瀹屽伐鏃ユ湡', width: 150, title: '璁″垝瀹屽伐鏃ユ湡' }
-                  , { field: 'hsubid', width: 150, title: 'hsubid' }
-                  , { field: '宸ュ簭鍙�', width: 150, title: '宸ュ簭鍙�' }
-                  , { field: 'hprocid', width: 150, title: 'hprocid' }
-                  , { field: '宸ュ簭浠g爜', width: 150, title: '宸ュ簭浠g爜' }
-                  , { field: '宸ュ簭', width: 150, title: '宸ュ簭' }
-                  , { field: '鍔犲伐璇存槑', width: 150, title: '鍔犲伐璇存槑' }
-                  , { field: 'HWorkCenterID', width: 150, title: 'HWorkCenterID' }
+                  , { field: '琛ㄥご澶囨敞', width: 150, title: '琛ㄥご澶囨敞' }
+                  , { field: '浜у搧浠g爜', width: 150, title: '浜у搧浠g爜' }
+                  , { field: '浜у搧鍚嶇О', width: 150, title: '浜у搧鍚嶇О' }
+                  , { field: '瑙勬牸鍨嬪彿', width: 150, title: '瑙勬牸鍨嬪彿' }
+                  , { field: '璁¢噺鍗曚綅浠g爜', width: 150, title: '璁¢噺鍗曚綅浠g爜' }
+                  , { field: '璁¢噺鍗曚綅', width: 150, title: '璁¢噺鍗曚綅' }
+                  , { field: '杈呭姪灞炴��', width: 150, title: '杈呭姪灞炴��' }
+                  , { field: '鎵瑰彿', width: 150, title: '鎵瑰彿' }
+                  , { field: '鐢熶骇浠诲姟鍗曟暟閲�', width: 150, title: '鐢熶骇浠诲姟鍗曟暟閲�' }
+                  , { field: '鍏ュ簱鏁伴噺', width: 150, title: '鍏ュ簱鏁伴噺' }
+                  , { field: '鐢熶骇杞﹂棿浠g爜', width: 150, title: '鐢熶骇杞﹂棿浠g爜' }
+                  , { field: '鐢熶骇杞﹂棿', width: 150, title: '鐢熶骇杞﹂棿' }
+                  , { field: '瀹㈡埛浠g爜', width: 150, title: '瀹㈡埛浠g爜' }
+                  , { field: '瀹㈡埛', width: 150, title: '瀹㈡埛' }
+                  , { field: '瀹㈡埛鍨嬪彿', width: 150, title: '瀹㈡埛鍨嬪彿' }
                   , { field: '宸ヤ綔涓績浠g爜', width: 150, title: '宸ヤ綔涓績浠g爜' }
                   , { field: '宸ヤ綔涓績', width: 150, title: '宸ヤ綔涓績' }
-                  , { field: 'HSourceID', width: 150, title: 'HSourceID' }
-                  , { field: '鐢熶骇璧勬簮浠g爜', width: 150, title: '鐢熶骇璧勬簮浠g爜' }
-                  , { field: '鐢熶骇璧勬簮', width: 150, title: '鐢熶骇璧勬簮' }
-                  , { field: 'HGroupID', width: 150, title: 'HGroupID' }
-                  , { field: '鐝粍浠g爜', width: 150, title: '鐝粍浠g爜' }
-                  , { field: '鐝粍', width: 150, title: '鐝粍' }
-                  , { field: 'HWorkerID', width: 150, title: 'HWorkerID' }
-                  , { field: '鎿嶄綔宸ヤ唬鐮�', width: 150, title: '鎿嶄綔宸ヤ唬鐮�' }
-                  , { field: 'HSupID', width: 150, title: 'HSupID' }
-                  , { field: '渚涘簲鍟�', width: 150, title: '渚涘簲鍟�' }
-                  , { field: '渚涘簲鍟嗕唬鐮�', width: 150, title: '渚涘簲鍟嗕唬鐮�' }
-                  , { field: '濮斿鏍囪', width: 150, title: '濮斿鏍囪' }
-                  , { field: '宸ヨ壓鍙傛暟', width: 150, title: '宸ヨ壓鍙傛暟' }
-                  , { field: '鍥剧焊缂栧彿', width: 150, title: '鍥剧焊缂栧彿' }
-                  , { field: '鏈伐搴忕‘璁よ褰�', width: 150, title: '鏈伐搴忕‘璁よ褰�' }
-                  , { field: '鎿嶄綔宸�', width: 150, title: '鎿嶄綔宸�' }
-                  , { field: '鍔犲伐鍗曚环', width: 150, title: '鍔犲伐鍗曚环' }
-                  , { field: '鑹巼', width: 150, title: '鑹巼' }
-                  , { field: '绱鑹巼', width: 150, title: '绱鑹巼' }
-                  , { field: '瓒呴姣斾緥', width: 150, title: '瓒呴姣斾緥' }
-                  , { field: '鏈�楂樹笂闄�', width: 150, title: '鏈�楂樹笂闄�' }
-                  , { field: 'HBillType', width: 150, title: 'HBillType' }
+                  , { field: '璁″垝璺熻釜鍙�', width: 150, title: '璁″垝璺熻釜鍙�' }
+                  , { field: '璁″垝寮�宸ユ棩鏈�', width: 150, title: '璁″垝寮�宸ユ棩鏈�' }
+                  , { field: '璁″垝瀹屽伐鏃ユ湡', width: 150, title: '璁″垝瀹屽伐鏃ユ湡' }
+                  , { field: '鏈�杩熷紑宸ユ棩鏈�', width: 150, title: '鏈�杩熷紑宸ユ棩鏈�' }
+                  , { field: '鏈�杩熷畬宸ユ棩鏈�', width: 150, title: '鏈�杩熷畬宸ユ棩鏈�' }
                   , { field: '鍏宠仈鏁伴噺', width: 150, title: '鍏宠仈鏁伴噺' }
-                  , { field: 'HEntryID', width: 150, title: 'HEntryID' }
-                  , { field: '涓嬮亾娴佽浆宸ュ簭', width: 150, title: '涓嬮亾娴佽浆宸ュ簭' }
-                  , { field: '浜у搧CODE', width: 150, title: '浜у搧CODE' }
-                  , { field: '閿�鍞鍗曞彿', width: 150, title: '閿�鍞鍗曞彿' }
-                  , { field: '瀹㈡埛绠�绉�', width: 150, title: '瀹㈡埛绠�绉�' }
-                  , { field: '瀹㈡埛瑕佹眰鏉愭枡鎴愬垎', width: 150, title: '瀹㈡埛瑕佹眰鏉愭枡鎴愬垎' }
-                  , { field: '棰勮鍑鸿揣鏃ユ湡', width: 150, title: '棰勮鍑鸿揣鏃ユ湡' }
-                  , { field: '浜у搧鍚嶇О', width: 150, title: '浜у搧鍚嶇О' }
-                  , { field: '瀹㈡埛鍚嶇О', width: 150, title: '瀹㈡埛鍚嶇О' }
-                  , { field: '鐢熶骇澶囨敞', width: 150, title: '鐢熶骇澶囨敞' }
-                  , { field: '閲嶈鎻愮ず', width: 150, title: '閲嶈鎻愮ず' }
+                  , { field: '婧愬崟鍗曞彿', width: 150, title: '婧愬崟鍗曞彿' }
+                  , { field: '婧愬崟涓诲唴鐮�', width: 150, title: '婧愬崟涓诲唴鐮�' }
+                  , { field: '婧愬崟瀛愬唴鐮�', width: 150, title: '婧愬崟瀛愬唴鐮�' }
+                  , { field: '鏈叧鑱旀暟閲�', width: 150, title: '鏈叧鑱旀暟閲�' }
+                  , { field: '鍒跺崟浜�', width: 150, title: '鍒跺崟浜�' }
+                  , { field: '鍒跺崟鏃ユ湡', width: 150, title: '鍒跺崟鏃ユ湡' }
+                  , { field: '瀹℃牳浜�', width: 150, title: '瀹℃牳浜�' }
+                  , { field: '瀹℃牳鏃ユ湡', width: 150, title: '瀹℃牳鏃ユ湡' }
+                  , { field: '淇敼浜�', width: 150, title: '淇敼浜�' }
+                  , { field: '淇敼鏃ユ湡', width: 150, title: '淇敼鏃ユ湡' }
+                  , { field: '鍏抽棴浜�', width: 150, title: '鍏抽棴浜�' }
+                  , { field: '鍏抽棴鏃ユ湡', width: 150, title: '鍏抽棴鏃ユ湡' }
+                  , { field: '浣滃簾浜�', width: 150, title: '浣滃簾浜�' }
+                  , { field: '浣滃簾鏃ユ湡', width: 150, title: '浣滃簾鏃ユ湡' }
+                  , { field: '琛屽叧闂汉', width: 150, title: '琛屽叧闂汉' }
+                  , { field: '鍏抽棴绫诲瀷', width: 150, title: '鍏抽棴绫诲瀷' }
               ]]
               , page: true
             });
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBillList.html"
index 8efebae..4cef348 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBillList.html"
@@ -125,6 +125,8 @@
             var Name = "MouldScrapInHouseCellWidth";
             //鍒濆鍖栬〃鏍�
             set_InitGrid();
+            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            get_Display(sWhere);
 
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
@@ -156,8 +158,6 @@
                 };
             });
 
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            get_Display(sWhere);
 
             //閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
@@ -256,7 +256,7 @@
                             layer.close(wait);
                         } else {
                             layer.close(wait);
-                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                            layer.alert(data1.Message, { icon: 5 });
                         }
                     }, error: function () {
                         layer.close(wait);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html"
index 9773ed73..7af17d6 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html"
@@ -315,7 +315,13 @@
             //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
             $("#HBarCode").focus();
 
-
+            /*鍥哄畾浠g爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
+            /* 1.鏃犳簮鍗曟柊澧�
+             * 2.鏈夋簮鍗曟柊澧�
+             * 3.缂栬緫
+             * 4.娴忚
+             * 5.鍙樻洿
+             */
             //鑾峰彇鍙傛暟
             function getUrlVars() {
                 var vars = [], hash;
@@ -328,12 +334,13 @@
                 return vars;
             }
             var params = getUrlVars();
-            var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
-            var HBillNo = params[params[1]];  //鑾峰彇鍗曟嵁鍙�
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HBillNo = params[params[2]];  //鑾峰彇鍗曟嵁鍙�
+            /*鍥哄畾浠g爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
 
             //鍒ゆ柇鏄惁鏂板
-            if (linterid == null || linterid == 0) {
+            if (OperationType == 1) {
                 $("#HInterID").val("");
                 $("#HBillNo").val("");
                 //鑾峰彇鏈�澶у崟鎹彿
@@ -349,7 +356,7 @@
                     }
                 });
             }
-            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+            else if (OperationType == 3) {
                 $("#eventType").val("Modify");
                 RoadBillMain(linterid);
                 //RoadBillSub(linterid);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBillList.html"
index a6e1308..def499b 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBillList.html"
@@ -1,15 +1,19 @@
 锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<title>濮斿宸ュ簭鍙戝嚭鍗曞垪琛�</title>
+    <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, 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/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>
+
 </head>
 <body>
     <div class="layui-fluid">
@@ -21,33 +25,63 @@
                             <div class="layui-colla-item">
                                 <div class="layui-colla-title layui-inline">
                                     <div class="layui-inline">
-                                        <span></span>
+                                        <span>鏇村</span>
                                     </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">
+                                    <label class="layui-form-label">鐘舵��</label>
+                                    <div class="layui-input-block">
+                                        <select name="HStatus" lay-filter="HStatus" style="width:190px;">
+                                            <option value="-1" selected="selected">鍏ㄩ儴</option>
+                                            <option value="0">鏈鏍�</option>
+                                            <option value="1">宸插鏍�</option>
+                                            <option value="2">宸插叧闂�</option>
+                                        </select>
+                                    </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>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                 </button>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
-
+                                <div class="layui-colla-content">
+                                    <div class="layui-inline">
+                                        <div class="layui-inline">
+                                            <span>鍏朵粬鏉′欢></span>
+                                        </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>
                             </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-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-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="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print" id="btn-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="btn-Cell"><i class="layui-icon layui-icon-ok"></i>淇濆瓨鍒楀</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="btn-RefreshCell"><i class="layui-icon layui-icon-refresh"></i>榛樿鍒楀</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Exit" id="btn-Exit">閫�鍑�</button>
                             </div>
                         </script>
                     </form>
@@ -55,15 +89,6 @@
             </div>
         </div>
     </div>
-    <script type="text/html" id="toolBar">
-        <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>
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -78,137 +103,239 @@
                 , element = layui.element
                 , laypage = layui.laypage
                 , laydate = layui.laydate
+            //鍏敤鍙橀噺
             var sWhere = "";
-
-            var option = {
-                elem: '#mainTable'
-                //, toolbar: '#toolbarDemo'
-                //, height: 'full-50'
-                , page: true
-                , cellMinWidth: 90
-                , cols: [[
-                    { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡' }
-                    , { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�' }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
-                    , { field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�' }
-                    , { field: '娴佽浆鍗″彿', title: '娴佽浆鍗″彿' }
-                    , { field: 'HSupID', title: 'HSupID', hide: true }
-                    , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
-                    , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
-                    , { field: 'HMaterID', title: 'HMaterID', hide: true }
-                    , { field: '浜у搧浠g爜', title: '浜у搧浠g爜' }
-                    , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
-                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
-                    , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅' }
-                    , { field: '娴佹按鍙�', title: '娴佹按鍙�' }
-                    , { field: 'HProcID', title: 'HProcID', hide: true }
-                    , { field: '宸ュ簭浠g爜', title: '宸ュ簭浠g爜' }
-                    , { field: '宸ュ簭', title: '宸ュ簭' }
-                    , { field: '鍙戝嚭鏁伴噺', title: '鍙戝嚭鏁伴噺' }
-                    , { field: '鍙戝嚭鏃堕棿', title: '鍙戝嚭鏃堕棿' }
-                    , { field: '澶囨敞', title: '澶囨敞' }
-                    , { field: '鏄惁鎵撳嵃', title: '鏄惁鎵撳嵃' }
-                    , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
-                    , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
-                    , { field: '淇敼浜�', title: '淇敼浜�' }
-                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
-                    , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
-                    , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
-                    , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
-                    , { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
-                    , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' }
-                    , { toolbar: '#toolBar', title: '鎿嶄綔', width: 120, fixed: 'right' }
-                ]]
-                , text: {
-                    none: '鏆傛棤鐩稿叧鏁版嵁锛�' //榛樿锛氭棤鏁版嵁銆傛敞锛氳灞炴�т负 layui 2.2.5 寮�濮嬫柊澧�
-                }
-            };
-
-            var index = layer.load(0, { shade: false });
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                url: GetWEBURL() + '/Cj_StationEntrustInBill/list',
-                type: "GET",
-                data: { "sWhere": sWhere },
-                success: function (data1) {
-                    if (data1.count == 1) {
-                        option.data = data1.data;
-                        table.render(option);
-                        layer.close(index);
-                    } else {
-                        layer.close(index);
-                        layer.alert(data1.Message, { icon: 5 });
-                    }
-                }, error: function () {
-                    layer.close(index);
-                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                }
-            });
+            var option = [];
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
 
             //閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
-                $("#HBillNo").val("");
-                $("#btnSearch").click();
+                set_ClearQuery();
             });
 
             //鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+
+            //鍒濆鍖栬〃鏍�
+            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, hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡' }
+                        , { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�' }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+                        , { field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�' }
+                        , { field: '娴佽浆鍗″彿', title: '娴佽浆鍗″彿' }
+                        , { field: 'HSupID', title: 'HSupID', hide: true }
+                        , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
+                        , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
+                        , { field: 'HMaterID', title: 'HMaterID', hide: true }
+                        , { field: '浜у搧浠g爜', title: '浜у搧浠g爜' }
+                        , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
+                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+                        , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅' }
+                        , { field: '娴佹按鍙�', title: '娴佹按鍙�' }
+                        , { field: 'HProcID', title: 'HProcID', hide: true }
+                        , { field: '宸ュ簭浠g爜', title: '宸ュ簭浠g爜' }
+                        , { field: '宸ュ簭', title: '宸ュ簭' }
+                        , { field: '鍙戝嚭鏁伴噺', title: '鍙戝嚭鏁伴噺' }
+                        , { field: '鍙戝嚭鏃堕棿', title: '鍙戝嚭鏃堕棿' }
+                        , { field: '澶囨敞', title: '澶囨敞' }
+                        , { field: '鏄惁鎵撳嵃', title: '鏄惁鎵撳嵃' }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
+                        , { field: '淇敼浜�', title: '淇敼浜�' }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
+                        , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
+                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' }
+                    ]]
+                    , text: {
+                        none: '鏃犳暟鎹紒'
+                    }
+                };
+                set_ClearQuery();
+                get_FastQuery();
+            }
+
+
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HBillNo").val("");
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+            }
+
+
+            //蹇�熻繃婊�
+            function get_FastQuery() {
+                var HStatus = $("select[name='HStatus']").val();//鐘舵��
                 var HBillNo = $("#HBillNo").val();
                 if (HBillNo) {
                     sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
                 }
+                if (HStatus) {
+                    switch (HStatus) {
+                        case '-1':   //鍏ㄩ儴
+                            sWhere += "";
+                            break;
+                        case '0':    //鏈鏍�
+                            sWhere += " and 瀹℃牳浜�=''";
+                            break;
+                        case '1':    //宸插鏍�
+                            sWhere += " and 瀹℃牳浜�<>''";
+                            break;
+                        case '2':    //宸插叧闂�
+                            sWhere += " and 鍏抽棴浜�<>''";
+                        default:
+                    }
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+
+
+            //鍔犺浇缃戞牸
+            function get_Display(sWhere) {
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                var wait = layer.load();
                 $.ajax({
-                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                     url: GetWEBURL() + '/Cj_StationEntrustInBill/list',
                     type: "GET",
                     data: { "sWhere": sWhere },
                     success: function (data1) {
-                        if (data1.count == 1) {
-                            option.data = data1.data;
-                            table.render(option);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        if (data1.count == 0) {
+                            option.data = [];
                         } else {
-                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                            option.data = data1.data;
                         }
+                        table.render(option);
+                        btnIs();
+                        layer.close(wait);
                     }, error: function () {
+                        layer.close(wait);
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+
+
+            //鍔熻兘鎸夐挳鏄惁绂佺敤鏂规硶锛屾瘡娆″姞杞借〃鏍奸兘瑕佽皟鐢�
+            function btnIs() {
+                //$('#btn-Add').addClass("layui-btn-disabled").attr("disabled", true);//鏂板鎸夐挳
+                $('#btn-Delete').addClass("layui-btn-disabled").attr("disabled", true);//鍒犻櫎鎸夐挳
+                $('#btn-Audit').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳
+                $('#btn-DeAudit').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽�
+                $('#btn-Print').addClass("layui-btn-disabled").attr("disabled", true);//棰勮鎸夐挳
+                $('#btn-Cell').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍒楀鎸夐挳
+                $('#btn-RefreshCell').addClass("layui-btn-disabled").attr("disabled", true);//榛樿鍒楀鎸夐挳
+                //$('#btn-Exit').addClass("layui-btn-disabled").attr("disabled", true);//閫�鍑烘寜閽�
+            }
+
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //鏂板
+                    case 'btn-Add': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'btn-Edit': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'btn-Delete': layer.msg('鍒犻櫎');
+                        break;
+                    //瀹℃牳
+                    case 'btn-Audit': set_CheckBill();
+                        break;
+                    //鍙嶅鏍�
+                    case 'btn-DeAudit': layer.msg('鍙嶅鏍革紒');
+                        break;
+                    //棰勮
+                    case 'btn-Cell': layer.msg('棰勮锛�');
+                        break;
+                    //淇濆瓨鍒楀
+                    case 'btn-Cell': layer.msg('淇濆瓨鍒楀锛�');
+                        break;
+                    //榛樿鍒楀
+                    case 'btn-RefreshCell': layer.msg('榛樿鍒楀锛�');
+                        break;
+                    //閫�鍑�
+                    case 'btn-Exit': get_Exit();
+                        break;
+                };
             });
 
-            //鐩戝惉琛ㄦ牸涓宸ュ叿浜嬩欢
-            table.on('tool(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
-                var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
-                    , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
-                if (layEvent === 'detail') {
-                    layer.msg('鏌ョ湅鎿嶄綔');
-                } else if (layEvent === 'del') {
-                    layer.msg('绂佹鍒犻櫎');
-                } else if (layEvent === 'edit') {
+
+            //鏂板鍗曟嵁
+            function set_AddNew() {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '濮斿宸ュ簭鍙戝嚭鍗�-鏂板'
+                    , shade: 0.6
+                    , maxmin: false
+                    , anim: 0
+                    , content: ['Cj_StationEntrustInBill.html?OperationType=' + 1 + '&linterid=' + 0 + '&HBillNo' + 0, 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        btnIs();
+                    }
+                    , end: function () {
+                        get_FastQuery(table, option);
+                    }
+                })
+            }
+
+
+            //缂栬緫鍗曟嵁
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
                     layer.open({
                         type: 2
                         , area: ['100%', '100%']
                         , title: '濮斿宸ュ簭鍙戝嚭鍗�-缂栬緫'
-                        , shade: 0.6 //閬僵閫忔槑搴�
-                        , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
-                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: ['Cj_StationEntrustInBill.html?linterid=' + data.HInterID + '&HBillNo=' + data.鍗曟嵁鍙�, 'yes']
+                        , shade: 0.6
+                        , maxmin: false
+                        , anim: 0
+                        , content: ['Cj_StationEntrustInBill.html?OperationType=' + 3 + '&linterid=' + data[0].HInterID + '&HBillNo=' + data[0].鍗曟嵁鍙�, 'yes']
                         , resize: false
                         , cancel: function () {
-                            $(".layui-btn").removeClass("layui-btn-disabled");
+                            btnIs();
+                        }
+                        , end: function () {
+                            get_FastQuery(table, option);
                         }
                     })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
                 }
-            });
+            }
 
-            //缂栬緫
-            table.on('edit(mainTable)', function (obj) { //娉細edit鏄浐瀹氫簨浠跺悕锛宼est鏄痶able鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
-                console.log(obj.value); //寰楀埌淇敼鍚庣殑鍊�
-                console.log(obj.field); //褰撳墠缂栬緫鐨勫瓧娈靛悕
-                console.log(obj.data); //鎵�鍦ㄨ鐨勬墍鏈夌浉鍏虫暟鎹�
-            });
+
+            //閫�鍑�
+            function get_Exit() {
+                parent.layui.admin.events.closeThisTabs();
+            }
+
+
+
+
+
+
 
 
             //浠ヤ笂鏄痩ayui妯″潡
@@ -217,42 +344,7 @@
 
 
 
-    </script>
-    <!--杩欓噷鏄脊鍑哄眰鐨勮〃鍗曚俊鎭�-->
-    <!--琛ㄥ崟鐨刬d鐢ㄤ簬琛ㄥ崟鐨勯�夋嫨锛宻tyle鏄湪鏈〉闅愯棌锛屽彧鏈夌偣鍑荤紪杈戞墠浼氬脊鍑�-->
-    <div class="layui-row" id="Update" style="display:none;">
-        <div class="layui-col-md10">
-            <form class="layui-form layui-from-pane" action="" style="margin-top:20px">
-                <div class="layui-form-item">
-                    <label class="layui-form-label">閲囬泦璁惧绫诲瀷</label>
-                    <div class="layui-input-block">
-                        <select name="eqptType" lay-filter="eqptType">
-                            <option value="0a0003biac">0a0003biac</option>
-                            <option value="0a0003ahup" selected="">0a0003ahup</option>
-                        </select>
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">eqptIdCode</label>
-                    <div class="layui-input-block">
-                        <input type="text" name="neweqptIdCode" required lay-verify="required" autocomplete="off" placeholder="璇疯緭鍏ラ噰闆嗚澶囧湴鍧�" class="layui-input">
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">eqptName</label>
-                    <div class="layui-input-block">
-                        <input type="text" name="neweqptName" required lay-verify="required" autocomplete="off" placeholder="璇疯緭鍏ラ噰闆嗚澶囧悕绉�" class="layui-input">
-                    </div>
-                </div>
 
-                <div class="layui-form-item" style="margin-top:40px">
-                    <div class="layui-input-block">
-                        <button class="layui-btn  layui-btn-submit " lay-submit="" lay-filter="demo11">纭淇敼</button>
-                        <button type="reset" class="layui-btn layui-btn-primary">閲嶇疆</button>
-                    </div>
-                </div>
-            </form>
-        </div>
-    </div>
+    </script>
 </body>
 </html>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
index ec0a594..ca05c01 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
@@ -342,6 +342,13 @@
             //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
             $("#HBarCode").focus();
 
+            /*鍥哄畾浠g爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
+            /* 1.鏃犳簮鍗曟柊澧�
+             * 2.鏈夋簮鍗曟柊澧�
+             * 3.缂栬緫
+             * 4.娴忚
+             * 5.鍙樻洿
+             */
             //鑾峰彇鍙傛暟
             function getUrlVars() {
                 var vars = [], hash;
@@ -354,12 +361,12 @@
                 return vars;
             }
             var params = getUrlVars();
-            var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
-            var HBillNo = params[params[1]];  //鑾峰彇鍗曟嵁鍙�
-
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HBillNo = params[params[2]];  //鑾峰彇鍗曟嵁鍙�
+            /*鍥哄畾浠g爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
             //鍒ゆ柇鏄惁鏂板
-            if (linterid == null || linterid == 0) {
+            if (OperationType == 1) {
                 $("#HInterID").val("");
                 $("#HBillNo").val("");
                 //鑾峰彇鏈�澶у崟鎹彿
@@ -375,7 +382,7 @@
                     }
                 });
             }
-            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+            else if (OperationType == 3) {
                 $("#eventType").val("Modify");
                 RoadBillMain(linterid);
                 //RoadBillSub(linterid);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBillList.html"
index ff8fc33..17648bf 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBillList.html"
@@ -1,15 +1,18 @@
 锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<title>濮斿宸ュ簭鎺ユ敹鍗曞垪琛�</title>
+    <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, 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/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>
 </head>
 <body>
     <div class="layui-fluid">
@@ -21,33 +24,63 @@
                             <div class="layui-colla-item">
                                 <div class="layui-colla-title layui-inline">
                                     <div class="layui-inline">
-                                        <span></span>
+                                        <span>鏇村</span>
                                     </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">
+                                    <label class="layui-form-label">鐘舵��</label>
+                                    <div class="layui-input-block">
+                                        <select name="HStatus" lay-filter="HStatus" style="width:190px;">
+                                            <option value="-1" selected="selected">鍏ㄩ儴</option>
+                                            <option value="0">鏈鏍�</option>
+                                            <option value="1">宸插鏍�</option>
+                                            <option value="2">宸插叧闂�</option>
+                                        </select>
+                                    </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>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                 </button>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
-
+                                <div class="layui-colla-content">
+                                    <div class="layui-inline">
+                                        <div class="layui-inline">
+                                            <span>鍏朵粬鏉′欢></span>
+                                        </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>
                             </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-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-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="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print" id="btn-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="btn-Cell"><i class="layui-icon layui-icon-ok"></i>淇濆瓨鍒楀</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="btn-RefreshCell"><i class="layui-icon layui-icon-refresh"></i>榛樿鍒楀</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Exit" id="btn-Exit">閫�鍑�</button>
                             </div>
                         </script>
                     </form>
@@ -55,14 +88,6 @@
             </div>
         </div>
     </div>
-    <script type="text/html" id="toolBar">
-        <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>
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -77,139 +102,236 @@
                 , element = layui.element
                 , laypage = layui.laypage
                 , laydate = layui.laydate
+            //鍏敤鍙橀噺
             var sWhere = "";
-
-            var option = {
-                elem: '#mainTable'
-                //, toolbar: '#toolbarDemo'
-                , height: 'full-50'
-                , page: true
-                , cellMinWidth: 90
-                , cols: [[
-                    { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡' }
-                    , { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�' }
-                    , { field: '閫佽揣鍗曞彿', title: '閫佽揣鍗曞彿' }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
-                    , { field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�' }
-                    , { field: '娴佽浆鍗″彿', title: '娴佽浆鍗″彿' }
-                    , { field: 'HSupID', title: 'HSupID', hide: true }
-                    , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
-                    , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
-                    , { field: 'HMaterID', title: 'HMaterID', hide: true }
-                    , { field: '浜у搧浠g爜', title: '浜у搧浠g爜' }
-                    , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
-                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
-                    , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅' }
-                    , { field: '娴佹按鍙�', title: '娴佹按鍙�' }
-                    , { field: 'HProcID', title: 'HProcID', hide: true }
-                    , { field: '宸ュ簭浠g爜', title: '宸ュ簭浠g爜' }
-                    , { field: '宸ュ簭', title: '宸ュ簭' }
-                    , { field: '鎺ユ敹鍚堟牸鏁伴噺', title: '鎺ユ敹鍚堟牸鏁伴噺' }
-                    , { field: '鎺ユ敹涓嶅悎鏍兼暟閲�', title: '鎺ユ敹涓嶅悎鏍兼暟閲�' }
-                    , { field: '鍚◣鍗曚环', title: '鍚◣鍗曚环' }
-                    , { field: '鍚◣閲戦', title: '鍚◣閲戦' }
-                    , { field: '鍏宠仈閲戦', title: '鍏宠仈閲戦' }
-                    , { field: '鎺ユ敹鏃堕棿', title: '鎺ユ敹鏃堕棿' }
-                    , { field: '澶囨敞', title: '澶囨敞' }
-                    , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
-                    , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
-                    , { field: '淇敼浜�', title: '淇敼浜�' }
-                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
-                    , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
-                    , { field: 'HDeptID', title: 'HDeptID', hide: true }
-                    , { field: '閮ㄩ棬', title: '閮ㄩ棬' }
-                    , { field: 'Hsubid', title: 'Hsubid', hide: true }
-                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
-                    , { toolbar: '#toolBar', title: '鎿嶄綔', width: 120, fixed: 'right' }
-                ]]
-            };
-
-            var index = layer.load(0, { shade: false });
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                url: GetWEBURL() + '/Cj_StationEntrustOutBill/list',
-                type: "GET",
-                data: { "sWhere": sWhere },
-                success: function (data1) {
-                    if (data1.count == 1) {
-                        option.data = data1.data;
-                        table.render(option);
-                        layer.close(index);
-                    } else {
-                        layer.close(index);
-                        layer.alert(data1.Message, { icon: 5 });
-                    }
-                }, error: function () {
-                    layer.close(index);
-                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                }
-            });
+            var option = [];
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
 
             //閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
-                $("#HBillNo").val("");
-                $("#btnSearch").click();
+                set_ClearQuery();
             });
 
             //鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+
+
+            //鍒濆鍖栬〃鏍�
+            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, hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡' }
+                        , { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�' }
+                        , { field: '閫佽揣鍗曞彿', title: '閫佽揣鍗曞彿' }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+                        , { field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�' }
+                        , { field: '娴佽浆鍗″彿', title: '娴佽浆鍗″彿' }
+                        , { field: 'HSupID', title: 'HSupID', hide: true }
+                        , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
+                        , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
+                        , { field: 'HMaterID', title: 'HMaterID', hide: true }
+                        , { field: '浜у搧浠g爜', title: '浜у搧浠g爜' }
+                        , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
+                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+                        , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅' }
+                        , { field: '娴佹按鍙�', title: '娴佹按鍙�' }
+                        , { field: 'HProcID', title: 'HProcID', hide: true }
+                        , { field: '宸ュ簭浠g爜', title: '宸ュ簭浠g爜' }
+                        , { field: '宸ュ簭', title: '宸ュ簭' }
+                        , { field: '鎺ユ敹鍚堟牸鏁伴噺', title: '鎺ユ敹鍚堟牸鏁伴噺' }
+                        , { field: '鎺ユ敹涓嶅悎鏍兼暟閲�', title: '鎺ユ敹涓嶅悎鏍兼暟閲�' }
+                        , { field: '鍚◣鍗曚环', title: '鍚◣鍗曚环' }
+                        , { field: '鍚◣閲戦', title: '鍚◣閲戦' }
+                        , { field: '鍏宠仈閲戦', title: '鍏宠仈閲戦' }
+                        , { field: '鎺ユ敹鏃堕棿', title: '鎺ユ敹鏃堕棿' }
+                        , { field: '澶囨敞', title: '澶囨敞' }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
+                        , { field: '淇敼浜�', title: '淇敼浜�' }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
+                        , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
+                        , { field: 'HDeptID', title: 'HDeptID', hide: true }
+                        , { field: '閮ㄩ棬', title: '閮ㄩ棬' }
+                        , { field: 'Hsubid', title: 'Hsubid', hide: true }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
+                    ]]
+                    , text: {
+                        none: '鏃犳暟鎹紒'
+                    }
+                };
+                set_ClearQuery();
+                get_FastQuery();
+            }
+
+
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HBillNo").val("");
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+            }
+
+            //蹇�熻繃婊�
+            function get_FastQuery() {
+                var HStatus = $("select[name='HStatus']").val();//鐘舵��
                 var HBillNo = $("#HBillNo").val();
                 if (HBillNo) {
                     sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
                 }
+                if (HStatus) {
+                    switch (HStatus) {
+                        case '-1':   //鍏ㄩ儴
+                            sWhere += "";
+                            break;
+                        case '0':    //鏈鏍�
+                            sWhere += " and 瀹℃牳浜�=''";
+                            break;
+                        case '1':    //宸插鏍�
+                            sWhere += " and 瀹℃牳浜�<>''";
+                            break;
+                        case '2':    //宸插叧闂�
+                            sWhere += " and 鍏抽棴浜�<>''";
+                        default:
+                    }
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+
+
+            //鍔犺浇缃戞牸
+            function get_Display(sWhere) {
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                var wait = layer.load();
                 $.ajax({
-                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                     url: GetWEBURL() + '/Cj_StationEntrustOutBill/list',
                     type: "GET",
                     data: { "sWhere": sWhere },
                     success: function (data1) {
-                        if (data1.count == 1) {
-                            option.data = data1.data;
-                            table.render(option);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        if (data1.count == 0) {
+                            option.data = [];
                         } else {
-                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                            option.data = data1.data;
                         }
+                        table.render(option);
+                        btnIs();
+                        layer.close(wait);
                     }, error: function () {
+                        layer.close(wait);
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+
+            //鍔熻兘鎸夐挳鏄惁绂佺敤鏂规硶锛屾瘡娆″姞杞借〃鏍奸兘瑕佽皟鐢�
+            function btnIs() {
+                //$('#btn-Add').addClass("layui-btn-disabled").attr("disabled", true);//鏂板鎸夐挳
+                $('#btn-Delete').addClass("layui-btn-disabled").attr("disabled", true);//鍒犻櫎鎸夐挳
+                $('#btn-Audit').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳
+                $('#btn-DeAudit').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽�
+                $('#btn-Print').addClass("layui-btn-disabled").attr("disabled", true);//棰勮鎸夐挳
+                $('#btn-Cell').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍒楀鎸夐挳
+                $('#btn-RefreshCell').addClass("layui-btn-disabled").attr("disabled", true);//榛樿鍒楀鎸夐挳
+                //$('#btn-Exit').addClass("layui-btn-disabled").attr("disabled", true);//閫�鍑烘寜閽�
+            }
+
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //鏂板
+                    case 'btn-Add': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'btn-Edit': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'btn-Delete': layer.msg('鍒犻櫎');
+                        break;
+                    //瀹℃牳
+                    case 'btn-Audit': set_CheckBill();
+                        break;
+                    //鍙嶅鏍�
+                    case 'btn-DeAudit': layer.msg('鍙嶅鏍革紒');
+                        break;
+                    //棰勮
+                    case 'btn-Cell': layer.msg('棰勮锛�');
+                        break;
+                    //淇濆瓨鍒楀
+                    case 'btn-Cell': layer.msg('淇濆瓨鍒楀锛�');
+                        break;
+                    //榛樿鍒楀
+                    case 'btn-RefreshCell': layer.msg('榛樿鍒楀锛�');
+                        break;
+                    //閫�鍑�
+                    case 'btn-Exit': get_Exit();
+                        break;
+                };
             });
 
-            //鐩戝惉琛ㄦ牸涓宸ュ叿浜嬩欢
-            table.on('tool(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
-                var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
-                    , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
-                if (layEvent === 'detail') {
-                    layer.msg('鏌ョ湅鎿嶄綔');
-                } else if (layEvent === 'del') {
-                    layer.msg('绂佹鍒犻櫎');
-                } else if (layEvent === 'edit') {
+
+            //鏂板鍗曟嵁
+            function set_AddNew() {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '濮斿宸ュ簭鎺ユ敹鍗�-鏂板'
+                    , shade: 0.6
+                    , maxmin: false
+                    , anim: 0
+                    , content: ['Cj_StationEntrustOutBill.html?OperationType=' + 1 + '&linterid=' + 0 + '&HBillNo' + 0, 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        btnIs();
+                    }
+                    , end: function () {
+                        get_FastQuery(table, option);
+                    }
+                })
+            }
+
+
+            //缂栬緫鍗曟嵁
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
                     layer.open({
                         type: 2
                         , area: ['100%', '100%']
                         , title: '濮斿宸ュ簭鎺ユ敹鍗�-缂栬緫'
-                        , shade: 0.6 //閬僵閫忔槑搴�
-                        , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
-                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: ['Cj_StationEntrustOutBill.html?linterid=' + data.HInterID + '&HBillNo=' + data.鍗曟嵁鍙�, 'yes']
+                        , shade: 0.6
+                        , maxmin: false
+                        , anim: 0
+                        , content: ['Cj_StationEntrustOutBill.html?OperationType=' + 3 + '&linterid=' + data[0].HInterID + '&HBillNo=' + data[0].鍗曟嵁鍙�, 'yes']
                         , resize: false
                         , cancel: function () {
-                            $(".layui-btn").removeClass("layui-btn-disabled");
+                            btnIs();
+                        }
+                        , end: function () {
+                            get_FastQuery(table, option);
                         }
                     })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
                 }
-            });
+            }
 
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
 
+            //閫�鍑�
+            function get_Exit() {
+                parent.layui.admin.events.closeThisTabs();
+            }
 
             //浠ヤ笂鏄痩ayui妯″潡
         });
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index cb0452f..08213ad 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -466,6 +466,14 @@
                 , element = layui.element;
             //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
             $("#HBarCode").focus();
+
+            /*鍥哄畾浠g爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
+            /* 1.鏃犳簮鍗曟柊澧�
+             * 2.鏈夋簮鍗曟柊澧�
+             * 3.缂栬緫
+             * 4.娴忚
+             * 5.鍙樻洿
+             */
             //鑾峰彇鍙傛暟
             function getUrlVars() {
                 var vars = [], hash;
@@ -478,12 +486,13 @@
                 return vars;
             }
             var params = getUrlVars();
-            var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
-            var HBillNo = params[params[1]];  //鑾峰彇鍗曟嵁鍙�
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HBillNo = params[params[2]];  //鑾峰彇鍗曟嵁鍙�
+            /*鍥哄畾浠g爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
 
             //鍒ゆ柇鏄惁鏂板
-            if (linterid == null || linterid == 0) {
+            if (OperationType == 1) {
                 $("#HInterID").val("");
                 $("#HBillNo").val("");
                 //鑾峰彇鏈�澶у崟鎹彿
@@ -499,7 +508,7 @@
                     }
                 });
             }
-            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+            else if (OperationType == 3) {
                 $("#eventType").val("Modify");
                 RoadBillMain(linterid);
                 //RoadBillSub(linterid);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index 4aee643..882ab23 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -1,15 +1,18 @@
 锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<title>宸ュ簭鍑虹珯姹囨姤鍗曞垪琛�</title>
+    <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, 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/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>
 </head>
 <body>
     <div class="layui-fluid">
@@ -21,33 +24,63 @@
                             <div class="layui-colla-item">
                                 <div class="layui-colla-title layui-inline">
                                     <div class="layui-inline">
-                                        <span></span>
+                                        <span>鏇村</span>
                                     </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">
+                                    <label class="layui-form-label">鐘舵��</label>
+                                    <div class="layui-input-block">
+                                        <select name="HStatus" lay-filter="HStatus" style="width:190px;">
+                                            <option value="-1" selected="selected">鍏ㄩ儴</option>
+                                            <option value="0">鏈鏍�</option>
+                                            <option value="1">宸插鏍�</option>
+                                            <option value="2">宸插叧闂�</option>
+                                        </select>
+                                    </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>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                 </button>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
-
+                                <div class="layui-colla-content">
+                                    <div class="layui-inline">
+                                        <div class="layui-inline">
+                                            <span>鍏朵粬鏉′欢></span>
+                                        </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>
                             </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-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-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="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print" id="btn-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="btn-Cell"><i class="layui-icon layui-icon-ok"></i>淇濆瓨鍒楀</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="btn-RefreshCell"><i class="layui-icon layui-icon-refresh"></i>榛樿鍒楀</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Exit" id="btn-Exit">閫�鍑�</button>
                             </div>
                         </script>
                     </form>
@@ -59,10 +92,6 @@
         <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>
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -78,135 +107,225 @@
                 , laypage = layui.laypage
                 , laydate = layui.laydate
                 , util = layui.util
+            //鍏敤鍙橀噺
             var sWhere = "";
-
-            var option = {
-                elem: '#mainTable'
-                //, toolbar: '#toolbarDemo'
-                //,height: 'full-50'
-                , page: true
-                , cellMinWidth: 90
-                , cols: [[
-                    { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
-                    , { field: '浠诲姟鍗�', title: '浠诲姟鍗�' }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
-                    , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿' }
-                    , { field: 'HProcID', title: 'HProcID', hide: true }
-                    , { field: '褰撳墠宸ュ簭浠g爜', title: '褰撳墠宸ュ簭浠g爜' }
-                    , { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭' }
-                    , { field: 'HMaterID', title: 'HMaterID', hide: true }
-                    , { field: '浜у搧浠g爜', title: '浜у搧浠g爜' }
-                    , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
-                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
-                    , {
-                        field: '鍑虹珯鏃堕棿', title: '鍑虹珯鏃堕棿', width: 105, templet: function (d) {
-                            if (d.鍑虹珯鏃堕棿 == null) {
-                                return "";
-                            }
-                            return util.toDateString(d.鍑虹珯鏃堕棿, "yyyy-MM-dd hh:mm:ss");
-                        }
-                    }
-                    , { field: 'HEmpID', title: 'HEmpID', hide: true }
-                    , { field: '鎿嶄綔鍛樹唬鐮�', title: '鎿嶄綔鍛樹唬鐮�' }
-                    , { field: '鎿嶄綔鍛�', title: '鎿嶄綔鍛�' }
-                    , { field: 'HSourceID', title: 'HSourceID', hide: true }
-                    , { field: '鐢熶骇璧勬簮浠g爜', title: '鐢熶骇璧勬簮浠g爜' }
-                    , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮' }
-                    , { field: 'HGroupID', title: 'HGroupID', hide: true }
-                    , { field: '鐢熶骇鐝粍浠g爜', title: '鐢熶骇鐝粍浠g爜' }
-                    , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍' }
-                    , { field: 'LOT鏁伴噺', title: 'LOT鏁伴噺' }
-                    , { field: '鎺ユ敹鏁伴噺', title: '鎺ユ敹鏁伴噺' }
-                    , { toolbar: '#toolBar', title: '鎿嶄綔', width: 120, fixed: 'right' }
-                ]]
-            };
-
-            var index = layer.load(0, { shade: false });
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                url: GetWEBURL() + '/Cj_StationOutBill/list',
-                type: "GET",
-                data: { "sWhere": sWhere },
-                success: function (data1) {
-                    if (data1.count == 1) {
-                        option.data = data1.data;
-                        table.render(option);
-                        layer.close(index);
-                    } else {
-                        layer.close(index);
-                        layer.alert(data1.Message, { icon: 5 });
-                    }
-                }, error: function () {
-                    layer.close(index);
-                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                }
-            });
+            var option = [];
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
 
             //閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
-                $("#HBillNo").val("");
-                $("#btnSearch").click();
+                set_ClearQuery();
             });
 
             //鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
-                var HBillNo = $("#HBillNo").val();
-                if (HBillNo) {
-                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
-                }
-                $.ajax({
-                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                    url: GetWEBURL() + '/Cj_StationOutBill/list',
-                    type: "GET",
-                    data: { "sWhere": sWhere },
-                    success: function (data1) {
-                        if (data1.count == 1) {
-                            option.data = data1.data;
-                            table.render(option);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
-                        } else {
-                            layer.alert(data1.code + data1.Message, { icon: 5 });
-                        }
-                    }, error: function () {
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                });
-                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+                get_FastQuery();
             });
 
+            //鍒濆鍖栬〃鏍�
+            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, hide: true }
+                        , { field: '浠诲姟鍗�', title: '浠诲姟鍗�' }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+                        , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿' }
+                        , { field: 'HProcID', title: 'HProcID', hide: true }
+                        , { field: '褰撳墠宸ュ簭浠g爜', title: '褰撳墠宸ュ簭浠g爜' }
+                        , { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭' }
+                        , { field: 'HMaterID', title: 'HMaterID', hide: true }
+                        , { field: '浜у搧浠g爜', title: '浜у搧浠g爜' }
+                        , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
+                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+                        , {
+                            field: '鍑虹珯鏃堕棿', title: '鍑虹珯鏃堕棿', width: 105, templet: function (d) {
+                                if (d.鍑虹珯鏃堕棿 == null) {
+                                    return "";
+                                }
+                                return util.toDateString(d.鍑虹珯鏃堕棿, "yyyy-MM-dd hh:mm:ss");
+                            }
+                        }
+                        , { field: 'HEmpID', title: 'HEmpID', hide: true }
+                        , { field: '鎿嶄綔鍛樹唬鐮�', title: '鎿嶄綔鍛樹唬鐮�' }
+                        , { field: '鎿嶄綔鍛�', title: '鎿嶄綔鍛�' }
+                        , { field: 'HSourceID', title: 'HSourceID', hide: true }
+                        , { field: '鐢熶骇璧勬簮浠g爜', title: '鐢熶骇璧勬簮浠g爜' }
+                        , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮' }
+                        , { field: 'HGroupID', title: 'HGroupID', hide: true }
+                        , { field: '鐢熶骇鐝粍浠g爜', title: '鐢熶骇鐝粍浠g爜' }
+                        , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍' }
+                        , { field: 'LOT鏁伴噺', title: 'LOT鏁伴噺' }
+                        , { field: '鎺ユ敹鏁伴噺', title: '鎺ユ敹鏁伴噺' }
+                    ]]
+                    , text: {
+                        none: '鏃犳暟鎹紒'
+                    }
+                };
+                set_ClearQuery();
+                get_FastQuery();
+            }
 
-            //鐩戝惉琛ㄦ牸涓宸ュ叿浜嬩欢
-            table.on('tool(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
-                var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
-                    , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
-                if (layEvent === 'detail') {
-                    layer.msg('鏌ョ湅鎿嶄綔');
-                } else if (layEvent === 'del') {
-                    layer.msg('绂佹鍒犻櫎');
-                } else if (layEvent === 'edit') {
+            //鍔熻兘鎸夐挳鏄惁绂佺敤鏂规硶锛屾瘡娆″姞杞借〃鏍奸兘瑕佽皟鐢�
+            function btnIs() {
+                //$('#btn-Add').addClass("layui-btn-disabled").attr("disabled", true);//鏂板鎸夐挳
+                $('#btn-Delete').addClass("layui-btn-disabled").attr("disabled", true);//鍒犻櫎鎸夐挳
+                $('#btn-Audit').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳
+                $('#btn-DeAudit').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽�
+                $('#btn-Print').addClass("layui-btn-disabled").attr("disabled", true);//棰勮鎸夐挳
+                $('#btn-Cell').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍒楀鎸夐挳
+                $('#btn-RefreshCell').addClass("layui-btn-disabled").attr("disabled", true);//榛樿鍒楀鎸夐挳
+                //$('#btn-Exit').addClass("layui-btn-disabled").attr("disabled", true);//閫�鍑烘寜閽�
+            }
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //鏂板
+                    case 'btn-Add': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'btn-Edit': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'btn-Delete': layer.msg('鍒犻櫎');
+                        break;
+                    //瀹℃牳
+                    case 'btn-Audit': set_CheckBill();
+                        break;
+                    //鍙嶅鏍�
+                    case 'btn-DeAudit': layer.msg('鍙嶅鏍革紒');
+                        break;
+                    //棰勮
+                    case 'btn-Cell': layer.msg('棰勮锛�');
+                        break;
+                    //淇濆瓨鍒楀
+                    case 'btn-Cell': layer.msg('淇濆瓨鍒楀锛�');
+                        break;
+                    //榛樿鍒楀
+                    case 'btn-RefreshCell': layer.msg('榛樿鍒楀锛�');
+                        break;
+                    //閫�鍑�
+                    case 'btn-Exit': get_Exit();
+                        break;
+                };
+            });
+
+            //鏂板鍗曟嵁
+            function set_AddNew() {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '宸ュ簭鍑虹珯姹囨姤鍗�-鏂板'
+                    , shade: 0.6
+                    , maxmin: false
+                    , anim: 0
+                    , content: ['Cj_StationOutBill.html?OperationType=' + 1 + '&linterid=' + 0 + '&HBillNo' + 0, 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        btnIs();
+                    }
+                    , end: function () {
+                        get_FastQuery(table, option);
+                    }
+                })
+            }
+
+            //缂栬緫鍗曟嵁
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
                     layer.open({
                         type: 2
                         , area: ['100%', '100%']
                         , title: '宸ュ簭鍑虹珯姹囨姤鍗�-缂栬緫'
-                        , shade: 0.6 //閬僵閫忔槑搴�
-                        , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
-                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: ['Cj_StationOutBill.html?linterid=' + data.HInterID + '&HBillNo=' + data.鍗曟嵁鍙�, 'yes']
+                        , shade: 0.6
+                        , maxmin: false
+                        , anim: 0
+                        , content: ['Cj_StationOutBill.html?OperationType=' + 3 + '&linterid=' + data[0].HInterID + '&HBillNo=' + data[0].鍗曟嵁鍙�, 'yes']
                         , resize: false
                         , cancel: function () {
-                            $(".layui-btn").removeClass("layui-btn-disabled");
+                            btnIs();
+                        }
+                        , end: function () {
+                            get_FastQuery(table, option);
                         }
                     })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
                 }
-            });
+            }
 
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HBillNo").val("");
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+            }
 
+            //蹇�熻繃婊�
+            function get_FastQuery() {
+                var HStatus = $("select[name='HStatus']").val();//鐘舵��
+                var HBillNo = $("#HBillNo").val();
+                if (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
+                if (HStatus) {
+                    switch (HStatus) {
+                        case '-1':   //鍏ㄩ儴
+                            sWhere += "";
+                            break;
+                        case '0':    //鏈鏍�
+                            sWhere += " and 瀹℃牳浜�=''";
+                            break;
+                        case '1':    //宸插鏍�
+                            sWhere += " and 瀹℃牳浜�<>''";
+                            break;
+                        case '2':    //宸插叧闂�
+                            sWhere += " and 鍏抽棴浜�<>''";
+                        default:
+                    }
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+
+            //鍔犺浇缃戞牸
+            function get_Display(sWhere) {
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                var wait = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Cj_StationOutBill/list',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        if (data1.count == 0) {
+                            option.data = [];
+                        } else {
+                            option.data = data1.data;
+                        }
+                        table.render(option);
+                        btnIs();
+                        layer.close(wait);
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+
+            //閫�鍑�
+            function get_Exit() {
+                parent.layui.admin.events.closeThisTabs();
+            }
 
             //浠ヤ笂鏄痩ayui妯″潡
         });
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
index cfeffe2..9028361 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
@@ -73,7 +73,7 @@
                                         <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="HOrderProcNO" id="HOrderProcNO">
+                                                <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                     </div>
@@ -82,8 +82,8 @@
                                             <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧鍚嶇О</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" name="HMaterName2" id="HMaterName2" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                                 <input type="hidden" name="HMaterID2" id="HMaterID2" value="0">
                                             </div>
@@ -116,12 +116,9 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鍗曚綅</label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
-                                                </button>
+                                            <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="HUnitName" id="HUnitName" style="background-color:#efefef4d;" readonly>
                                                 <input type="hidden" name="HUnitID" id="HUnitID" value="0">
                                             </div>
                                         </div>
@@ -535,11 +532,11 @@
                 , element = layui.element;
 
             //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
-            if (sessionStorage.login != "login") {
-                layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
-                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
-                }, function () { window.location.href = "../../user/login.html"; });
-            }
+            //if (sessionStorage.login != "login") {
+            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            //    }, function () { window.location.href = "../../user/login.html"; });
+            //}
 
             var params = getUrlVars();
             //鑾峰彇鍙傛暟
@@ -891,6 +888,21 @@
 
 
 
+            //閫夋嫨浜у搧寮圭獥
+            form.on('submit(btnSearchMater)', function () {//浜у搧
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '鐗╂枡'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                    , resize: false
+                    , cancel: function (index, layero) {
+                    }
+                })
+            });
 
             //閫夋嫨涓嶈壇鍘熷洜
             form.on('submit(HBadReasonID-BT)', function () {//閫夋嫨浠撳簱
@@ -1006,7 +1018,7 @@
             //鑾峰彇鏄庣粏琛�
             window.GetICMOBillDetail = function (hmainid) {  //杩斿洖璐d换浜�
                 $.ajax({
-                    url: GetWEBURL() + "/Sc_ProcessExchangeBill/GetICMOBillDetail",
+                    url: GetWEBURL() + "/Sc_ProcessExchangeBill/GetICMOBillList",
                     type: "GET",
                     data: { "hmainid": hmainid, "OrganizationID": sessionStorage["OrganizationID"] },
                     success: function (result) {
@@ -1035,38 +1047,51 @@
 
         //杩斿洖鐢熶骇浠诲姟鍗�
         function GetICMOBillValue(obj) {
+            $.ajax({
+                url: GetWEBURL() + "/Sc_ProcessExchangeBill/GetICMOBillDetail",
+                type: "GET",
+                data: { "hmainid": obj[0].hmainid, "OrganizationID": sessionStorage["OrganizationID"] },
+                success: function (result) {
+                    if (result.count == 1) {
+                        var data = result.data[result.data.length-1];
+                        $("#HICMOInterID").val(data.hmainid);
+                        $("#HICMOBillNo").val(data.鐢熶骇璁㈠崟鍙�);
+                        $("#HICMOEntryID").val(data.HEntryID);
+                        $("#HOrderProcNO").val(data.璁㈠崟璺熻釜鍙�);
+                        $("#HMaterID").val(data.hmaterid);
+                        $("#HMaterName").val(data.鐗╂枡鍚嶇О);
+                        $("#HMaterID2").val(data.hmaterid);
+                        $("#HMaterName2").val(data.鐗╂枡鍚嶇О);
+                        $("#HMaterNumber").val(data.鐗╂枡浠g爜);
+                        $("#HMaterNumber2").val(data.鐗╂枡浠g爜);
+                        $("#HModel").val(data.瑙勬牸鍨嬪彿);
+                        $("#HBatchNo").val(data.鎵瑰彿);
+                        $("#HUnitID").val(data.hunitid);
+                        $("#HUnitName").val(data.璁¢噺鍗曚綅鍚嶇О);
+                        $("#HUnitNumber").val(data.璁¢噺鍗曚綅浠g爜);
+                        $("#HPlanQty").val(data.璁″垝鐢熶骇鏁伴噺);
+                        $("#HQty").val(data.娴佽浆鍗℃暟閲�);
+                        $("#HprocExQty").val(data.娴佽浆鍗℃暟閲�);
+                        $("#HPlanBeginDate").val(data.璁″垝寮�宸ユ棩鏈�);
+                        $("#HPlanEndDate").val(data.璁″垝瀹屽伐鏃ユ湡);
+                        $("#HWorkShopID").val(data.hdeptid);
+                        $("#HWorkShopName").val(data.鐢熶骇杞﹂棿鍚嶇О);
+                        $("#HProdMaterCode").val(data.浜у搧CODE);
+                        $("#HSeOrderBillNo").val(data.閿�鍞鍗曞彿);
+                        $("#HCusShortName").val(data.瀹㈡埛绠�绉�);
+                        $("#HCusNeedMaterial").val(data.瀹㈡埛瑕佹眰鏉愭枡鎴愬垎);
+                        $("#HPlanSendGoodsDate").val(data.棰勮鍑鸿揣鏃ユ湡);
+                        $("#HProdMaterName").val(data.浜у搧鍚嶇О);
+                        $("#HCusName").val(data.瀹㈡埛鍚嶇О);
+                        $("#HWorkRemark").val(data.鐢熶骇澶囨敞);
+                        $("#HImportNote").val(data.閲嶈鎻愮ず);
+                    }
+                    else {
+                        layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                }
+            })
             //txtHBillNo.Text = sBillNo;
-            $("#HICMOInterID").val(obj[0].hmainid);
-            $("#HICMOBillNo").val(obj[0].鐢熶骇璁㈠崟鍙�);
-            $("#HICMOEntryID").val(obj[0].HEntryID);
-            $("#HOrderProcNO").val(obj[0].璁㈠崟璺熻釜鍙�);
-            $("#HMaterID").val(obj[0].hmaterid);
-            $("#HMaterName").val(obj[0].鐗╂枡鍚嶇О);
-            $("#HMaterID2").val(obj[0].hmaterid);
-            $("#HMaterName2").val(obj[0].鐗╂枡鍚嶇О);
-            $("#HMaterNumber").val(obj[0].鐗╂枡浠g爜);
-            $("#HMaterNumber2").val(obj[0].鐗╂枡浠g爜);
-            $("#HModel").val(obj[0].瑙勬牸鍨嬪彿);
-            $("#HBatchNo").val(obj[0].鎵瑰彿);
-            $("#HUnitID").val(obj[0].hunitid);
-            $("#HUnitName").val(obj[0].璁¢噺鍗曚綅鍚嶇О);
-            $("#HUnitNumber").val(obj[0].璁¢噺鍗曚綅浠g爜);
-            $("#HPlanQty").val(obj[0].璁″垝鐢熶骇鏁伴噺);
-            $("#HQty").val(obj[0].娴佽浆鍗℃暟閲�);
-            $("#HprocExQty").val(obj[0].娴佽浆鍗℃暟閲�);
-            $("#HPlanBeginDate").val(obj[0].璁″垝寮�宸ユ棩鏈�);
-            $("#HPlanEndDate").val(obj[0].璁″垝瀹屽伐鏃ユ湡);
-            $("#HWorkShopID").val(obj[0].hdeptid);
-            $("#HWorkShopName").val(obj[0].鐢熶骇杞﹂棿鍚嶇О);
-            $("#HProdMaterCode").val(obj[0].浜у搧CODE);
-            $("#HSeOrderBillNo").val(obj[0].閿�鍞鍗曞彿);
-            $("#HCusShortName").val(obj[0].瀹㈡埛绠�绉�);
-            $("#HCusNeedMaterial").val(obj[0].瀹㈡埛瑕佹眰鏉愭枡鎴愬垎);
-            $("#HPlanSendGoodsDate").val(obj[0].棰勮鍑鸿揣鏃ユ湡);
-            $("#HProdMaterName").val(obj[0].浜у搧鍚嶇О);
-            $("#HCusName").val(obj[0].瀹㈡埛鍚嶇О);
-            $("#HWorkRemark").val(obj[0].鐢熶骇澶囨敞);
-            $("#HImportNote").val(obj[0].閲嶈鎻愮ず);
             GetICMOBillDetail(obj[0].hmainid);
         }
         function GetHReasonValue(obj)  //杩斿洖涓嶈壇鍘熷洜
@@ -1075,6 +1100,13 @@
             ReasonID = obj[0].HItemID;
         }
 
+        //杩斿洖浜у搧
+        function GetHMaterNameValue(obj) {
+            $("#HMaterName2").val(obj[0].HName);
+            $("#HMaterID2").val(obj[0].HItemID);
+            $("#HMaterNumber2").val(obj[0].HNumber); 
+            $("#HMaterHModel2").val(obj[0].HModel); 
+        }
         function GetHKeeperValue(obj) {  //杩斿洖璐d换浜�
             EmpName = obj[0].HName;
             // $("#HEmpName").val(obj[0].HName);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
index a92d383..76cf734 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
@@ -271,6 +271,14 @@
                 , element = layui.element;
             //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
             $("#HBarCode").focus();
+
+            /*鍥哄畾浠g爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
+            /* 1.鏃犳簮鍗曟柊澧�
+             * 2.鏈夋簮鍗曟柊澧�
+             * 3.缂栬緫
+             * 4.娴忚
+             * 5.鍙樻洿
+             */
             //鑾峰彇鍙傛暟
             function getUrlVars() {
                 var vars = [], hash;
@@ -283,12 +291,13 @@
                 return vars;
             }
             var params = getUrlVars();
-            var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
-            var HBillNo = params[params[1]];  //鑾峰彇鍗曟嵁鍙�
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HBillNo = params[params[2]];  //鑾峰彇鍗曟嵁鍙�
+            /*鍥哄畾浠g爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
 
             //鍒ゆ柇鏄惁鏂板
-            if (linterid == null || linterid == 0) {
+            if (OperationType == 1) {
                 $("#HInterID").val("");
                 $("#HBillNo").val("");
                 //鑾峰彇鏈�澶у崟鎹彿
@@ -304,7 +313,7 @@
                     }
                 });
             }
-            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+            else if(OperationType == 3){
                 $("#eventType").val("Modify");
                 RoadBillMain(linterid);
                 //RoadBillSub(linterid);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
index 3140db2..13bdc1c 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
@@ -1,15 +1,19 @@
 锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<title>宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛�</title>
+    <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, 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/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>
+
 </head>
 <body>
     <div class="layui-fluid">
@@ -27,7 +31,7 @@
                                 <div class="layui-inline">
                                     <label class="layui-form-label">鐘舵��</label>
                                     <div class="layui-input-block">
-                                        <select name="Status" lay-filter="Status" style="width:190px;">
+                                        <select name="HStatus" lay-filter="HStatus" style="width:190px;">
                                             <option value="-1" selected="selected">鍏ㄩ儴</option>
                                             <option value="0">鏈鏍�</option>
                                             <option value="1">宸插鏍�</option>
@@ -36,16 +40,34 @@
                                     </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="宸ュ簭娴佽浆鍗″彿" id="宸ュ簭娴佽浆鍗″彿">
+                                    <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>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                 </button>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
-
+                                <div class="layui-colla-content">
+                                    <div class="layui-inline">
+                                        <div class="layui-inline">
+                                            <span>鍏朵粬鏉′欢></span>
+                                        </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="宸ュ簭娴佽浆鍗″彿" id="宸ュ簭娴佽浆鍗″彿">
+                                        </div>
+                                    </div>
+                                </div>
                             </div>
                         </div>
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -72,10 +94,6 @@
         <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>
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -91,286 +109,297 @@
                 , laypage = layui.laypage
                 , laydate = layui.laydate
                 , util = layui.util
+            //鍏敤鍙橀噺
             var sWhere = "";
+            var option = [];
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
 
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                , defaultToolbar: ['filter', 'exports', 'print']
-                ,height: 'full-50'
-                , page: true
-                , cellMinWidth: 90
-                , cols: [[
-                    { type: 'checkbox', fixed: 'left' }
-                    , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
-                    , { field: '浠诲姟鍗�', title: '浠诲姟鍗�' }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
-                    , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿' }
-                    , { field: 'HProcID', title: 'HProcID', hide: true }
-                    , { field: '褰撳墠宸ュ簭浠g爜', title: '褰撳墠宸ュ簭浠g爜' }
-                    , { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭' }
-                    , { field: 'HMaterID', title: 'HMaterID', hide: true }
-                    , { field: '浜у搧浠g爜', title: '浜у搧浠g爜' }
-                    , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
-                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
-                    , {
-                        field: '杩涚珯鏃堕棿', title: '杩涚珯鏃堕棿', width: 105, templet: function (d) {
-                            if (d.杩涚珯鏃堕棿 == null) {
-                                return "";
-                            }
-                            return util.toDateString(d.杩涚珯鏃堕棿, "yyyy-MM-dd hh:mm:ss");
-                        }
-                    }
-                    , { field: 'HEmpID', title: 'HEmpID', hide: true }
-                    , { field: '鎿嶄綔鍛樹唬鐮�', title: '鎿嶄綔鍛樹唬鐮�' }
-                    , { field: '鎿嶄綔鍛�', title: '鎿嶄綔鍛�' }
-                    , { field: 'HSourceID', title: 'HSourceID', hide: true }
-                    , { field: '鐢熶骇璧勬簮浠g爜', title: '鐢熶骇璧勬簮浠g爜' }
-                    , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮' }
-                    , { field: 'HGroupID', title: 'HGroupID', hide: true }
-                    , { field: '鐢熶骇鐝粍浠g爜', title: '鐢熶骇鐝粍浠g爜' }
-                    , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍' }
-                    , { field: 'LOT鏁伴噺', title: 'LOT鏁伴噺' }
-                    , { field: '鎺ユ敹鏁伴噺', title: '鎺ユ敹鏁伴噺' }
-                ]]
-            };
-
-            var index = layer.load(0, { shade: false });
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                url: GetWEBURL() + '/Cj_StationInBill/list',
-                type: "GET",
-                data: { "sWhere": sWhere },
-                success: function (data1) {
-                    if (data1.count == 1) {
-                        option.data = data1.data;
-                        table.render(option);
-                        btnIs();
-                        layer.close(index);
-                    } else {
-                        layer.close(index);
-                        layer.alert(data1.Message, { icon: 5 });
-                    }
-                }, error: function () {
-                    layer.close(index);
-                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                }
-            });
 
             //閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
-                $("#宸ュ簭娴佽浆鍗″彿").val("");
-                //$("#btnSearch").click();
+                set_ClearQuery();
             });
 
             //鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
-                var 宸ュ簭娴佽浆鍗″彿 = $("#宸ュ簭娴佽浆鍗″彿").val();
-                if (宸ュ簭娴佽浆鍗″彿) {
-                    sWhere += " and 宸ュ簭娴佽浆鍗″彿 like '%" + 宸ュ簭娴佽浆鍗″彿 + "%'";
-                }
-                var index = layer.load();
-                $.ajax({
-                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                    url: GetWEBURL() + '/Cj_StationInBill/list',
-                    type: "GET",
-                    data: { "sWhere": sWhere },
-                    success: function (data1) {
-                        if (data1.count == 1) {
-                            option.data = data1.data;
-                            table.render(option);
-                            btnIs();
-                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
-                        } else {
-                            layer.alert(data1.code + data1.Message, { icon: 5 });
-                        }
-                        layer.close(index);
-                    }, error: function () {
-                        layer.close(index);
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                });
-                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+                get_FastQuery();
             });
 
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
-                var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
-                    case 'btn-Add':
-                        //椤甸潰灞�-鑷畾涔�
-                        layer.open({
-                            type: 2,
-                            skin: 'layui-layer-rim', //鍔犱笂杈规
-                            title: '鏂板妯℃不鍏锋姤搴熷叆搴撳崟',
-                            closeBtn: 1,
-                            shift: 2,
-                            area: ['100%', '100%'],
-                            maxmin: true,
-                            content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldScrapInBillList.html',
-                            end: function () {
-                                //鍒锋柊椤甸潰,
-                                location.reload();
-                            },
-                            success: function (layero, index) {
-
-                            }
-                        });
+                    //鏂板
+                    case 'btn-Add': set_AddNew();
                         break;
                     //缂栬緫
-                    case 'btn-Edit':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            layer.open({
-                                type: 2
-                                , area: ['100%', '100%']
-                                , title: '宸ュ簭杩涚珯鎺ユ敹鍗�-缂栬緫'
-                                , shade: 0.6 
-                                , maxmin: false 
-                                , anim: 0
-                                , content: ['Cj_StationInBill.html?linterid=' + data[0].HInterID + '&HBillNo=' + data[0].鍗曟嵁鍙�, 'yes']
-                                , resize: false
-                                , cancel: function () {
-                                    $(".layui-btn").removeClass("layui-btn-disabled");
-                                }
-                            })
-                        } else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                        }
+                    case 'btn-Edit': set_ShowBill();
                         break;
                     //鍒犻櫎
-                    case 'btn-Delete':
-                        layer.msg('鍒犻櫎');
+                    case 'btn-Delete': layer.msg('鍒犻櫎');
                         break;
                     //瀹℃牳
-                    case 'btn-Audit':
-                        layer.msg('瀹℃牳锛�');
+                    case 'btn-Audit': set_CheckBill();
                         break;
                     //鍙嶅鏍�
-                    case 'btn-DeAudit':
-                        layer.msg('鍙嶅鏍革紒');
+                    case 'btn-DeAudit': layer.msg('鍙嶅鏍革紒');
                         break;
                     //棣栨
-                    case 'btn-FirstPieceCheck':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var linterid = data[0].HInterID.toString();
-                            var type = 2;
-                            layer.open({
-                                type: 2
-                                , area: ['100%', '100%']
-                                , title: '棣栦欢妫�楠屽崟-缂栬緫'
-                                , shade: 0.6
-                                , maxmin: false
-                                , anim: 0
-                                , content: ['../../璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?linterid=' + linterid + '&type=' + type, 'yes']
-                                , resize: false
-                                , cancel: function () {
-                                    btnIs();
-                                }
-                            })
-                        } else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                        }
+                    case 'btn-FirstPieceCheck': set_FirstPieceCheck();
+                        break;
+                    //棰勮
+                    case 'btn-Cell': layer.msg('棰勮锛�');
                         break;
                     //淇濆瓨鍒楀
-                    case 'btn-Cell': 
-                        var arr = [];
-                        // 鍒楁暟
-                        var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
-                        for (var i = 0; i <= colNum; i++) {
-                            var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
-                            var colWidth = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).width();
-                            if (colName != "" && colName != null) {
-                                arr.push(colWidth == -1 ? 200 : colWidth);
-                            }
-                        }
-                        arr.unshift(40); //棣栦綅杩藉姞
-                        $.ajax({
-                            url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
-                            async: false,
-                            type: "POST",
-                            dataType: "json",
-                            data: { "myMap": JSON.stringify(arr), "Name": Name },
-                            success: function (data1) {
-                                if (data1.count == 1) {
-                                    layer.alert(data1.Message, { icon: 1 });
-                                } else {
-                                    layer.alert(data1.Message, { icon: 5 });
-                                }
-                            }, error: function (e) {
-                                layer.alert(e.Message, { icon: 5 });
-                            }
-                        });
-                        //璁剧疆璧嬪�煎垪瀹�
-                        var colWidth = getColumnsWidth();
-                        if (colWidth == "" || colWidth == []) {
-
-                        }
-                        else {
-                            $.each(columns, function (x, m) {
-                                m["width"] = colWidth[x];
-                            });
-                        }
-                        SearchLoad(sWhere, table, option);
+                    case 'btn-Cell': layer.msg('淇濆瓨鍒楀锛�');
                         break;
                     //榛樿鍒楀
-                    case 'btn-RefreshCell':   
-                        var arr = [];
-                        // 鍒楁暟
-                        var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
-                        for (var i = 0; i <= colNum; i++) {
-                            var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
-                            if (colName != "" && colName != null) {
-                                arr.push(200);   //榛樿瀹藉害200
-                            }
-                        }
-                        arr.unshift(40); //棣栦綅杩藉姞
-
-                        $.ajax({
-                            url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
-                            async: false,
-                            type: "POST",
-                            dataType: "json",
-                            data: { "myMap": JSON.stringify(arr), "Name": Name },
-                            success: function (data1) {
-                                if (data1.count == 1) {
-                                    layer.alert(data1.Message, { icon: 1 });
-
-                                } else {
-                                    layer.alert(data1.Message, { icon: 5 });
-                                }
-                            }, error: function (e) {
-                                layer.alert(e.Message, { icon: 5 });
-                            }
-                        });
-                        //璁剧疆璧嬪�煎垪瀹�
-                        var colWidth = getColumnsWidth();
-                        if (colWidth == "" || colWidth == []) {
-
-                        }
-                        else {
-                            $.each(columns, function (x, m) {
-                                m["width"] = colWidth[x];
-                            });
-                        }
-                        SearchLoad(sWhere, table, option);
+                    case 'btn-RefreshCell': layer.msg('榛樿鍒楀锛�');
+                        break;
+                    //閫�鍑�
+                    case 'btn-Exit': get_Exit();
                         break;
                 };
             });
 
             //鍔熻兘鎸夐挳鏄惁绂佺敤鏂规硶锛屾瘡娆″姞杞借〃鏍奸兘瑕佽皟鐢�
             function btnIs() {
-                $('#btn-Add').addClass("layui-btn-disabled").attr("disabled", true);//鏂板鎸夐挳
+                //$('#btn-Add').addClass("layui-btn-disabled").attr("disabled", true);//鏂板鎸夐挳
                 $('#btn-Delete').addClass("layui-btn-disabled").attr("disabled", true);//鍒犻櫎鎸夐挳
                 $('#btn-Audit').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳
                 $('#btn-DeAudit').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽�
                 $('#btn-Print').addClass("layui-btn-disabled").attr("disabled", true);//棰勮鎸夐挳
                 $('#btn-Cell').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍒楀鎸夐挳
                 $('#btn-RefreshCell').addClass("layui-btn-disabled").attr("disabled", true);//榛樿鍒楀鎸夐挳
-                $('#btn-Exit').addClass("layui-btn-disabled").attr("disabled", true);//閫�鍑烘寜閽�
+                //$('#btn-Exit').addClass("layui-btn-disabled").attr("disabled", true);//閫�鍑烘寜閽�
+            }
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , defaultToolbar: ['filter', 'exports', 'print']
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
+                        , { field: '浠诲姟鍗�', title: '浠诲姟鍗�' }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+                        , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿' }
+                        , { field: 'HProcID', title: 'HProcID', hide: true }
+                        , { field: '褰撳墠宸ュ簭浠g爜', title: '褰撳墠宸ュ簭浠g爜' }
+                        , { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭' }
+                        , { field: 'HMaterID', title: 'HMaterID', hide: true }
+                        , { field: '浜у搧浠g爜', title: '浜у搧浠g爜' }
+                        , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
+                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+                        , {
+                            field: '杩涚珯鏃堕棿', title: '杩涚珯鏃堕棿', width: 105, templet: function (d) {
+                                if (d.杩涚珯鏃堕棿 == null) {
+                                    return "";
+                                }
+                                return util.toDateString(d.杩涚珯鏃堕棿, "yyyy-MM-dd");
+                            }
+                        }
+                        , { field: 'HEmpID', title: 'HEmpID', hide: true }
+                        , { field: '鎿嶄綔鍛樹唬鐮�', title: '鎿嶄綔鍛樹唬鐮�' }
+                        , { field: '鎿嶄綔鍛�', title: '鎿嶄綔鍛�' }
+                        , { field: 'HSourceID', title: 'HSourceID', hide: true }
+                        , { field: '鐢熶骇璧勬簮浠g爜', title: '鐢熶骇璧勬簮浠g爜' }
+                        , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮' }
+                        , { field: 'HGroupID', title: 'HGroupID', hide: true }
+                        , { field: '鐢熶骇鐝粍浠g爜', title: '鐢熶骇鐝粍浠g爜' }
+                        , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍' }
+                        , { field: 'LOT鏁伴噺', title: 'LOT鏁伴噺' }
+                        , { field: '鎺ユ敹鏁伴噺', title: '鎺ユ敹鏁伴噺' }
+                    ]]
+                    , text: {
+                        none: '鏃犳暟鎹紒'
+                    }
+                };
+                set_ClearQuery();
+                get_FastQuery();
+            }
+
+            //鍔犺浇缃戞牸
+            function get_Display(sWhere) {
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                var wait = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Cj_StationInBill/get_Display',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        if (data1.count == 0) {
+                            option.data = [];
+                        } else {
+                            option.data = data1.data;
+                        }
+                        table.render(option);
+                        btnIs();
+                        layer.close(wait);
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //蹇�熻繃婊�
+            function get_FastQuery() {
+                var HStatus = $("select[name='HStatus']").val();//鐘舵��
+                var 宸ュ簭娴佽浆鍗″彿 = $("#宸ュ簭娴佽浆鍗″彿").val();
+                var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+                var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+                if (宸ュ簭娴佽浆鍗″彿) {
+                    sWhere += " and 宸ュ簭娴佽浆鍗″彿 like '%" + 宸ュ簭娴佽浆鍗″彿 + "%'";
+                }
+                if (HBeginDate) {
+                    sWhere += " and CONVERT(varchar(100),杩涚珯鏃堕棿, 23) >= '" + HBeginDate + "'";
+                }
+                if (HEndDate) {
+                    sWhere += " and CONVERT(varchar(100),杩涚珯鏃堕棿, 23) <= '" + HEndDate + "'";
+                }
+                if (HStatus) {
+                    switch (HStatus) {
+                        case '-1':   //鍏ㄩ儴
+                            sWhere += "";
+                            break;
+                        case '0':    //鏈鏍�
+                            sWhere += " and 瀹℃牳浜�=''";
+                            break;
+                        case '1':    //宸插鏍�
+                            sWhere += " and 瀹℃牳浜�<>''";
+                            break;
+                        case '2':    //宸插叧闂�
+                            sWhere += " and 鍏抽棴浜�<>''";
+                        default:
+                    }
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#宸ュ簭娴佽浆鍗″彿").val("");
+                $("#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_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '宸ュ簭杩涚珯鎺ユ敹鍗�-缂栬緫'
+                        , shade: 0.6
+                        , maxmin: false
+                        , anim: 0
+                        , content: ['Cj_StationInBill.html?OperationType='+3+'&linterid=' + data[0].HInterID + '&HBillNo=' + data[0].鍗曟嵁鍙�, 'yes']
+                        , resize: false
+                        , cancel: function () {
+                            btnIs();
+                        }
+                        , end: function () {
+                            get_FastQuery(table, option);
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
+            //鏂板鍗曟嵁
+            function set_AddNew() {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '宸ュ簭杩涚珯鎺ユ敹鍗�-鏂板'
+                    , shade: 0.6
+                    , maxmin: false
+                    , anim: 0
+                    , content: ['Cj_StationInBill.html?OperationType=' + 1 + '&linterid=' + 0 +'&HBillNo'+0, 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        btnIs();
+                    }
+                    , end: function () {
+                        get_FastQuery(table, option);
+                    }
+                })
+            }
+
+            //棣栨
+            function set_FirstPieceCheck() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HInterID.toString();
+                    var type = 2;
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '棣栦欢妫�楠屽崟-缂栬緫'
+                        , shade: 0.6
+                        , maxmin: false
+                        , anim: 0
+                        , content: ['../../璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?linterid=' + linterid + '&type=' + type, 'yes']
+                        , resize: false
+                        , cancel: function () {
+                            btnIs();
+                        }
+                        ,end: function () {
+                            get_FastQuery(table, option);
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
+            //閫�鍑�
+            function get_Exit() {
+                parent.layui.admin.events.closeThisTabs();
+            }
+
+            //瀹℃牳
+            function set_CheckBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    var wait = layer.load();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Cj_StationInBill/set_CheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 0) {
+                                layer.msg(result.Message, { icon: 1 });
+                                get_FastQuery(table, option);
+                            } else {
+                                layer.alert(result.Message, { icon: 5 });
+                            }
+                            layer.close(wait);
+                        }, error: function () {
+                            layer.close(wait);
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
             }
 
 

--
Gitblit v1.9.1