From a35241eb34755b96ef678095b863d9b648460f03 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期五, 05 十一月 2021 09:50:47 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

---
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepInBillList.html  |  111 
 WebTM/views/基础资料/公用基础资料/Gy_ClassTimePrj.html                    |   10 
 WebTM/views/index_Mobile.html                                   |   18 
 WebTM/views/基础资料/公用基础资料/Gy_EmployeeList.html                    |    1 
 WebTM/views/基础资料/公用基础资料/Gy_Material.html                        |    1 
 WebTM/views/设备管理/Sb_Add_EqpMaintenanceBillList.html             |    2 
 WebTM/views/基础资料/基础资料/Gy_MaintainEdit.html                      |  241 +
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairInBillList.html         |   70 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairChangeBillList.html     |   72 
 WebTM/views/基础资料/公用基础资料/Gy_WorkType.html                        |  318 +
 WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html                       |   59 
 WebTM/views/基础资料/公用基础资料/Gy_Unit.html                            |    1 
 WebTM/views/质量管理/来料检验单/QC_POStockInCheckBillList.html           |   35 
 WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldProdOutBillList.html      |   18 
 WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html                  |    2 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdOutBillEdit.html          |   52 
 WebTM/views/基础资料/基础资料/Gy_RepairList.html                        |  426 ++
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdMoveBill.html             |   53 
 WebTM/views/基础资料/采购基础资料/Gy_Supplier.html                        |    1 
 WebTM/views/模治具管理/设备点检记录单/Sb_EquipDotCheckBill_PDA.html         |   76 
 WebTM/views/质量管理/来料检验单/QC_Add_Edit_POStockInCheckBillList.html  | 1008 +++++
 WebTM/views/基础资料/基础资料/Gy_RepairCheckEdit.html                   |  240 +
 WebTM/views/基础资料/基础资料/Gy_DotCheckList.html                      |  426 ++
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairOutBillList.html        |   74 
 WebTM/layuiadmin/Scripts/webConfig.js                           |    2 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdMoveBillList.html         |   93 
 WebTM/views/质量管理/产品入库检验单/QC_LastPieceCheckBillList.html         |    2 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_WorkPayType.html            |  251 +
 WebTM/views/基础资料/公用基础资料/Gy_MouldType.html                       |   57 
 WebTM/views/基础资料/公用基础资料/Gy_Currency.html                        |    1 
 WebTM/WebTM.csproj                                              |    9 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillList.html           |   96 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapInBillList.html          |  297 -
 WebTM/views/基础资料/公用基础资料/Gy_QCCheckClass.html                    |    2 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairInBillEdit.html         |   53 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdOutBillList.html          |   75 
 WebTM/views/基础资料/基础资料/Gy_DotCheckEdit.html                      |  240 +
 WebTM/views/质量管理/来料检验单/QC_Add_Edit_POStockInCheckBill.html      | 2067 ----------
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_ClassTimePrj.html           |   22 
 WebTM/views/基础资料/基础资料/Gy_MaintainList.html                      |  426 ++
 WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldProdBackBillList.html     |   52 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldOtherOutBillList.html         |   93 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_OrderBackInfo.html          |  263 +
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepOutBill.html     |   50 
 WebTM/views/home/console.html                                   |   72 
 WebTM/views/基础资料/销售基础资料/Gy_Customer.html                        |    1 
 WebTM/views/质量管理/产品入库检验单/QC_LastPieceCheckBill.html             | 1493 +++++--
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairOutBillEdit.html        |   53 
 WebTM/views/index.html                                          |   17 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapOutBillList.html         |   75 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepOutBillList.html |   78 
 WebTM/views/模治具管理/设备保养记录单/Sb_EquipMaintainBill_PDA.html         |   68 
 WebTM/views/模治具管理/模治具管理/Gy_MouldFileList.html                   |    1 
 WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html                       |    3 
 WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html                   |    4 
 WebTM/views/模治具管理/模治具管理/Sb_Add_MouldRepairWorkBillList.html     |    2 
 WebTM/views/系统管理/用户管理/Xt_UserSuplies.html                       |    2 
 WebTM/views/基础资料/公用基础资料/Gy_WorkPayType.html                     |  317 +
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillEdit.html           |   80 
 WebTM/views/基础资料/公用基础资料/Xt_ORGANIZATIONSList.html               |    2 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_WorkType.html               |  277 +
 WebTM/views/模治具管理/设备维修记录单/Sb_EquipRepairWorkBill_PDA.html       |    8 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepInBill.html      |   50 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdBackBillList.html         |   76 
 WebTM/views/基础资料/基础资料/Gy_RepairEdit.html                        |  240 +
 WebTM/views/基础资料/基础资料/Gy_RepairCheckList.html                   |  426 ++
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldOtherOutBillEdit.html         |   52 
 67 files changed, 7,696 insertions(+), 3,167 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index a6e3b7d..7ccd06f 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -572,6 +572,14 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldProdMoveStockBill.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldProdOutStockBill.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldTypeBill.aspx" />
+    <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckEdit.html" />
+    <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckList.html" />
+    <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MaintainEdit.html" />
+    <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MaintainList.html" />
+    <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckEdit.html" />
+    <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckList.html" />
+    <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairEdit.html" />
+    <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairList.html" />
     <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPriceList.html" />
     <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_Group_Add_Edit.html" />
     <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPrice.html" />
@@ -753,6 +761,7 @@
     <Content Include="views\璐ㄩ噺绠$悊\浜у搧鍏ュ簱妫�楠屽崟\QC_LastPieceCheckBillList.html" />
     <Content Include="views\璐ㄩ噺绠$悊\鍑哄巶妫�楠屽崟\QC_OutCompCheckBillList.html" />
     <Content Include="views\璐ㄩ噺绠$悊\宸℃璁板綍鍗昞QC_PatrolProcCheckBillList.html" />
+    <Content Include="views\璐ㄩ噺绠$悊\鏉ユ枡妫�楠屽崟\QC_Add_Edit_POStockInCheckBillList.html" />
     <Content Include="views\璐ㄩ噺绠$悊\鏉ユ枡妫�楠屽崟\QC_Add_Edit_POStockInCheckBill.html" />
     <Content Include="views\璐ㄩ噺绠$悊\宸ュ簭妫�楠屽崟\QC_ProcessCheckBill.html" />
     <Content Include="views\璐ㄩ噺绠$悊\宸ュ簭妫�楠屽崟\QC_ProcessCheckBillList.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 802a542..68bfdb0 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,7 +6,7 @@
     //var WEBURL = "http://localhost:8080/API/";   //棰滄檽鍐涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/lubao";   //棰滄檽鍐涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄩ湶鏈湴閰嶇疆
-    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //绔犵传鏌旀湰鍦伴厤缃�
+    var WEBURL = "http://localhost:8082/LuBaoAPI/";    //绔犵传鏌旀湰鍦伴厤缃�
     //var WEBURL = "http://10.1.4.155/API/";   //姹熶赴瀹㈡埛NEW
     //var WEBURL = "http://47.96.97.237/API/";   //鏅轰簯鏈嶅姟鍣�
     //var WEBURL = "http://183.129.128.86:9090/API/";   //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ缃�
diff --git a/WebTM/views/home/console.html b/WebTM/views/home/console.html
index bf0e0e5..4766879 100644
--- a/WebTM/views/home/console.html
+++ b/WebTM/views/home/console.html
@@ -10,7 +10,7 @@
     <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
     <style type="text/css">
         .atrheight {
-            height:335px !important;
+            height:375px !important;
         }
     </style>
 </head>
@@ -213,97 +213,91 @@
                     <div class="layui-col-md6">
                         <!-- 蹇嵎鏂瑰紡 -->
                         <div class="layui-card">
-                            <div class="layui-card-header">蹇嵎鏂瑰紡</div>
+                            <div class="layui-card-header">鍣ㄥ叿绠$悊</div>
                             <div class="layui-card-body">
                                 <div class="layui-carousel layadmin-carousel atrheight layadmin-shortcut">
                                     <div carousel-item="">
                                         <ul class="layui-row layui-col-space10 layui-this">
                                             <li class="layui-col-xs3">
-                                                <a href="../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html" target="main_self_frame">
+                                                <a href="../妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdInBillList.html" target="main_self_frame">
                                                     <i class="layui-icon layui-icon-console"></i>
-                                                    <cite>澶栬喘鍏ュ簱</cite>
+                                                    <cite>鍣ㄥ叿閲囪喘鍏ュ簱鍗�</cite>
                                                 </a>
                                             </li>
                                             <li class="layui-col-xs3">
-                                                <a href="../楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_Fast.html" target="main_self_frame">
+                                                <a href="../妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdOutBillEdit.html" target="main_self_frame">
                                                     <i class="layui-icon layui-icon-template-1"></i>
-                                                    <cite>濮斿鍏ュ簱</cite>
+                                                    <cite>鍣ㄥ叿棰嗙敤鍑哄簱鍗�</cite>
                                                 </a>
                                             </li>
                                             <li class="layui-col-xs3">
-                                                <a href="../楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_Fast.html" target="main_self_frame">
+                                                <a href="../妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdBackBillList.html" target="main_self_frame">
                                                     <i class="layui-icon layui-icon-template-1"></i>
-                                                    <cite>浜у搧鍏ュ簱</cite>
+                                                    <cite>鍣ㄥ叿棰嗙敤閫�搴撳崟</cite>
                                                 </a>
                                             </li>
                                             <li class="layui-col-xs3">
-                                                <a href="../棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_Fast.html" target="main_self_frame">
+                                                <a href="../妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapOutBillList.html" target="main_self_frame">
                                                     <i class="layui-icon layui-icon-chart"></i>
-                                                    <cite>棰嗘枡鍑哄簱</cite>
+                                                    <cite>鍣ㄥ叿澶勭悊鍑哄簱鍗�</cite>
                                                 </a>
                                             </li>
                                             <li class="layui-col-xs3">
-                                                <a href="../棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_Fast.html" target="main_self_frame">
+                                                <a href="../妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBillList.html" target="main_self_frame">
                                                     <i class="layui-icon layui-icon-chart"></i>
-                                                    <cite>濮斿鍑哄簱</cite>
+                                                    <cite>鍣ㄥ叿鎶ュ簾鍏ュ簱鍗�</cite>
                                                 </a>
                                             </li>
                                             <li class="layui-col-xs3">
-                                                <a href="../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html" target="main_self_frame">
+                                                <a href="../妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairChangeBillList.html" target="main_self_frame">
                                                     <i class="layui-icon layui-icon-chat"></i>
-                                                    <cite>閿�鍞嚭搴�</cite>
+                                                    <cite>鍣ㄥ叿鏀瑰埗鐢宠鍗�</cite>
                                                 </a>
                                             </li>
                                             <li class="layui-col-xs3">
-                                                <a href="../浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html" target="main_self_frame">
+                                                <a href="../妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairInBillList.html" target="main_self_frame">
                                                     <i class="layui-icon layui-icon-find-fill"></i>
-                                                    <cite>璋冩嫧鍗�</cite>
+                                                    <cite>鍣ㄥ叿鏀瑰埗鍏ュ簱鍗�</cite>
                                                 </a>
                                             </li>
                                             <li class="layui-col-xs3">
-                                                <a href="../浠撳瓨绠$悊/浠撳簱璋冩嫧/Cc_LookingForBill.html" target="main_self_frame">
+                                                <a href="../妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairOutBillList.html" target="main_self_frame">
                                                     <i class="layui-icon layui-icon-find-fill"></i>
-                                                    <cite>涓嬫灦鎵捐揣鍗�</cite>
+                                                    <cite>鍣ㄥ叿鏀瑰埗鍑哄簱鍗�</cite>
                                                 </a>
                                             </li>
                                             <li class="layui-col-xs3">
-                                                <a href="../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html" target="main_self_frame">
+                                                <a href="../妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdMoveBillList.html" target="main_self_frame">
                                                     <i class="layui-icon layui-icon-chat"></i>
-                                                    <cite>閿�鍞嚭搴�</cite>
+                                                    <cite>鍣ㄥ叿鐩存帴璋冩嫧鍗�</cite>
                                                 </a>
                                             </li>
                                             <li class="layui-col-xs3">
-                                                <a href="../浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html" target="main_self_frame">
+                                                <a href="../妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepInBillList.html" target="main_self_frame">
                                                     <i class="layui-icon layui-icon-find-fill"></i>
-                                                    <cite>璋冩嫧鍗�</cite>
+                                                    <cite>鍣ㄥ叿鍒嗘寮忚皟鍏ュ崟</cite>
                                                 </a>
                                             </li>
                                             <li class="layui-col-xs3">
-                                                <a href="../浠撳瓨绠$悊/浠撳簱璋冩嫧/Cc_LookingForBill.html" target="main_self_frame">
+                                                <a href="../妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepOutBillList.html" target="main_self_frame">
                                                     <i class="layui-icon layui-icon-find-fill"></i>
-                                                    <cite>涓嬫灦鎵捐揣鍗�</cite>
+                                                    <cite>鍣ㄥ叿鍒嗘寮忚皟鍑哄崟</cite>
                                                 </a>
                                             </li>
                                             <li class="layui-col-xs3">
-                                                <a href="../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html" target="main_self_frame">
+                                                <a href="../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldOtherInBillList.html" target="main_self_frame">
                                                     <i class="layui-icon layui-icon-chat"></i>
-                                                    <cite>閿�鍞嚭搴�</cite>
+                                                    <cite>鍣ㄥ叿鍏朵粬鍏ュ簱鍗�</cite>
                                                 </a>
                                             </li>
                                             <li class="layui-col-xs3">
-                                                <a href="../浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html" target="main_self_frame">
+                                                <a href="../妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillList.html" target="main_self_frame">
                                                     <i class="layui-icon layui-icon-find-fill"></i>
-                                                    <cite>璋冩嫧鍗�</cite>
-                                                </a>
-                                            </li>
-                                            <li class="layui-col-xs3">
-                                                <a href="../浠撳瓨绠$悊/浠撳簱璋冩嫧/Cc_LookingForBill.html" target="main_self_frame">
-                                                    <i class="layui-icon layui-icon-find-fill"></i>
-                                                    <cite>涓嬫灦鎵捐揣鍗�</cite>
+                                                    <cite>鍣ㄥ叿鍏朵粬鍑哄簱鍗�</cite>
                                                 </a>
                                             </li>
                                         </ul>
-                                        <ul class="layui-row layui-col-space10">
+                                        <!--<ul class="layui-row layui-col-space10">
                                             <li class="layui-col-xs3">
                                                 <a href="../浠撳瓨绠$悊/浠撳簱璋冩嫧/Cc_LookingForReturnBill.html" target="main_self_frame">
                                                     <i class="layui-icon layui-icon-find-fill"></i>
@@ -328,13 +322,13 @@
                                                     <cite>濮斿宸ュ簭鍙戝嚭鍗�</cite>
                                                 </a>
                                             </li>
-                                            <!--<li class="layui-col-xs3">
+                                            <li class="layui-col-xs3">
                                 <a lay-href="set/user/info.html">
                                     <i class="layui-icon layui-icon-set"></i>
                                     <cite>鎴戠殑璧勬枡</cite>
                                 </a>
-                            </li>-->
-                                        </ul>
+                            </li>
+                                        </ul>-->
                                     </div>
                                     <div class="layui-carousel-ind"><ul><li class="layui-this"></li><li class=""></li></ul></div><button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button><button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button>
                                 </div>
@@ -344,7 +338,7 @@
                     <div class="layui-col-md6">
                         <!-- 蹇嵎鏂瑰紡 -->
                         <div class="layui-card">
-                            <div class="layui-card-header">蹇嵎鏂瑰紡</div>
+                            <div class="layui-card-header">wms绠$悊</div>
                             <div class="layui-card-body">
                                 <div class="layui-carousel layadmin-carousel atrheight layadmin-shortcut">
                                     <div carousel-item="">
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 31f2817..1aca07d 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -421,9 +421,9 @@
                                 <dd>
                                     <a>鐗╂祦妫�楠�</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="璐ㄩ噺绠$悊/鏉ユ枡妫�楠屽崟/QC_Add_Edit_POStockInCheckBill.html">鏉ユ枡鍏ュ簱妫�楠屽崟</a></dd>
+                                        <dd><a lay-href="璐ㄩ噺绠$悊/鏉ユ枡妫�楠屽崟/QC_Add_Edit_POStockInCheckBillList.html">鏉ユ枡鍏ュ簱妫�楠屽崟</a></dd>
                                         <dd><a lay-href="璐ㄩ噺绠$悊/鏉ユ枡妫�楠屽崟/QC_POStockInCheckBillList.html">鏉ユ枡鍏ュ簱妫�楠屽崟缁存姢</a></dd>
-                                        <dd><a lay-href="璐ㄩ噺绠$悊/浜у搧鍏ュ簱妫�楠屽崟/QC_LastPieceCheckBill.html">鐢熶骇鍏ュ簱妫�楠屽崟null</a></dd>
+                                        <dd><a lay-href="璐ㄩ噺绠$悊/浜у搧鍏ュ簱妫�楠屽崟/QC_LastPieceCheckBill.html">鐢熶骇鍏ュ簱妫�楠屽崟</a></dd>
                                         <dd><a lay-href="璐ㄩ噺绠$悊/浜у搧鍏ュ簱妫�楠屽崟/QC_LastPieceCheckBillList.html">鐢熶骇鍏ュ簱妫�楠屽崟缁存姢</a></dd>
                                         <dd><a lay-href="璐ㄩ噺绠$悊/鍑哄巶妫�楠屽崟/QC_OutCompCheckBill.html">鍑哄巶妫�楠屽崟</a></dd>
                                         <dd><a lay-href="璐ㄩ噺绠$悊/鍑哄巶妫�楠屽崟/QC_OutCompCheckBillList.html">鍑哄巶妫�楠屽崟缁存姢</a></dd>
@@ -746,6 +746,19 @@
                                     </dl>
                                 </dd>
                                 <dd>
+                                    <a>璁惧鍩虹璧勬枡</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckEdit.html">鐐规椤圭洰</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckList.html">鐐规椤圭洰缁存姢</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairEdit.html">缁翠慨椤圭洰</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairList.html">缁翠慨椤圭洰缁存姢</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairCheckEdit.html">缁翠慨妫�楠岄」鐩�</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairCheckList.html">缁翠慨妫�楠岄」鐩淮鎶�</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_MaintainEdit.html">淇濆吇椤圭洰</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_MaintainList.html">淇濆吇椤圭洰缁存姢</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
                                     <a>鐢熶骇璧勬枡</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html">宸ヤ綔涓績鍒楄〃</a></dd>
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index 80cb672..2567eab 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -254,6 +254,24 @@
                               妯″叿閲囪喘鍏ュ簱鍗�
                           </a>
                       </dd>
+                      <dd>
+                          <a lay-href="妯℃不鍏风鐞�/璁惧淇濆吇璁板綍鍗�/Sb_EquipMaintainBill_PDA.html" style="color: aqua;">
+                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                              璁惧淇濆吇璁板綍鍗�
+                          </a>
+                      </dd>
+                      <dd>
+                          <a lay-href="妯℃不鍏风鐞�/璁惧缁翠慨璁板綍鍗�/Sb_EquipRepairWorkBill_PDA.html" style="color: aqua;">
+                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                              璁惧缁翠慨璁板綍鍗�
+                          </a>
+                      </dd>
+                      <dd>
+                          <a lay-href="妯℃不鍏风鐞�/璁惧鐐规璁板綍鍗�/Sb_EquipDotCheckBill_PDA.html" style="color: aqua;">
+                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                              璁惧鐐规璁板綍鍗�
+                          </a>
+                      </dd>
                   </dl>
               </li>
               <!-- 浠撳偍鏉$爜绠$悊 -->
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_ClassTimePrj.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_ClassTimePrj.html"
index e0d4d0b..ca7483d 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_ClassTimePrj.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_ClassTimePrj.html"
@@ -42,7 +42,7 @@
                             <div class="layui-col-xs4 layui-inline">
                                 <label class="layui-form-label">鐝粍</label>
                                 <div class="layui-input-inline">
-                                    <input type="text" name="z" id="HGroupName" class="layui-input" value="" style="float:left;width:150px;">
+                                    <input type="text" name="HGroupName" id="HGroupName" class="layui-input" value="" style="float:left;width:150px;">
                                     <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="" style="float:left;width:150px;">
                                     <button type="button" lay-submit="" class="layui-btn" lay-filter="HGroup-BT" style="width:40px;">
                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -92,7 +92,7 @@
                                 </div>
                             </div>
                             <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label">绂佺敤鏍囧織</label>
+                                <label class="layui-form-label">绂佺敤鏍囪</label>
                                 <div class="layui-input-inline">
                                     <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
                                     <input type="hidden" value="false" name="HStopflag" id="HStopflag">
@@ -109,7 +109,7 @@
                         </div>
 
                     </div>
-                    <input type="hidden" value="0" name="HParentID" id="HParentID">
+                    <!--<input type="hidden" value="0" name="HParentID" id="HParentID">-->
                 </form>
             </div>
         </div>
@@ -241,18 +241,17 @@
                                 $("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
                             }
                             form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                "HNumber": data.HNumber
-                                , "HItemID": data.HItemID
+                                "HItemID": data.HItemID
                                 , "HName": data.鏍哥畻鏂瑰紡鍚嶇О
                                 , "HNumber": data.鏍哥畻鏂瑰紡浠g爜
                                 , "HDeptName": data.閮ㄩ棬
-                                , "HDeptID": data.閮ㄩ棬浠g爜
+                                , "HDeptID": data.HDeptID
                                 , "hparentName": data.缁勫悕绉�
                                 , "hparentid": data.缁勪唬鐮�
                                 , "HGroupName": data.鐝粍鍚嶇О
-                                , "HGroupID": data.鐝粍浠g爜
-                                , "HStopflag": data.HStopflag
-                                , "HRemark": data.HRemark
+                                , "HGroupID": data.HGroupID
+                                , "HStopflag": data.绂佺敤鏍囪
+                                , "HRemark": data.澶囨敞
                             });
                             layer.close(ajaxLoad);
                         } else {
@@ -325,7 +324,6 @@
                         }
                         $("#HDeptName").val(checkStatus.data[0].HName);
                         $("#HDeptID").val(checkStatus.data[0].HItemID);
-                        $("#HDeptNumber").val(checkStatus.data[0].HNumber);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) { }
@@ -364,7 +362,7 @@
                     type: 2//寮圭獥绫诲瀷
                     , skin: 'layui-layer-rim' //鍔犱笂杈规
                     , area: ['90%', '90%']//澶у皬
-                    , title: '閮ㄩ棬鍒楄〃'//鏍囬
+                    , title: '鎵�灞炵粍鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
                     , content: ['../../Baseset/鍩虹璧勬枡/Gy_ClassTimePrjGroupList.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
@@ -375,7 +373,7 @@
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
                         $("#hparentName").val(checkStatus.data[0].HName);
-                        $("#hparentID").val(checkStatus.data[0].HItemID);
+                        $("#hparentid").val(checkStatus.data[0].HItemID);
                         //$("#HDeptNumber").val(checkStatus.data[0].HNumber);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_OrderBackInfo.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_OrderBackInfo.html"
new file mode 100644
index 0000000..893c39c
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_OrderBackInfo.html"
@@ -0,0 +1,263 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鏂板/缂栬緫璁㈠崟鍙嶉鐘舵��</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <style type="text/css">
+        .layui-form-label {
+            width: 85px;
+        }
+    </style>
+</head>
+<body>
+
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+
+                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+
+
+                            </div>
+
+                        </div>
+                        <div class="layui-card-body">
+                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鍙嶉鐘舵�佷唬鐮�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber">
+                                                    <input id="HItemID" name="HItemID" type="hidden" />
+                                                    <input id="HParentID" name="HParentID" type="hidden" />
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鍙嶉鐘舵�佸悕绉�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HName" lay-verify="HName" id="HName">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鍔╄鐮�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode" id="HHelpCode">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">澶囨敞</label>
+                                                <div class="layui-input-inline">
+                                                    <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label">绂佺敤鏍囧織</label>
+                                            <div class="layui-input-block">
+                                                <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" checked="">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script>
+        //鑾峰彇鍙傛暟
+        function getUrlVars() {
+            var vars = [], hash;
+            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+            for (var i = 0; i < hashes.length; i++) {
+                hash = hashes[i].split('=');
+                vars.push(hash[0]);
+                vars[hash[0]] = hash[1];
+            }
+            return vars;
+        }
+
+        var params = getUrlVars();
+        var hID = params[params[0]];//缂栬緫鏌ョ湅
+        var HType = params[params[1]];    //鍗曟嵁鐘舵��
+        var TagParentId = params[params[2]];  //鐖剁骇ID
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , 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"; });
+            //}
+
+            //#region 澶撮儴宸ュ叿鏍忎簨浠�
+
+            //娓呴櫎
+            form.on('submit(Cancel)', function () {
+                //sessionStorage["SourceFlag"] = false;
+                parent.location.href = "../../../views/index.html"
+                //window.close();//鍏抽棴褰撳墠椤�
+            })
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {//淇濆瓨
+                //debugger;
+                var ModRightNameAdd = 'Gy_RepairType_Edit';
+                var user = sessionStorage["HUserName"];
+                var arr = new Array();
+                var isEndCheck = document.getElementById("HStopflag").checked;
+                data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+
+                data.field.HItemID = hID == "" ? 0 : hID;
+
+                data.field.HParentID = TagParentId == "" ? 0 : TagParentId;
+
+                var oMain = JSON.stringify(data.field)
+                var sMainSub = oMain + ';' + hID + ';' + user + ';' + ModRightNameAdd;
+                if (HType == "Modify") {
+
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "/Gy_OrderBackInfo/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": sMainSub },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                                    });
+                                }
+                                else {
+
+                                    f_alert(data.Message);
+                                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+                                f_alert("閿欒:" + err);
+                                console.log("Reason" + sMainStr);
+                            }
+                        });
+                }
+                else {
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "/Gy_OrderBackInfo/AddBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": oMain },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                                    });
+                                }
+                                else {
+
+                                    f_alert(data.Message);
+                                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+                                f_alert("閿欒:" + err);
+                                console.log("Reason" + sMainStr);
+                            }
+                        });
+                }
+            });
+            //閫�鍑烘寜閽�
+            form.on('submit(Exit)', function () {
+                Pub_Close(1);
+            })
+            //#endregion
+
+            function f_alert(sMsg) {
+                layer.alert(sMsg, { icon: 5 });
+
+            }
+
+            if (HType == "Modify") {
+                $.ajax({
+                    url: GetWEBURL() + "/Gy_OrderBackInfo/xg",
+                    //url: "http://localhost:12761/Gy_Department/xg",
+                    type: "GET",
+                    data: {
+                        "HInterID": hID
+                    },
+                    success: function (d) {
+                        console.log(d);
+                        ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
+                        $("#HNumber").val(d.data[0].HNumber);
+                        $("#HName").val(d.data[0].HName);
+                        $("#HHelpCode").val(d.data[0].HHelpCode);
+                        $("#HRemark").val(d.data[0].HRemark);
+                        $("#HYX").val(d.data[0].HYX);
+                        $("input[name='HStopflag']").prop("checked", d.data[0].HStopflag);//true:閫変腑 false:涓嶉�変腑
+                        layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+                        $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
+                        //table.reload(layTableId, {
+                        //    data: ajaxReturnData
+                        //});
+                    }
+
+                });
+            }
+
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkPayType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkPayType.html"
new file mode 100644
index 0000000..7aff4b9
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkPayType.html"
@@ -0,0 +1,251 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鏂板/缂栬緫宸ヨ祫绫诲瀷</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+
+                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+
+                            </div>
+
+                        </div>
+                        <div class="layui-card-body">
+                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                                <!--<ul class="layui-tab-title">
+                                <li class="layui-this">鍩烘湰淇℃伅</li>-->
+                                <!--<li>鍏朵粬淇℃伅</li>-->
+                                <!--</ul>-->
+                                <h1 style="text-align:center;"><b>宸ヨ祫绫诲瀷</b></h1>
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">宸ヨ祫绫诲瀷浠g爜锛�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
+                                                    <input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">宸ヨ祫绫诲瀷鍚嶇О</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HName" id="HName" autocomplete="off">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">鍔╄鐮�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
+                                                </div>
+                                            </div>
+                                        </div>
+                                         <div class="layui-form-item">
+                                            <div class="layui-col-xs11">
+                                                <label class="layui-form-label"> 澶囨敞</label>
+                                                <div class="layui-input-block">
+                                                    <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label"> 绂佺敤鏍囧織</label>
+                                            <div class="layui-input-inline">
+                                                <!--<input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true">-->
+                                                <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value="">
+                                            </div>
+                                        </div>
+                                       
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script>
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+        }
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
+            }
+            else if (OperationType == 3) {//缂栬緫
+                set_EditFromGrid();
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {//淇濆瓨
+
+                var isEndCheck = document.getElementById("HStopflag").checked;
+                data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+
+                var sMainStr = JSON.stringify(data.field);
+                if (AllowLoadData()) {
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "Gy_WorkPayType/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": sMainStr },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { icon: 1 });
+                                    $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                }
+                                else {
+                                    f_alert(data.Message);
+                                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+                                f_alert("閿欒:" + err);
+                                console.log("Reason" + sMainStr);
+                            }
+                        });
+                }
+            });
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {//
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
+            });
+            ////绂佺敤鏍囧織
+            //form.on('checkbox(HStopflag)', function (data) {
+            //    $("#HStopflag").val(data.elem.checked);
+            //});
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+            //#endregion
+
+
+            //#region 褰撳墠椤甸潰闈㈡墍鏈夌殑鏂规硶
+
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                $("#HItemID").val("0");
+                $("#HNumber").val("");
+            }
+            //缂栬緫
+            function set_EditFromGrid() {
+                $("#HItemID").val(linterid);
+                set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
+            }
+            //缂栬緫鍔犺浇琛ㄥご
+            function set_EditForm(HInterID) {
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                $.ajax({
+                    url: GetWEBURL() + "Gy_WorkPayType/cx",
+                    type: "GET",
+                    data: {
+                        "HInterID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data[0];
+                            $("#HNumber").val(data.宸ヨ祫绫诲瀷浠g爜);//浠g爜
+                            $("#HItemID").val(data.HItemID);//浠g爜ID
+                            $("#HName").val(data.宸ヨ祫绫诲瀷鍚嶇О);//鍚嶇О
+                            $("#HHelpCode").val(data.鍔╄鐮�);//鍔╄浠g爜
+                            $("#HRemark").val(data.澶囨敞);//澶囨敞
+                            $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囪);//true:閫変腑 false:涓嶉�変腑
+                            layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+            //鏁版嵁楠岃瘉
+            function AllowLoadData() {
+                if ($("#HHelpCode").val() == '') {
+                    layer.msg("璇峰~鍐欏姪璁扮爜", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                else {
+                    return true;
+                }
+            }
+            //
+            function f_alert(sMsg) {
+                layer.alert(sMsg, { icon: 5 });
+
+            }
+            //#endregion
+        });
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkType.html"
new file mode 100644
index 0000000..4b976c4
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkType.html"
@@ -0,0 +1,277 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鏂板/缂栬緫宸ョ</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+
+                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+
+                            </div>
+
+                        </div>
+                        <div class="layui-card-body">
+                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                                <!--<ul class="layui-tab-title">
+                                <li class="layui-this">鍩烘湰淇℃伅</li>-->
+                                <!--<li>鍏朵粬淇℃伅</li>-->
+                                <!--</ul>-->
+                                <h1 style="text-align:center;"><b>宸ョ</b></h1>
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">宸ョ浠g爜锛�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
+                                                    <input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">宸ョ鍚嶇О</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HName" id="HName" autocomplete="off">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">鍔╄鐮�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">灏忔椂宸ヨ祫</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HPayMoney" id="HPayMoney" autocomplete="off">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">鏃ュ伐璧�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HDayMoney" id="HDayMoney" autocomplete="off">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鑰冭檻浜烘暟</label>
+                                                <div class="layui-input-inline">
+                                                    <select name="HForEmp" lay-filter="HForEmp" id="HForEmp">
+                                                        <option value="鏄�">鏄�</option>
+                                                        <option value="鍚�">鍚�</option>
+                                                    </select>
+                                                </div>
+                                            </div>
+                                        </div>
+                                         <div class="layui-form-item">
+                                            <div class="layui-col-xs11">
+                                                <label class="layui-form-label"> 澶囨敞锛�</label>
+                                                <div class="layui-input-block">
+                                                    <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label"> 绂佺敤鏍囧織:</label>
+                                            <div class="layui-input-inline">
+                                                <!--<input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true">-->
+                                                <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value="">
+                                            </div>
+                                        </div>
+                                       
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script>
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+        }
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
+            }
+            else if (OperationType == 3) {//缂栬緫
+                set_EditFromGrid();
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {//淇濆瓨
+
+                var isEndCheck = document.getElementById("HStopflag").checked;
+                data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+
+                var sMainStr = JSON.stringify(data.field);
+                if (AllowLoadData()) {
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "Gy_WorkType/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": sMainStr },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { icon: 1 });
+                                    $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                }
+                                else {
+                                    f_alert(data.Message);
+                                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+                                f_alert("閿欒:" + err);
+                                console.log("Reason" + sMainStr);
+                            }
+                        });
+                }
+            });
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {//
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
+            });
+            ////绂佺敤鏍囧織
+            //form.on('checkbox(HStopflag)', function (data) {
+            //    $("#HStopflag").val(data.elem.checked);
+            //});
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+            //#endregion
+
+
+            //#region 褰撳墠椤甸潰闈㈡墍鏈夌殑鏂规硶
+
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                $("#HItemID").val("0");
+                $("#HNumber").val("");
+            }
+            //缂栬緫
+            function set_EditFromGrid() {
+                $("#HItemID").val(linterid);
+                set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
+            }
+            //缂栬緫鍔犺浇琛ㄥご
+            function set_EditForm(HInterID) {
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                $.ajax({
+                    url: GetWEBURL() + "Gy_WorkType/cx",
+                    type: "GET",
+                    data: {
+                        "HInterID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data[0];
+                            $("#HNumber").val(data.宸ョ浠g爜);//浠g爜
+                            $("#HItemID").val(data.HItemID);//浠g爜ID
+                            $("#HName").val(data.宸ョ鍚嶇О);//鍚嶇О
+                            $("#HHelpCode").val(data.鍔╄鐮�);//鍔╄浠g爜
+                            $("#HPayMoney").val(data.灏忔椂宸ヨ祫);//鍔╄浠g爜
+                            $("#HDayMoney").val(data.鏃ュ伐璧�);//鍔╄浠g爜
+                            $("#HForEmp").val(data.鑰冭檻浜烘暟);//鍔╄浠g爜
+                            $("#HRemark").val(data.澶囨敞);//澶囨敞
+                            $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囪);//true:閫変腑 false:涓嶉�変腑
+                            layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+            //鏁版嵁楠岃瘉
+            function AllowLoadData() {
+                if ($("#HHelpCode").val() == '') {
+                    layer.msg("璇峰~鍐欏姪璁扮爜", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                else {
+                    return true;
+                }
+            }
+            //
+            function f_alert(sMsg) {
+                layer.alert(sMsg, { icon: 5 });
+
+            }
+            //#endregion
+        });
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrj.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrj.html"
index 8c43fb8..1492fed 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrj.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrj.html"
@@ -81,6 +81,7 @@
                 , util = layui.util
             var sWhere = "";
             var option = [];
+            var Organization = sessionStorage["OrganizationID"];
             //#endregion
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -158,11 +159,14 @@
                         , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
                         , { field: '鏍哥畻鏂瑰紡浠g爜', title: '鏍哥畻鏂瑰紡浠g爜' }
                         , { field: '鏍哥畻鏂瑰紡鍚嶇О', title: '鏍哥畻鏂瑰紡鍚嶇О' }
-                        //, { field: '鏉″舰鐮�', title: '鏉″舰鐮�' }
+                        , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
+                        , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜' }
+                        , { field: '閮ㄩ棬', title: '閮ㄩ棬' }
+                        , { field: '鐝粍浠g爜', title: '鐝粍浠g爜' }
                         , { field: '鐝粍鍚嶇О', title: '鐝粍' }
-                        , { field: '缁勫悕绉�', title: '鎵�灞炵粍' }
-                        , { field: '閮ㄩ棬', title: '閮ㄩ棬鍚嶇О' }
                         , { field: '澶囨敞', title: '澶囨敞' }
+                        , { field: '缁勪唬鐮�', title: '缁勪唬鐮�' }
+                        , { field: '缁勫悕绉�', title: '缁勫悕绉�' }
                     ]]
                 };
             }
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Currency.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Currency.html"
index 3348dba..3ae9497 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Currency.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Currency.html"
@@ -124,6 +124,7 @@
                 , util = layui.util
                 , tree = layui.tree
             var sWhere = "";
+            var Organization = sessionStorage["OrganizationID"];
             //#endregion
 
             //#region 鍒濆鍖栬〃鏍�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
index d73c0f8..8e4d432 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
@@ -77,7 +77,7 @@
                 , laydate = layui.laydate
             var sWhere = "and HUSEORGID=" + sessionStorage["OrganizationID"];
             var option = [];
-
+            var Organization = sessionStorage["OrganizationID"];
             //#endregion
 
 
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
index 5d5fd61..04d7a6a 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
@@ -78,6 +78,7 @@
             , laydate = layui.laydate
             var sWhere = "";
             var option = [];
+            var Organization = sessionStorage["OrganizationID"];
         //#endregion
 
         //#region 杩涘叆椤甸潰鍗冲姞杞�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
index 1a37772..f8e009d 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
@@ -94,6 +94,7 @@
             var sWhere = "";
 
             var option = [];
+            var Organization = sessionStorage["OrganizationID"];
             //#endregion
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldType.html"
index 9a05e84..de76fa6 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldType.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldType.html"
@@ -8,13 +8,6 @@
     <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/zgqlayui.js"></script>
-    <script src="../../../layuiadmin/treeTable.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/layui/lay/modules/util.js"></script>
-    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>-->
     <script src="../../../layuiadmin/layui/layui.js"></script>
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
@@ -97,57 +90,11 @@
 
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
-            //鍒濆鍖栧姞杞芥爲鍨�
-            //tree.render({
-            //    elem: '#treeCheckItem',
-            //    data: getData(sWhere),
-            //    showCheckbox: false,     //鏄惁鏄剧ず澶嶉�夋
-            //    id: 'demoId',
-            //    isJump: false, //鏄惁鍏佽鐐瑰嚮鑺傜偣鏃跺脊鍑烘柊绐楀彛璺宠浆
-            //    showLine: true,//鏄惁寮�鍚繛鎺ョ嚎
-            //    onlyIconControl: true,   //鐐瑰嚮鍚庝笉鏀剁缉
-            //    click: function (obj) {
-            //        //鐐瑰嚮楂樺厜
-            //        if (obj.data.id !== treeCkData.id) {
-            //            $('div[data-id="' + obj.data.id + '"] span').eq(1).last().addClass("custom-tree-item-clicked");
-            //            $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
-            //            treeCkData = obj.data;
-            //            TagId = obj.data.id;
-            //            TagParentId = obj.data.ParentID;
-            //            Level = obj.data.HLevel + 1;
-            //        }
-            //        else {
-            //            $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
-            //            treeCkData = { id: 0 };
-            //            TagId = "";
-            //            TagParentId = "";
-            //            Level = "1";
-            //        }
-
-            //        $.ajax({
-            //            url: GetWEBURL() + '/Gy_ModelType/cx',
-            //            type: "GET",
-            //            data: { "HInterID": obj.data.id },
-            //            success: function (data1) {
-            //                if (data1.count == 1) {
-            //                    option.data = data1.data;
-            //                    table.render(option);
-            //                    layer.close(index);
-            //                } else {
-            //                    layer.close(index);
-            //                    layer.alert(data1.code + data1.Message, { icon: 5 });
-            //                }
-            //            }, error: function () {
-            //                layer.close(index);
-            //                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-            //            }
-            //        });
-            //    }
-            //});
-
             //鍒濆鍖栬〃鏍�
             set_ClearBill();
             //#endregion
+
+
             //#region 澶村伐鍏锋爮浜嬩欢
 
             table.on('toolbar(mainTable)', function (obj) {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QCCheckClass.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QCCheckClass.html"
index 6d6da9b..a2387a7 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QCCheckClass.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QCCheckClass.html"
@@ -342,7 +342,7 @@
                     }
                 });
             }
-
+        
             //鏂板
             function set_AddNew(obj)
             {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Unit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Unit.html"
index 60833c4..6e2f4eb 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Unit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Unit.html"
@@ -107,6 +107,7 @@
                 , util = layui.util
                 , tree = layui.tree
             var sWhere = "";
+            var Organization = sessionStorage["OrganizationID"];
 
             $.ajax({
                 url: GetWEBURL() + '/Gy_Unit/LoadTree',
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
index 5651949..bb9db44 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
@@ -85,6 +85,7 @@
                 , laydate = layui.laydate
             var sWhere = "";
             var option = [];
+            var Organization = sessionStorage["OrganizationID"];
             //#endregion
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -169,7 +170,7 @@
             }
             //#endregion
 
-
+           
 
             //#region 鏌ヨ
             function get_Display(sWhere) {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkPayType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkPayType.html"
new file mode 100644
index 0000000..93e3083
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkPayType.html"
@@ -0,0 +1,317 @@
+锘�<!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 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/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">宸ヨ祫绫诲瀷浠g爜</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
+                                    </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="HName" id="HName">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+                            </div>
+                        </div>
+
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                            </div>
+                        </script>
+
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+            //鏌ヨ鏉′欢
+            var sWhere = "";
+            var option = [];
+            //#endregion
+
+
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus(obj.config.id);
+                switch (obj.event) {
+                    //鏂板
+                    case 'btn-Add': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'btn-Edit': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'btn-Delete': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                };
+            });
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            // 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , limits: [20, 50, 100, 150, 200, 250]
+                    , limit: 20
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+                        , { field: '宸ヨ祫绫诲瀷浠g爜', title: '宸ヨ祫绫诲瀷浠g爜' }
+                        , { field: '宸ヨ祫绫诲瀷鍚嶇О', title: '宸ヨ祫绫诲瀷鍚嶇О' }
+                        , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
+                        , { field: '澶囨敞', title: '澶囨敞' }
+                        , { field: '浣跨敤鏍囪', title: '浣跨敤鏍囪' }
+                    ]]
+                    //灏嗙鐢ㄧ殑鏁版嵁鏍囩孩
+                    //, done: function (res, cuur, count) {
+                    //    for (var i = 0; i < res.data.length; i++)
+                    //    {
+                    //        if (res.data[i].绂佺敤鏍囪=='Y') {
+                    //            $("table tbody tr").eq(i).css('color','red')
+                    //        }
+                    //    }
+                    //}
+                };
+            }
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var index = layer.load(0, { shade: false });
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_WorkPayType/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.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(index);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //蹇�熸煡璇�
+            function get_FastQuery() {
+                var HNumber = $("#HNumber").val();
+                var HName = $("#HName").val();
+                if (HNumber) {
+                    sWhere += " and 宸ヨ祫绫诲瀷浠g爜 like '%" + HNumber + "%'";
+                }
+                if (HName) {
+                    sWhere += " and 宸ヨ祫绫诲瀷鍚嶇О like '%" + HName + "%'";
+                }
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_WorkPayType/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缂撳瓨
+            }
+            //閲嶇疆蹇�熸煡璇�
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                $("#btnSearch").click();
+            }
+            //鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板宸ヨ祫绫诲瀷',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkPayType.html?OperationType=1&linterid=&HSouceBillType=',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            }
+            //缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].HItemID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫宸ヨ祫绫诲瀷'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkPayType.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HItemID = data[0].HItemID.toString();
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "DeltetGy_WorkPayType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HItemID": HItemID },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+            //#endregion
+            //#region 鍒锋柊
+            function get_Refresh() {
+                set_ClearQuery();
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+    </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkType.html"
new file mode 100644
index 0000000..ef3ecfc
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkType.html"
@@ -0,0 +1,318 @@
+锘�<!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 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/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">宸ョ浠g爜</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
+                                    </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="HName" id="HName">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+                            </div>
+                        </div>
+
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                            </div>
+                        </script>
+
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+            //鏌ヨ鏉′欢
+            var sWhere = "";
+            var option = [];
+            //#endregion
+
+
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus(obj.config.id);
+                switch (obj.event) {
+                    //鏂板
+                    case 'btn-Add': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'btn-Edit': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'btn-Delete': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                };
+            });
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            // 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , limits: [20, 50, 100, 150, 200, 250]
+                    , limit: 20
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+                        , { field: '宸ョ浠g爜', title: '宸ョ浠g爜' }
+                        , { field: '宸ョ鍚嶇О', title: '宸ョ鍚嶇О' }
+                        , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
+                        , { field: '澶囨敞', title: '澶囨敞' }
+                        , { field: '灏忔椂宸ヨ祫', title: '灏忔椂宸ヨ祫' }
+                        , { field: '浣跨敤鏍囪', title: '浣跨敤鏍囪' }
+                    ]]
+                    //灏嗙鐢ㄧ殑鏁版嵁鏍囩孩
+                    //, done: function (res, cuur, count) {
+                    //    for (var i = 0; i < res.data.length; i++)
+                    //    {
+                    //        if (res.data[i].绂佺敤鏍囪=='Y') {
+                    //            $("table tbody tr").eq(i).css('color','red')
+                    //        }
+                    //    }
+                    //}
+                };
+            }
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var index = layer.load(0, { shade: false });
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_WorkType/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.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(index);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //蹇�熸煡璇�
+            function get_FastQuery() {
+                var HNumber = $("#HNumber").val();
+                var HName = $("#HName").val();
+                if (HNumber) {
+                    sWhere += " and 宸ョ浠g爜 like '%" + HNumber + "%'";
+                }
+                if (HName) {
+                    sWhere += " and 宸ョ鍚嶇О like '%" + HName + "%'";
+                }
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_WorkType/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缂撳瓨
+            }
+            //閲嶇疆蹇�熸煡璇�
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                $("#btnSearch").click();
+            }
+            //鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板宸ョ',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkType.html?OperationType=1&linterid=&HSouceBillType=',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            }
+            //缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].HItemID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫宸ョ'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkType.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HItemID = data[0].HItemID.toString();
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "DeltetGy_WorkType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HItemID": HItemID },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+            //#endregion
+            //#region 鍒锋柊
+            function get_Refresh() {
+                set_ClearQuery();
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+    </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Xt_ORGANIZATIONSList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Xt_ORGANIZATIONSList.html"
index df458ea..dbc04db 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Xt_ORGANIZATIONSList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Xt_ORGANIZATIONSList.html"
@@ -80,7 +80,7 @@
                 , laypage = layui.laypage
                 , laydate = layui.laydate
             var sWhere = "";
-
+            var Organization = sessionStorage["OrganizationID"];
             //鍒濆鍖栫晫闈�
             set_ClearBill();
 
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckEdit.html"
new file mode 100644
index 0000000..d5400f5
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckEdit.html"
@@ -0,0 +1,240 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <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/treeTable.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/layui/lay/modules/util.js"></script>
+    <style media="screen">
+        .custom-tree-item-clicked {
+            color: #FC9003
+        }
+    </style>
+</head>
+<body>
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+
+                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+
+                            </div>
+
+                        </div>
+                        <div class="layui-card-body">
+                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">浠g爜</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber">
+                                                    <input id="HItemID" name="HItemID" type="hidden" />
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鍚嶇О</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HName" lay-verify="HName" id="HName">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鍔╄鐮�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode" id="HHelpCode">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">澶囨敞</label>
+                                                <div class="layui-input-inline">
+                                                    <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label">绂佺敤鏍囧織</label>
+                                            <div class="layui-input-block">
+                                                <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+            var closeType = 2;  //鍏抽棴绫诲瀷
+        } else {
+            debugger;
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+            var closeType = params[params[3]];  //鍏抽棴绫诲瀷
+        }
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+            //#endregion
+            //甯歌鐢ㄦ硶
+
+
+            if (OperationType == 3) {
+                $.ajax({
+                    url: GetWEBURL() + "/Gy_DotCheck/EditDotCheck",
+                    type: "GET",
+                    data: {
+                        "HInterID": linterid
+                    },
+                    success: function (d) {
+
+                        ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
+                        $("#HNumber").val(d.data[0].HNumber);
+                        $("#HName").val(d.data[0].HName);
+                        $("#HHelpCode").val(d.data[0].HHelpCode);
+                        $("#HRemark").val(d.data[0].HRemark);
+                        $("#HLevel").val(d.data[0].HLevel);
+                        $("input[name='HStopflag']").prop("checked", d.data[0].HStopflag);//true:閫変腑 false:涓嶉�変腑
+                        layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+                        $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
+                        //table.reload(layTableId, {
+                        //    data: ajaxReturnData
+                        //});
+                    }
+
+                });
+            }
+
+            //#region 宸ュ叿鎸夐挳
+
+            //閫�鍑烘寜閽�
+            form.on('submit(Exit)', function () {
+                Pub_Close(1);
+            })
+
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {//淇濆瓨
+                //debugger;
+                var user = sessionStorage["HUserName"];
+                var isEndCheck = document.getElementById("HStopflag").checked;
+                data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+
+                data.field.HItemID = linterid == "" ? 0 : linterid;
+
+                data.field.HLevel = $("#HLevel").val() == "" ? 1 : $("#HLevel").val();
+
+                var oMain = JSON.stringify(data.field)
+
+                var sMainSub = oMain + ';' + linterid + ';' + user;
+
+                if (OperationType == 3) {
+                    //淇敼
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "/Gy_DotCheck/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": sMainSub },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                                    });
+                                }
+                                else {
+
+                                    f_alert(data.Message);
+                                    console.log("Reason" + sMainSub + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+                                f_alert("閿欒:" + err);
+                                console.log("Reason" + sMainStr);
+                            }
+                        });
+                }
+                else {
+                    //鏂板
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "/Gy_DotCheck/AddBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": sMainSub },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                                    });
+                                }
+                                else {
+
+                                    f_alert(data.Message);
+                                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+                                f_alert("閿欒:" + err);
+                                console.log("Reason" + sMainStr);
+                            }
+                        });
+                }
+            });
+
+            //#endregion
+
+
+            function f_alert(sMsg) {
+                layer.alert(sMsg, { icon: 5 });
+
+            }
+
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckList.html"
new file mode 100644
index 0000000..289a2d6
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckList.html"
@@ -0,0 +1,426 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <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/treeTable.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/layui/lay/modules/util.js"></script>
+    <style media="screen">
+        .custom-tree-item-clicked {
+            color: #FC9003
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">浠g爜</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
+                                    </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="HName" id="HName">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+
+        var TagId = "";
+        var TagParentId = "";
+        var Level = "1";
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , util = layui.util
+                , tree = layui.tree
+            //鏌ヨ鏉′欢
+            var sWhere = "";
+            var option = [];
+            //#endregion
+
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+            //鍒濆鍖栬〃鏍�
+            set_ClearBill();
+            //#endregion
+
+
+            //#region 澶村伐鍏锋爮浜嬩欢
+
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //鏂板
+                    case 'set_AddNew': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'set_ShowBill': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'set_DeleteBill': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //娴忚
+                    case 'btn-view':
+                        get_ViewReport();
+                        break;
+                    //瀹℃牳
+                    case 'btn-Audit': set_AuditBill();
+                        break;
+                    //鍙嶅鏍�
+                    case 'btn-DeAudit': set_DeAuditBill();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                };
+            });
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            //#endregion
+            //鍒濆鍖栬〃鏍�
+
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+
+            //#region鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , limits: [50, 200, 500, 1000, 5000, 10000]
+                    , limit: 50 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 200, 500, 1000, 5000, 10000]
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+                        , { field: 'HNumber', title: '淇濆吇椤圭洰浠g爜', width: 200 }
+                        , { field: 'HName', title: '淇濆吇椤圭洰鍚嶇О', width: 200 }
+                        , { field: 'HLevel', title: '绛夌骇', width: 200 }
+                        , { field: 'HEndFlag', title: '鏄庣粏鏍囪', width: 200 }
+                        , { field: 'HStopFlag', title: '绂佺敤鏍囪', width: 200 }
+                        , { field: 'HRemark', title: '澶囨敞', width: 200 }
+                        , { field: 'HUseFlag', title: '浣跨敤鏍囪', width: 200 }
+                    ]]
+                };
+            }
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_DotCheck/GetDotCheckList',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery() {
+                var HNumber = $("#HNumber").val();
+                var HName = $("#HName").val();
+                if (HNumber) {
+                    sWhere += " and HNumber like '%" + HNumber + "%'";
+                }
+                if (HName) {
+                    sWhere += " and HName like '%" + HName + "%'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                sWhere = "";
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //#region 宸ュ叿鏍忎簨浠�
+            //鏂板
+            function set_AddNew() {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板淇濆吇椤圭洰',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../鍩虹璧勬枡/Gy_DotCheckEdit.html?OperationType=1&linterid=&HSouceBillType='],
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+
+            }
+
+            //淇敼鎸夐挳
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].HItemID.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫鍣ㄥ叿棰嗙敤鍗�'
+                        , closeBtn: 1
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍩虹璧勬枡/Gy_DotCheckEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            };
+
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
+                        btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+                        , yes: function (index, layero) {
+                            $.ajax({
+                                url: GetWEBURL() + '/Gy_DotCheck/DeleteDotCheck',
+                                type: "GET",
+                                data: { "HItemID": data[0].HItemID, "User": sessionStorage["HUserName"] },
+                                success: function (result) {
+                                    if (result.count == 1) {
+                                        layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                            // 寰楀埌frame绱㈠紩
+                                            var index = layer.getFrameIndex(window.name);
+                                            //鍏抽棴褰撳墠frame
+                                            layer.close(index);
+                                            //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                            window.location.reload();
+                                            //閲嶈浇tree
+                                            //tree.reload('treeDepartment', {});
+                                        });
+
+                                    } else {
+                                        layer.alert(result.code + result.Message, { icon: 5 });
+                                    }
+                                }
+                            })
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            };
+
+            //鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").click();
+            }
+
+            //棰勮
+            function get_ViewReport() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + InterID + "&Type=HDotCheck&OpenTmp=鐐规椤圭洰");
+
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+                }
+            }
+
+            //瀹℃牳
+            function set_AuditBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HBillStatus = data[0].HBillStatus.toString(); //鍗曟嵁鐘舵��
+                    var HInterID = data[0].hmainid.toString();
+                    if (HBillStatus > 0) {
+                        layer.msg('鍗曟嵁涓嶄负鏈鏍哥姸鎬侊紒');
+                        return false;
+                    }
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_Mould/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+
+            //鍙嶅鏍�
+            function set_DeAuditBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HBillStatus = data[0].HBillStatus.toString(); //鍗曟嵁鐘舵��
+                    var HInterID = data[0].hmainid.toString();
+                    if (HBillStatus = 0) {
+                        layer.msg('鍗曟嵁宸蹭负鏈鏍哥姸鎬�,鏃犻渶鍙嶅鏍革紒');
+                        return false;
+                    }
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_Mould/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": HInterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+
+            }
+
+
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainEdit.html"
new file mode 100644
index 0000000..07bedfa
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainEdit.html"
@@ -0,0 +1,241 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <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/treeTable.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/layui/lay/modules/util.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <style media="screen">
+        .custom-tree-item-clicked {
+            color: #FC9003
+        }
+    </style>
+</head>
+<body>
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+
+                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+
+                            </div>
+
+                        </div>
+                        <div class="layui-card-body">
+                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">浠g爜</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber">
+                                                    <input id="HItemID" name="HItemID" type="hidden" />
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鍚嶇О</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HName" lay-verify="HName" id="HName">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鍔╄鐮�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode" id="HHelpCode">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">澶囨敞</label>
+                                                <div class="layui-input-inline">
+                                                    <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label">绂佺敤鏍囧織</label>
+                                            <div class="layui-input-block">
+                                                <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+            var closeType = 2;  //鍏抽棴绫诲瀷
+        } else {
+            debugger;
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+            var closeType = params[params[3]];  //鍏抽棴绫诲瀷
+        }
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+            //#endregion
+            //甯歌鐢ㄦ硶
+
+
+            if (OperationType == 3) {
+                $.ajax({
+                    url: GetWEBURL() + "/Gy_Maintain/EditMaintain",
+                    type: "GET",
+                    data: {
+                        "HInterID": linterid
+                    },
+                    success: function (d) {
+
+                        ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
+                        $("#HNumber").val(d.data[0].HNumber);
+                        $("#HName").val(d.data[0].HName);
+                        $("#HHelpCode").val(d.data[0].HHelpCode);
+                        $("#HRemark").val(d.data[0].HRemark);
+                        $("#HLevel").val(d.data[0].HLevel);
+                        $("input[name='HStopflag']").prop("checked", d.data[0].HStopflag);//true:閫変腑 false:涓嶉�変腑
+                        layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+                        $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
+                        //table.reload(layTableId, {
+                        //    data: ajaxReturnData
+                        //});
+                    }
+
+                });
+            }
+            
+            //#region 宸ュ叿鎸夐挳
+
+            //閫�鍑烘寜閽�
+            form.on('submit(Exit)', function () {
+                Pub_Close(1);
+            })
+
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {//淇濆瓨
+                //debugger;
+                var user = sessionStorage["HUserName"];
+                var isEndCheck = document.getElementById("HStopflag").checked;
+                data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+
+                data.field.HItemID = linterid == "" ? 0 : linterid;
+
+                data.field.HLevel = $("#HLevel").val() == "" ? 1 : $("#HLevel").val();
+
+                var oMain = JSON.stringify(data.field)
+
+                var sMainSub = oMain + ';' + linterid + ';' + user;
+
+                if (OperationType == 3) {
+                    //淇敼
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "/Gy_Maintain/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": sMainSub },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                                    });
+                                }
+                                else {
+
+                                    f_alert(data.Message);
+                                    console.log("Reason" + sMainSub + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+                                f_alert("閿欒:" + err);
+                                console.log("Reason" + sMainStr);
+                            }
+                        });
+                }
+                else {
+                    //鏂板
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "/Gy_Maintain/AddBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": sMainSub },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                                    });
+                                }
+                                else {
+
+                                    f_alert(data.Message);
+                                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+                                f_alert("閿欒:" + err);
+                                console.log("Reason" + sMainStr);
+                            }
+                        });
+                }
+            });
+
+            //#endregion
+
+
+            function f_alert(sMsg) {
+                layer.alert(sMsg, { icon: 5 });
+
+            }
+
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainList.html"
new file mode 100644
index 0000000..e13be4f
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainList.html"
@@ -0,0 +1,426 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <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/treeTable.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/layui/lay/modules/util.js"></script>
+    <style media="screen">
+        .custom-tree-item-clicked {
+            color: #FC9003
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">浠g爜</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
+                                    </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="HName" id="HName">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+
+        var TagId = "";
+        var TagParentId = "";
+        var Level = "1";
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , util = layui.util
+                , tree = layui.tree
+            //鏌ヨ鏉′欢
+            var sWhere = "";
+            var option = [];
+            //#endregion
+
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+            //鍒濆鍖栬〃鏍�
+            set_ClearBill();
+            //#endregion
+
+
+            //#region 澶村伐鍏锋爮浜嬩欢
+
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //鏂板
+                    case 'set_AddNew': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'set_ShowBill': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'set_DeleteBill': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //娴忚
+                    case 'btn-view':
+                        get_ViewReport();
+                        break;
+                    //瀹℃牳
+                    case 'btn-Audit': set_AuditBill();
+                        break;
+                    //鍙嶅鏍�
+                    case 'btn-DeAudit': set_DeAuditBill();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                };
+            });
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            //#endregion
+            //鍒濆鍖栬〃鏍�
+
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+
+            //#region鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , limits: [50, 200, 500, 1000, 5000, 10000]
+                    , limit: 50 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 200, 500, 1000, 5000, 10000]
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+                        , { field: 'HNumber', title: '淇濆吇椤圭洰浠g爜', width: 200 }
+                        , { field: 'HName', title: '淇濆吇椤圭洰鍚嶇О', width: 200 }
+                        , { field: 'HLevel', title: '绛夌骇', width: 200 }
+                        , { field: 'HEndFlag', title: '鏄庣粏鏍囪', width: 200 }
+                        , { field: 'HStopFlag', title: '绂佺敤鏍囪', width: 200 }
+                        , { field: 'HRemark', title: '澶囨敞', width: 200 }
+                        , { field: 'HUseFlag', title: '浣跨敤鏍囪', width: 200 }
+                    ]]
+                };
+            }
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_Maintain/GetMaintainlist',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery() {
+                var HNumber = $("#HNumber").val();
+                var HName = $("#HName").val();
+                if (HNumber) {
+                    sWhere += " and HNumber like '%" + HNumber + "%'";
+                }
+                if (HName) {
+                    sWhere += " and HName like '%" + HName + "%'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                sWhere = "";
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //#region 宸ュ叿鏍忎簨浠�
+            //鏂板
+            function set_AddNew() {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板淇濆吇椤圭洰',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../鍩虹璧勬枡/Gy_MaintainEdit.html?OperationType=1&linterid=&HSouceBillType='],
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+
+            }
+
+            //淇敼鎸夐挳
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].HItemID.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫鍣ㄥ叿棰嗙敤鍗�'
+                        , closeBtn: 1
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍩虹璧勬枡/Gy_MaintainEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+                 } else {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                 }
+            };
+
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
+                        btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+                        , yes: function (index, layero) {
+                            $.ajax({
+                                url: GetWEBURL() + '/Gy_Maintain/DeleteMaintain',
+                                type: "GET",
+                                data: { "HItemID": data[0].HItemID, "User": sessionStorage["HUserName"]},
+                                success: function (result) {
+                                    if (result.count == 1) {
+                                        layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                            // 寰楀埌frame绱㈠紩
+                                            var index = layer.getFrameIndex(window.name);
+                                            //鍏抽棴褰撳墠frame
+                                            layer.close(index);
+                                            //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                            window.location.reload();
+                                            //閲嶈浇tree
+                                            //tree.reload('treeDepartment', {});
+                                        });
+
+                                    } else {
+                                        layer.alert(result.code + result.Message, { icon: 5 });
+                                    }
+                                }
+                            })
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            };
+
+            //鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").click();
+            }
+
+            //棰勮
+            function get_ViewReport() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + InterID + "&Type=HMaintain&OpenTmp=淇濆吇椤圭洰");
+
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+                }
+            }
+
+            //瀹℃牳
+            function set_AuditBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HBillStatus = data[0].HBillStatus.toString(); //鍗曟嵁鐘舵��
+                    var HInterID = data[0].hmainid.toString();
+                    if (HBillStatus > 0) {
+                        layer.msg('鍗曟嵁涓嶄负鏈鏍哥姸鎬侊紒');
+                        return false;
+                    }
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_Mould/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+
+            //鍙嶅鏍�
+            function set_DeAuditBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HBillStatus = data[0].HBillStatus.toString(); //鍗曟嵁鐘舵��
+                    var HInterID = data[0].hmainid.toString();
+                    if (HBillStatus = 0) {
+                        layer.msg('鍗曟嵁宸蹭负鏈鏍哥姸鎬�,鏃犻渶鍙嶅鏍革紒');
+                        return false;
+                    }
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_Mould/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": HInterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+
+            }
+
+            
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairCheckEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairCheckEdit.html"
new file mode 100644
index 0000000..3ea0e0b
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairCheckEdit.html"
@@ -0,0 +1,240 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <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/treeTable.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/layui/lay/modules/util.js"></script>
+    <style media="screen">
+        .custom-tree-item-clicked {
+            color: #FC9003
+        }
+    </style>
+</head>
+<body>
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+
+                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+
+                            </div>
+
+                        </div>
+                        <div class="layui-card-body">
+                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">浠g爜</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber">
+                                                    <input id="HItemID" name="HItemID" type="hidden" />
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鍚嶇О</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HName" lay-verify="HName" id="HName">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鍔╄鐮�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode" id="HHelpCode">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">澶囨敞</label>
+                                                <div class="layui-input-inline">
+                                                    <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label">绂佺敤鏍囧織</label>
+                                            <div class="layui-input-block">
+                                                <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+            var closeType = 2;  //鍏抽棴绫诲瀷
+        } else {
+            debugger;
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+            var closeType = params[params[3]];  //鍏抽棴绫诲瀷
+        }
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+            //#endregion
+            //甯歌鐢ㄦ硶
+
+
+            if (OperationType == 3) {
+                $.ajax({
+                    url: GetWEBURL() + "/Gy_RepairCheck/EditRepairCheck",
+                    type: "GET",
+                    data: {
+                        "HInterID": linterid
+                    },
+                    success: function (d) {
+
+                        ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
+                        $("#HNumber").val(d.data[0].HNumber);
+                        $("#HName").val(d.data[0].HName);
+                        $("#HHelpCode").val(d.data[0].HHelpCode);
+                        $("#HRemark").val(d.data[0].HRemark);
+                        $("#HLevel").val(d.data[0].HLevel);
+                        $("input[name='HStopflag']").prop("checked", d.data[0].HStopflag);//true:閫変腑 false:涓嶉�変腑
+                        layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+                        $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
+                        //table.reload(layTableId, {
+                        //    data: ajaxReturnData
+                        //});
+                    }
+
+                });
+            }
+
+            //#region 宸ュ叿鎸夐挳
+
+            //閫�鍑烘寜閽�
+            form.on('submit(Exit)', function () {
+                Pub_Close(1);
+            })
+
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {//淇濆瓨
+                //debugger;
+                var user = sessionStorage["HUserName"];
+                var isEndCheck = document.getElementById("HStopflag").checked;
+                data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+
+                data.field.HItemID = linterid == "" ? 0 : linterid;
+
+                data.field.HLevel = $("#HLevel").val() == "" ? 1 : $("#HLevel").val();
+
+                var oMain = JSON.stringify(data.field)
+
+                var sMainSub = oMain + ';' + linterid + ';' + user;
+
+                if (OperationType == 3) {
+                    //淇敼
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "/Gy_RepairCheck/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": sMainSub },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                                    });
+                                }
+                                else {
+
+                                    f_alert(data.Message);
+                                    console.log("Reason" + sMainSub + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+                                f_alert("閿欒:" + err);
+                                console.log("Reason" + sMainStr);
+                            }
+                        });
+                }
+                else {
+                    //鏂板
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "/Gy_RepairCheck/AddBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": sMainSub },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                                    });
+                                }
+                                else {
+
+                                    f_alert(data.Message);
+                                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+                                f_alert("閿欒:" + err);
+                                console.log("Reason" + sMainStr);
+                            }
+                        });
+                }
+            });
+
+            //#endregion
+
+
+            function f_alert(sMsg) {
+                layer.alert(sMsg, { icon: 5 });
+
+            }
+
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairCheckList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairCheckList.html"
new file mode 100644
index 0000000..510f8e2
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairCheckList.html"
@@ -0,0 +1,426 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <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/treeTable.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/layui/lay/modules/util.js"></script>
+    <style media="screen">
+        .custom-tree-item-clicked {
+            color: #FC9003
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">浠g爜</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
+                                    </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="HName" id="HName">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+
+        var TagId = "";
+        var TagParentId = "";
+        var Level = "1";
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , util = layui.util
+                , tree = layui.tree
+            //鏌ヨ鏉′欢
+            var sWhere = "";
+            var option = [];
+            //#endregion
+
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+            //鍒濆鍖栬〃鏍�
+            set_ClearBill();
+            //#endregion
+
+
+            //#region 澶村伐鍏锋爮浜嬩欢
+
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //鏂板
+                    case 'set_AddNew': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'set_ShowBill': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'set_DeleteBill': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //娴忚
+                    case 'btn-view':
+                        get_ViewReport();
+                        break;
+                    //瀹℃牳
+                    case 'btn-Audit': set_AuditBill();
+                        break;
+                    //鍙嶅鏍�
+                    case 'btn-DeAudit': set_DeAuditBill();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                };
+            });
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            //#endregion
+            //鍒濆鍖栬〃鏍�
+
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+
+            //#region鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , limits: [50, 200, 500, 1000, 5000, 10000]
+                    , limit: 50 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 200, 500, 1000, 5000, 10000]
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+                        , { field: 'HNumber', title: '淇濆吇椤圭洰浠g爜', width: 200 }
+                        , { field: 'HName', title: '淇濆吇椤圭洰鍚嶇О', width: 200 }
+                        , { field: 'HLevel', title: '绛夌骇', width: 200 }
+                        , { field: 'HEndFlag', title: '鏄庣粏鏍囪', width: 200 }
+                        , { field: 'HStopFlag', title: '绂佺敤鏍囪', width: 200 }
+                        , { field: 'HRemark', title: '澶囨敞', width: 200 }
+                        , { field: 'HUseFlag', title: '浣跨敤鏍囪', width: 200 }
+                    ]]
+                };
+            }
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_RepairCheck/GetRepairCheckList',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery() {
+                var HNumber = $("#HNumber").val();
+                var HName = $("#HName").val();
+                if (HNumber) {
+                    sWhere += " and HNumber like '%" + HNumber + "%'";
+                }
+                if (HName) {
+                    sWhere += " and HName like '%" + HName + "%'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                sWhere = "";
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //#region 宸ュ叿鏍忎簨浠�
+            //鏂板
+            function set_AddNew() {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板淇濆吇椤圭洰',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../鍩虹璧勬枡/Gy_RepairCheckEdit.html?OperationType=1&linterid=&HSouceBillType='],
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+
+            }
+
+            //淇敼鎸夐挳
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].HItemID.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫鍣ㄥ叿棰嗙敤鍗�'
+                        , closeBtn: 1
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍩虹璧勬枡/Gy_RepairCheckEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            };
+
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
+                        btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+                        , yes: function (index, layero) {
+                            $.ajax({
+                                url: GetWEBURL() + '/Gy_RepairCheck/DeleteRepairCheck',
+                                type: "GET",
+                                data: { "HItemID": data[0].HItemID, "User": sessionStorage["HUserName"] },
+                                success: function (result) {
+                                    if (result.count == 1) {
+                                        layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                            // 寰楀埌frame绱㈠紩
+                                            var index = layer.getFrameIndex(window.name);
+                                            //鍏抽棴褰撳墠frame
+                                            layer.close(index);
+                                            //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                            window.location.reload();
+                                            //閲嶈浇tree
+                                            //tree.reload('treeDepartment', {});
+                                        });
+
+                                    } else {
+                                        layer.alert(result.code + result.Message, { icon: 5 });
+                                    }
+                                }
+                            })
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            };
+
+            //鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").click();
+            }
+
+            //棰勮
+            function get_ViewReport() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + InterID + "&Type=HRepairCheck&OpenTmp=缁翠慨楠屾敹椤圭洰");
+
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+                }
+            }
+
+            //瀹℃牳
+            function set_AuditBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HBillStatus = data[0].HBillStatus.toString(); //鍗曟嵁鐘舵��
+                    var HInterID = data[0].hmainid.toString();
+                    if (HBillStatus > 0) {
+                        layer.msg('鍗曟嵁涓嶄负鏈鏍哥姸鎬侊紒');
+                        return false;
+                    }
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_Mould/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+
+            //鍙嶅鏍�
+            function set_DeAuditBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HBillStatus = data[0].HBillStatus.toString(); //鍗曟嵁鐘舵��
+                    var HInterID = data[0].hmainid.toString();
+                    if (HBillStatus = 0) {
+                        layer.msg('鍗曟嵁宸蹭负鏈鏍哥姸鎬�,鏃犻渶鍙嶅鏍革紒');
+                        return false;
+                    }
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_Mould/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": HInterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+
+            }
+
+
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairEdit.html"
new file mode 100644
index 0000000..77e8db0
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairEdit.html"
@@ -0,0 +1,240 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <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/treeTable.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/layui/lay/modules/util.js"></script>
+    <style media="screen">
+        .custom-tree-item-clicked {
+            color: #FC9003
+        }
+    </style>
+</head>
+<body>
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+
+                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+
+                            </div>
+
+                        </div>
+                        <div class="layui-card-body">
+                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">浠g爜</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber">
+                                                    <input id="HItemID" name="HItemID" type="hidden" />
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鍚嶇О</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HName" lay-verify="HName" id="HName">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鍔╄鐮�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode" id="HHelpCode">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">澶囨敞</label>
+                                                <div class="layui-input-inline">
+                                                    <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label">绂佺敤鏍囧織</label>
+                                            <div class="layui-input-block">
+                                                <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+            var closeType = 2;  //鍏抽棴绫诲瀷
+        } else {
+            debugger;
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+            var closeType = params[params[3]];  //鍏抽棴绫诲瀷
+        }
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+            //#endregion
+            //甯歌鐢ㄦ硶
+
+
+            if (OperationType == 3) {
+                $.ajax({
+                    url: GetWEBURL() + "/Gy_Repair/EditRepair",
+                    type: "GET",
+                    data: {
+                        "HInterID": linterid
+                    },
+                    success: function (d) {
+
+                        ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
+                        $("#HNumber").val(d.data[0].HNumber);
+                        $("#HName").val(d.data[0].HName);
+                        $("#HHelpCode").val(d.data[0].HHelpCode);
+                        $("#HRemark").val(d.data[0].HRemark);
+                        $("#HLevel").val(d.data[0].HLevel);
+                        $("input[name='HStopflag']").prop("checked", d.data[0].HStopflag);//true:閫変腑 false:涓嶉�変腑
+                        layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+                        $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
+                        //table.reload(layTableId, {
+                        //    data: ajaxReturnData
+                        //});
+                    }
+
+                });
+            }
+
+            //#region 宸ュ叿鎸夐挳
+
+            //閫�鍑烘寜閽�
+            form.on('submit(Exit)', function () {
+                Pub_Close(1);
+            })
+
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {//淇濆瓨
+                //debugger;
+                var user = sessionStorage["HUserName"];
+                var isEndCheck = document.getElementById("HStopflag").checked;
+                data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+
+                data.field.HItemID = linterid == "" ? 0 : linterid;
+
+                data.field.HLevel = $("#HLevel").val() == "" ? 1 : $("#HLevel").val();
+
+                var oMain = JSON.stringify(data.field)
+
+                var sMainSub = oMain + ';' + linterid + ';' + user;
+
+                if (OperationType == 3) {
+                    //淇敼
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "/Gy_Repair/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": sMainSub },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                                    });
+                                }
+                                else {
+
+                                    f_alert(data.Message);
+                                    console.log("Reason" + sMainSub + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+                                f_alert("閿欒:" + err);
+                                console.log("Reason" + sMainStr);
+                            }
+                        });
+                }
+                else {
+                    //鏂板
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "/Gy_Repair/AddBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": sMainSub },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                                    });
+                                }
+                                else {
+
+                                    f_alert(data.Message);
+                                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+                                f_alert("閿欒:" + err);
+                                console.log("Reason" + sMainStr);
+                            }
+                        });
+                }
+            });
+
+            //#endregion
+
+
+            function f_alert(sMsg) {
+                layer.alert(sMsg, { icon: 5 });
+
+            }
+
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairList.html"
new file mode 100644
index 0000000..54034e8
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairList.html"
@@ -0,0 +1,426 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <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/treeTable.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/layui/lay/modules/util.js"></script>
+    <style media="screen">
+        .custom-tree-item-clicked {
+            color: #FC9003
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">浠g爜</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
+                                    </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="HName" id="HName">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+
+        var TagId = "";
+        var TagParentId = "";
+        var Level = "1";
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , util = layui.util
+                , tree = layui.tree
+            //鏌ヨ鏉′欢
+            var sWhere = "";
+            var option = [];
+            //#endregion
+
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+            //鍒濆鍖栬〃鏍�
+            set_ClearBill();
+            //#endregion
+
+
+            //#region 澶村伐鍏锋爮浜嬩欢
+
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //鏂板
+                    case 'set_AddNew': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'set_ShowBill': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'set_DeleteBill': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //娴忚
+                    case 'btn-view':
+                        get_ViewReport();
+                        break;
+                    //瀹℃牳
+                    case 'btn-Audit': set_AuditBill();
+                        break;
+                    //鍙嶅鏍�
+                    case 'btn-DeAudit': set_DeAuditBill();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                };
+            });
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            //#endregion
+            //鍒濆鍖栬〃鏍�
+
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+
+            //#region鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , limits: [50, 200, 500, 1000, 5000, 10000]
+                    , limit: 50 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 200, 500, 1000, 5000, 10000]
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+                        , { field: 'HNumber', title: '淇濆吇椤圭洰浠g爜', width: 200 }
+                        , { field: 'HName', title: '淇濆吇椤圭洰鍚嶇О', width: 200 }
+                        , { field: 'HLevel', title: '绛夌骇', width: 200 }
+                        , { field: 'HEndFlag', title: '鏄庣粏鏍囪', width: 200 }
+                        , { field: 'HStopFlag', title: '绂佺敤鏍囪', width: 200 }
+                        , { field: 'HRemark', title: '澶囨敞', width: 200 }
+                        , { field: 'HUseFlag', title: '浣跨敤鏍囪', width: 200 }
+                    ]]
+                };
+            }
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_Repair/GetRepairList',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery() {
+                var HNumber = $("#HNumber").val();
+                var HName = $("#HName").val();
+                if (HNumber) {
+                    sWhere += " and HNumber like '%" + HNumber + "%'";
+                }
+                if (HName) {
+                    sWhere += " and HName like '%" + HName + "%'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                sWhere = "";
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //#region 宸ュ叿鏍忎簨浠�
+            //鏂板
+            function set_AddNew() {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板淇濆吇椤圭洰',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../鍩虹璧勬枡/Gy_RepairEdit.html?OperationType=1&linterid=&HSouceBillType='],
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+
+            }
+
+            //淇敼鎸夐挳
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].HItemID.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫鍣ㄥ叿棰嗙敤鍗�'
+                        , closeBtn: 1
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍩虹璧勬枡/Gy_RepairEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            };
+
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
+                        btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+                        , yes: function (index, layero) {
+                            $.ajax({
+                                url: GetWEBURL() + '/Gy_Repair/DeleteRepair',
+                                type: "GET",
+                                data: { "HItemID": data[0].HItemID, "User": sessionStorage["HUserName"] },
+                                success: function (result) {
+                                    if (result.count == 1) {
+                                        layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                            // 寰楀埌frame绱㈠紩
+                                            var index = layer.getFrameIndex(window.name);
+                                            //鍏抽棴褰撳墠frame
+                                            layer.close(index);
+                                            //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                            window.location.reload();
+                                            //閲嶈浇tree
+                                            //tree.reload('treeDepartment', {});
+                                        });
+
+                                    } else {
+                                        layer.alert(result.code + result.Message, { icon: 5 });
+                                    }
+                                }
+                            })
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            };
+
+            //鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").click();
+            }
+
+            //棰勮
+            function get_ViewReport() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + InterID + "&Type=HRepair&OpenTmp=缁翠慨椤圭洰");
+
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+                }
+            }
+
+            //瀹℃牳
+            function set_AuditBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HBillStatus = data[0].HBillStatus.toString(); //鍗曟嵁鐘舵��
+                    var HInterID = data[0].hmainid.toString();
+                    if (HBillStatus > 0) {
+                        layer.msg('鍗曟嵁涓嶄负鏈鏍哥姸鎬侊紒');
+                        return false;
+                    }
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_Mould/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+
+            //鍙嶅鏍�
+            function set_DeAuditBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HBillStatus = data[0].HBillStatus.toString(); //鍗曟嵁鐘舵��
+                    var HInterID = data[0].hmainid.toString();
+                    if (HBillStatus = 0) {
+                        layer.msg('鍗曟嵁宸蹭负鏈鏍哥姸鎬�,鏃犻渶鍙嶅鏍革紒');
+                        return false;
+                    }
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_Mould/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": HInterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+
+            }
+
+
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
index f65f189..2c334bf 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
@@ -84,6 +84,7 @@
             //鏌ヨ鏉′欢
             var sWhere = "";
             var option = [];
+            var Organization = sessionStorage["OrganizationID"];
             //#endregion
 
             //#region 杩涘叆椤甸潰鏃㈠姞杞�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
index 9940913..524c6be 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
@@ -82,6 +82,7 @@
                 , laydate = layui.laydate
             var sWhere = "";
             var option = [];
+            var Organization = sessionStorage["OrganizationID"];
             //#endregion
 
             //#region 杩涘叆椤甸潰鏃㈠姞杞�
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_Add_MouldProdBackBillList.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_Add_MouldProdBackBillList.html"
index 1d9fab0..6e82c21 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_Add_MouldProdBackBillList.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_Add_MouldProdBackBillList.html"
@@ -241,7 +241,7 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
+                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
                 switch (obj.event) {
                     //鏂板涓�琛�
                     case 'btn-AddLine': btnAddLine(NewRow);
@@ -648,6 +648,9 @@
                     , { field: 'HMaterName', title: '鍣ㄥ叿鍚嶇О', edit: 'text', width: 100 }
                     , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
                     , { field: 'HBatchNo', title: '鎵规', edit: 'text', width: 100 }
+                    , { field: 'HUnitID', title: 'HUnitID', edit: 'text', width: 100, hide: true}
+                    , { field: 'HUnitCode', title: '璁¢噺鍗曚綅浠g爜', edit: 'text', event: 'HUnitCode', width: 100 }
+                    , { field: 'HUnitName', title: '璁¢噺鍗曚綅', edit: 'text', width: 100 }
                     , { field: 'HDesignLife', title: '璁捐瀵垮懡', edit: 'text', width: 100 }
                     , { field: 'HLeaveLife', title: '鍓╀綑瀵垮懡', edit: 'text', width: 100 }
                     , { field: 'HUseLife', title: '绱Н浣跨敤瀵垮懡', edit: 'text', width: 100 }
@@ -682,7 +685,7 @@
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
                 get_MAXNum();
-                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
+                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "","HUnitName":"","HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
                 table.render(option);
             }
             //鑾峰彇鏈�澶у崟鎹彿
@@ -706,7 +709,7 @@
             function set_EditFromGrid(linterid) {
                 set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
                 set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
-                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
+                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
                 table.render(option);
             }
             //缂栬緫鑾峰彇琛ㄥご
@@ -885,7 +888,46 @@
                                 }
                             });
                         }
+                        if (obj.event === 'HUnitCode')  //璁¢噺鍗曚綅淇℃伅
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '璁¢噺鍗曚綅鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../PublicPage/UnitInformation.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
 
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HUnitID: checkStatus.data[0].HItemID,
+                                        HUnitCode: checkStatus.data[0].HNumber,
+                                        HUnitName: checkStatus.data[0].HName,
+                                    });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
                         if (obj.event === 'HWHCode')  //浠撳簱浠g爜
                         {
                             //椤甸潰灞�-鑷畾涔�
@@ -1027,6 +1069,10 @@
                             layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍙戞枡浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             return Result = false;
                         }
+                        if (sSubStr[i].HUnitID == "") {
+                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁¢噺鍗曚綅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return Result = false;
+                        }
                         //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
                         if (parseFloat(sSubStr[i].HQty) == 0) {
                             layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,浜у搧鍏ュ簱璁板綍鏈壂鐮侊紙瀹炲彂鏁伴噺涓�0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
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_Add_MouldProdOutBillList.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_Add_MouldProdOutBillList.html"
index 5290bf5..e2cce6a 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_Add_MouldProdOutBillList.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_Add_MouldProdOutBillList.html"
@@ -222,6 +222,9 @@
                     , { field: 'HMaterName', title: '鍣ㄥ叿鍚嶇О', edit: 'text', width: 100 }
                     , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
                     , { field: 'HBatchNo', title: '鎵规', edit: 'text', width: 100 }
+                    , { field: 'HUnitID', title: 'HUnitID', edit: 'text', width: 100, hide: true }
+                    , { field: 'HUnitCode', title: '璁¢噺鍗曚綅浠g爜', edit: 'text', event: 'HUnitCode', width: 100 }
+                    , { field: 'HUnitName', title: '璁¢噺鍗曚綅', edit: 'text', width: 100 }
                     , { field: 'HDesignLife', title: '璁捐瀵垮懡', edit: 'text', width: 100 }
                     , { field: 'HLeaveLife', title: '鍓╀綑瀵垮懡', edit: 'text', width: 100 }
                     , { field: 'HUseLife', title: '绱Н浣跨敤瀵垮懡', edit: 'text', width: 100 }
@@ -280,7 +283,7 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HRemark": "" };
+                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HRemark": "" };
                 switch (obj.event) {
                     case 'btn-AddLine':
                         //table.cache["mainTable"].push(AddRow[rows]);
@@ -970,19 +973,14 @@
                 return false;
             }
             if (!typeof (sSubStr) == "undefined") {
-                //for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
-                //    if (parseFloat(sSubStr[i].HQtyMust) > 0) {
-                //        if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
-                //        {
-                //            layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
-                //            return false;
-                //        }
-                //    }
-                //}
                 for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
                     if (parseFloat(sSubStr[i].HQty) > 0) {
                         s = 1;
                     }
+                    if (sSubStr[i].HUnitID == "") {
+                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁¢噺鍗曚綅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return Result = false;
+                    }
                 }
                 if (s == 0) {
                     layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
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_MouldMoveStockStepInBill.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_MouldMoveStockStepInBill.html"
index 55f8246..8de89ac 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_MouldMoveStockStepInBill.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_MouldMoveStockStepInBill.html"
@@ -241,6 +241,9 @@
                     , { field: 'HMaterName', title: '鍣ㄥ叿鍚嶇О', edit: 'text', width: 100 }
                     , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
                     , { field: 'HBatchNo', title: '鎵规', edit: 'text', width: 100 }
+                    , { field: 'HUnitID', title: 'HUnitID', edit: 'text', width: 100, hide: true }
+                    , { field: 'HUnitCode', title: '璁¢噺鍗曚綅浠g爜', edit: 'text', event: 'HUnitCode', width: 100 }
+                    , { field: 'HUnitName', title: '璁¢噺鍗曚綅', edit: 'text', width: 100 }
                     , { field: 'HDesignLife', title: '璁捐瀵垮懡', edit: 'text', width: 100 }
                     , { field: 'HLeaveLife', title: '鍓╀綑瀵垮懡', edit: 'text', width: 100 }
                     , { field: 'HUseLife', title: '绱Н浣跨敤瀵垮懡', edit: 'text', width: 100 }
@@ -271,7 +274,7 @@
             //鍒ゆ柇鏄惁鏂板
             if (OperationType == 1) {
                 //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
-                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HStockOrgID": sessionStorage["OrganizationID"], "HOtherOrgID": 0, "HOtherOrgCode": "", "HOtherOrgName": "", "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" }];
+                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "","HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HStockOrgID": sessionStorage["OrganizationID"], "HOtherOrgID": 0, "HOtherOrgCode": "", "HOtherOrgName": "", "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" }];
                 table.render(option);
             }
             else {
@@ -304,7 +307,7 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HStockOrgID": sessionStorage["OrganizationID"], "HOtherOrgID": 0, "HOtherOrgCode": "", "HOtherOrgName": "", "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" };
+                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HStockOrgID": sessionStorage["OrganizationID"], "HOtherOrgID": 0, "HOtherOrgCode": "", "HOtherOrgName": "", "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" };
                 switch (obj.event) {
                     case 'btn-AddLine':
                         //table.cache["mainTable"].push(AddRow[rows]);
@@ -400,7 +403,46 @@
                                 }
                             });
                         }
+                        if (obj.event === 'HUnitCode')  //璁¢噺鍗曚綅淇℃伅
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '璁¢噺鍗曚綅鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../PublicPage/UnitInformation.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
 
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HUnitID: checkStatus.data[0].HItemID,
+                                        HUnitCode: checkStatus.data[0].HNumber,
+                                        HUnitName: checkStatus.data[0].HName,
+                                    });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
                         if (obj.event === 'HOtherOrgCode')  //缁勭粐
                         {
                             //椤甸潰灞�-鑷畾涔�
@@ -1110,6 +1152,10 @@
                         layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璋冨嚭浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         return Result = false;
                     }
+                    if (sSubStr[i].HUnitID == "") {
+                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁¢噺鍗曚綅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return Result = false;
+                    }
                     if (HStockStyle == "璺ㄧ粍缁囪皟鎷�" && sSubStr[i].HStockOrgID == sSubStr[i].HOtherOrgID) {
                         layer.msg("璋冩嫧绫诲瀷涓鸿法缁勭粐璋冩嫧锛屾槑缁嗚褰曠" + (i + 1) + "琛�,璋冨嚭缁勭粐鍜屽綋鍓嶇粍缁囦竴鑷� !", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         return Result = false;
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_MouldMoveStockStepInBillList.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_MouldMoveStockStepInBillList.html"
index 0067ee7..053704f 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_MouldMoveStockStepInBillList.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_MouldMoveStockStepInBillList.html"
@@ -75,6 +75,8 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -245,6 +247,7 @@
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
+                    //鏂板
                     case 'btn-Add':
                         //椤甸潰灞�-鑷畾涔�
                         layer.open({
@@ -265,6 +268,7 @@
                             }
                         });
                         break;
+                    //缂栬緫
                     case 'btn-Edit':
                         var checkStatus = table.checkStatus('mainTable')
                             , data = checkStatus.data;
@@ -334,6 +338,12 @@
                         break;
                     case 'btn-print': get_PrintReport();
                         break;
+                    //瀹℃牳
+                    case 'btn-audit': get_Audit();
+                        break;
+                    //鍙嶅鏍�
+                    case 'btn-Faudit': get_FAudit();
+                        break;
                     //鍒锋柊
                     case 'get_Refresh': get_Refresh();
                         break;
@@ -383,26 +393,72 @@
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
                 }
             }
-            ////杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            //$.ajax({
-            //    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-            //    url: GetWEBURL() + '/Sc_MouldProdOutBill/GetMouldProdOutBill',
-            //    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.code + data1.Message, { icon: 5 });
-            //        }
-            //    }, error: function () {
-            //        layer.close(index);
-            //        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-            //    }
-            //});
+
+            //瀹℃牳
+            function get_Audit() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "Sc_MouldMoveStockStepInBill/AuditMouldMoveStockStepInBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 1},
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    window.location.reload();
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+                }
+            }
+
+            //鍙嶅鏍�
+            function get_FAudit() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "Sc_MouldMoveStockStepInBill/AuditMouldMoveStockStepInBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 2 },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    window.location.reload();
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+                }
+            }
 
             //#region 蹇�熻繃婊�
             function get_FastQuery(table, option) {
@@ -422,6 +478,7 @@
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             }
             //#endregion
+
             //#region 閲嶇疆杩囨护鏉′欢
             function set_ClearQuery() {
                 $("#HDate").val("");//寮�濮嬫棩鏈�
@@ -439,20 +496,6 @@
             }
             //#endregion
 
-
-
-            ////鐩戝惉琛屽弻鍑讳簨浠�
-            //table.on('rowDouble(mainTable)', function (obj) {
-            //    layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
-            //});
-
-
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
 
 
             //浠ヤ笂鏄痩ayui妯″潡
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_MouldMoveStockStepOutBill.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_MouldMoveStockStepOutBill.html"
index cd00e09..f6e7fce 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_MouldMoveStockStepOutBill.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_MouldMoveStockStepOutBill.html"
@@ -228,6 +228,9 @@
                     , { field: 'HMaterName', title: '鍣ㄥ叿鍚嶇О', edit: 'text', width: 100 }
                     , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
                     , { field: 'HBatchNo', title: '鎵规', edit: 'text', width: 100 }
+                    , { field: 'HUnitID', title: 'HUnitID', edit: 'text', width: 100, hide: true }
+                    , { field: 'HUnitCode', title: '璁¢噺鍗曚綅浠g爜', edit: 'text', event: 'HUnitCode', width: 100 }
+                    , { field: 'HUnitName', title: '璁¢噺鍗曚綅', edit: 'text', width: 100 }
                     , { field: 'HDesignLife', title: '璁捐瀵垮懡', edit: 'text', width: 100 }
                     , { field: 'HLeaveLife', title: '鍓╀綑瀵垮懡', edit: 'text', width: 100 }
                     , { field: 'HUseLife', title: '绱浣跨敤瀵垮懡', edit: 'text', width: 120 }
@@ -259,7 +262,7 @@
             //鍒ゆ柇鏄惁鏂板
             if (OperationType == 1) {
                 //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
-                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HOtherOrgID": sessionStorage["OrganizationID"], "HStockOrgID": 0, "HStockOrgCode": "", "HStockOrgName": "", "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" }];
+                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HOtherOrgID": sessionStorage["OrganizationID"], "HStockOrgID": 0, "HStockOrgCode": "", "HStockOrgName": "", "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" }];
                 table.render(option);
             }
             else {
@@ -295,7 +298,7 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HOtherOrgID": sessionStorage["OrganizationID"], "HStockOrgID": 0, "HStockOrgCode": "", "HStockOrgName": "", "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" };
+                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HOtherOrgID": sessionStorage["OrganizationID"], "HStockOrgID": 0, "HStockOrgCode": "", "HStockOrgName": "", "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" };
                 switch (obj.event) {
                     case 'btn-AddLine':
                         //table.cache["mainTable"].push(AddRow[rows]);
@@ -611,7 +614,46 @@
                                 }
                             });
                         }
+                        if (obj.event === 'HUnitCode')  //璁¢噺鍗曚綅淇℃伅
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '璁¢噺鍗曚綅鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../PublicPage/UnitInformation.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
 
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HUnitID: checkStatus.data[0].HItemID,
+                                        HUnitCode: checkStatus.data[0].HNumber,
+                                        HUnitName: checkStatus.data[0].HName,
+                                    });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
                         obj.event = "";
                         return false;
 
@@ -1121,6 +1163,10 @@
                         layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璋冨嚭浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         return Result = false;
                     }
+                    if (sSubStr[i].HUnitID == "") {
+                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁¢噺鍗曚綅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return Result = false;
+                    }
                     if (HStockStyle == "璺ㄧ粍缁囪皟鎷�" && sSubStr[i].HStockOrgID == sSubStr[i].HOtherOrgID) {
                         layer.msg("璋冩嫧绫诲瀷涓鸿法缁勭粐璋冩嫧锛屾槑缁嗚褰曠" + (i + 1) + "琛�,璋冨叆缁勭粐鍜屽綋鍓嶇粍缁囦竴鑷� !", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         return Result = false;
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_MouldMoveStockStepOutBillList.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_MouldMoveStockStepOutBillList.html"
index e31f7a8..66baf39 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_MouldMoveStockStepOutBillList.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_MouldMoveStockStepOutBillList.html"
@@ -76,6 +76,8 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -335,6 +337,12 @@
                         break;
                     case 'btn-print': get_PrintReport();
                         break;
+                    //瀹℃牳
+                    case 'btn-audit': get_Audit();
+                        break;
+                    //鍙嶅鏍�
+                    case 'btn-Faudit': get_FAudit();
+                        break;
                     //鍒锋柊
                     case 'get_Refresh': get_Refresh();
                         break;
@@ -384,7 +392,74 @@
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
                 }
             }
-           
+
+            //瀹℃牳
+            function get_Audit() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "Sc_MouldMoveStockStepOutBill/AuditMouldMoveStockStepOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 1 },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    window.location.reload();
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+                }
+            }
+
+            //鍙嶅鏍�
+            function get_FAudit() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "Sc_MouldMoveStockStepOutBill/AuditMouldMoveStockStepOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 2 },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    window.location.reload();
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+                }
+            }
+
+
             //#region 蹇�熻繃婊�
             function get_FastQuery(table, option) {
                 var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
@@ -403,6 +478,7 @@
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             }
             //#endregion
+
             //#region 閲嶇疆杩囨护鏉′欢
             function set_ClearQuery() {
                 $("#HDate").val("");//寮�濮嬫棩鏈�
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_MouldOtherOutBillEdit.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_MouldOtherOutBillEdit.html"
index 49731ee..3ddfc59 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_MouldOtherOutBillEdit.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_MouldOtherOutBillEdit.html"
@@ -228,7 +228,7 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
+                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
                 switch (obj.event) {
                     //鏂板涓�琛�
                     case 'btn-AddLine': btnAddLine(NewRow);
@@ -563,6 +563,9 @@
                     , { field: 'HMaterName', title: '鍣ㄥ叿鍚嶇О', edit: 'text', width: 100 }
                     , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
                     , { field: 'HBatchNo', title: '鎵规', edit: 'text', width: 100 }
+                    , { field: 'HUnitID', title: 'HUnitID', edit: 'text', width: 100, hide: true }
+                    , { field: 'HUnitCode', title: '璁¢噺鍗曚綅浠g爜', edit: 'text', event: 'HUnitCode', width: 100 }
+                    , { field: 'HUnitName', title: '璁¢噺鍗曚綅', edit: 'text', width: 100 }
                     , { field: 'HDesignLife', title: '璁捐瀵垮懡', edit: 'text', width: 100 }
                     , { field: 'HLeaveLife', title: '鍓╀綑瀵垮懡', edit: 'text', width: 100 }
                     , { field: 'HUseLife', title: '绱Н浣跨敤瀵垮懡', edit: 'text', width: 100 }
@@ -596,7 +599,7 @@
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
                 get_MAXNum();
-                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
+                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "","HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
                 table.render(option);
             }
             //鑾峰彇鏈�澶у崟鎹彿
@@ -620,7 +623,7 @@
             function set_EditFromGrid(linterid) {
                 set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
                 set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
-                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
+                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "","HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
                 table.render(option);
             }
             //缂栬緫鑾峰彇琛ㄥご
@@ -797,7 +800,46 @@
                                 }
                             });
                         }
+                        if (obj.event === 'HUnitCode')  //璁¢噺鍗曚綅淇℃伅
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '璁¢噺鍗曚綅鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../PublicPage/UnitInformation.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
 
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HUnitID: checkStatus.data[0].HItemID,
+                                        HUnitCode: checkStatus.data[0].HNumber,
+                                        HUnitName: checkStatus.data[0].HName,
+                                    });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
                         if (obj.event === 'HWHCode')  //浠撳簱浠g爜
                         {
                             //椤甸潰灞�-鑷畾涔�
@@ -919,6 +961,10 @@
                             layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍙戞枡浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             return Result = false;
                         }
+                        if (sSubStr[i].HUnitID == "") {
+                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁¢噺鍗曚綅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return Result = false;
+                        }
                     }
                 }
                 else {
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_MouldOtherOutBillList.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_MouldOtherOutBillList.html"
index 2c01dc2..4065b58 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_MouldOtherOutBillList.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_MouldOtherOutBillList.html"
@@ -75,6 +75,8 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -326,6 +328,12 @@
                         break;
                     case 'btn-print': get_PrintReport();
                         break;
+                    //瀹℃牳s
+                    case 'btn-audit': get_Audit();
+                        break;
+                    //鍙嶅鏍�
+                    case 'btn-Faudit': get_FAudit();
+                        break;
                     //鍒锋柊
                     case 'get_Refresh': get_Refresh();
                         break;
@@ -367,27 +375,72 @@
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
                 }
             }
-            ////杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            //$.ajax({
-            //    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-            //    url: GetWEBURL() + '/Sc_MouldProdOutBill/GetMouldProdOutBill',
-            //    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.code + data1.Message, { icon: 5 });
-            //        }
-            //    }, error: function () {
-            //        layer.close(index);
-            //        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-            //    }
-            //});
 
+            //瀹℃牳
+            function get_Audit() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "Sc_MouldOtherOutBill/AuditMouldOtherOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 1 },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    window.location.reload();
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+                }
+            }
+
+            //鍙嶅鏍�
+            function get_FAudit() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "Sc_MouldOtherOutBill/AuditMouldOtherOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 2 },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    window.location.reload();
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+                }
+            }
             //#region 蹇�熻繃婊�
             function get_FastQuery(table, option) {
                 var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
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_MouldProdBackBillList.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_MouldProdBackBillList.html"
index e658f8a..71f5e38 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_MouldProdBackBillList.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_MouldProdBackBillList.html"
@@ -74,8 +74,8 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audi"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-faudi"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audi"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-faudi"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -334,6 +334,12 @@
                         break;
                     case 'btn-print': get_PrintReport();
                         break;
+                    //瀹℃牳
+                    case 'btn-audit': get_Audit();
+                        break;
+                    //鍙嶅鏍�
+                    case 'btn-Faudit': get_FAudit();
+                        break;
                     //鍒锋柊
                     case 'get_Refresh': get_Refresh();
                         break;
@@ -375,6 +381,72 @@
                 }
             }
 
+            //瀹℃牳
+            function get_Audit() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "Sc_MouldProdBackBill/AuditMouldProdBackBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 1},
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    window.location.reload();
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+                }
+            }
+
+            //鍙嶅鏍�
+            function get_FAudit() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "Sc_MouldProdBackBill/AuditMouldProdBackBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 2 },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    window.location.reload();
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+                }
+            }
+
             //#region 蹇�熻繃婊�
             function get_FastQuery(table, option) {
                 var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
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_MouldProdInBillEdit.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_MouldProdInBillEdit.html"
index b4893c4..f6b7bea 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_MouldProdInBillEdit.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_MouldProdInBillEdit.html"
@@ -236,6 +236,7 @@
                 , element = layui.element;
             //鏌ヨ鏉′欢
             var option = [];
+            var option1 = [];
             var sWhere = "";
             var sBillType = "3801";
             //#endregion
@@ -265,7 +266,7 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
+                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "","HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
                 console.log(NewRow);
                 switch (obj.event) {
                     //鏂板涓�琛�
@@ -682,6 +683,9 @@
                     , { field: 'HMaterName', title: '鍣ㄥ叿鍚嶇О', edit: 'text', width: 100 }
                     , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
                     , { field: 'HBatchNo', title: '鎵规', edit: 'text', width: 100 }
+                    , { field: 'HUnitID', title: 'HUnitID', edit: 'text', width: 100, hide: true }
+                    , { field: 'HUnitCode', title: '璁¢噺鍗曚綅浠g爜', edit: 'text', event: 'HUnitCode', width: 100 }
+                    , { field: 'HUnitName', title: '璁¢噺鍗曚綅', edit: 'text', width: 100 }
                     , { field: 'HDesignLife', title: '璁捐瀵垮懡', edit: 'text', width: 100 }
                     , { field: 'HLeaveLife', title: '鍓╀綑瀵垮懡', edit: 'text', width: 100 }
                     , { field: 'HUseLife', title: '浣跨敤瀵垮懡', edit: 'text', width: 100 }
@@ -718,16 +722,16 @@
                 columns = [
                     { type: 'checkbox', fixed: 'left' }
                     , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
-                    , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
-                    , { field: 'HMaterCode', title: '鐗╂枡浠g爜', edit: 'text', event: 'HMaterCode', width: 100 }
-                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
-                    , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
-                    , { field: 'HBatchNo', title: '鎵规', edit: 'text', width: 100 }
-                    , { field: 'HQty', title: '瀹炴敹鏁伴噺', edit: 'text', width: 100 }
-                    , { field: 'HWHID', title: 'HWHID', edit: 'text', width: 100, hide: true }
-                    , { field: 'HWHCode', title: '鏀舵枡浠撳簱浠g爜', edit: 'text', event: 'HWHCode', width: 120 }
-                    , { field: 'HWHName', title: '鏀舵枡浠撳簱鍚嶇О', edit: 'text', width: 120 }
-                    , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', edit: 'text', event: 'HMaterCode', width: 100 }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', edit: 'text', width: 100 }
+                    , { field: '鎵规', title: '鎵规', edit: 'text', width: 100 }
+                    , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', edit: 'text', width: 100 }
+                    , { field: 'hwhid1', title: 'HWHID', edit: 'text', width: 100, hide: true }
+                    , { field: '鏀舵枡浠撳簱浠g爜', title: '鏀舵枡浠撳簱浠g爜', edit: 'text', event: 'HWHCode', width: 120 }
+                    , { field: '鏀舵枡浠撳簱', title: '鏀舵枡浠撳簱鍚嶇О', edit: 'text', width: 120 }
+                    , { field: '琛ㄤ綋澶囨敞', title: '澶囨敞', edit: 'text', width: 100 }
                 ];
                 option1 = {
                     id: 'mainTable1'
@@ -747,7 +751,7 @@
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
                 get_MAXNum();
-                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
+                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "","HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
                 table.render(option);
             }
             //鑾峰彇鏈�澶у崟鎹彿
@@ -771,7 +775,7 @@
             function set_EditFromGrid(linterid) {
                 set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
                 set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
-                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
+                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "","HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
                 table.render(option);
             }
             //缂栬緫鑾峰彇琛ㄥご
@@ -825,8 +829,10 @@
                     data: { "sqlWhere": "and hmainid=" + linterid },
                     success: function (result) {
                         if (result.count == 1) {
-                            option.data = result.data;
+                            option.data = result.list[0];
                             table.render(option);
+                            option1.data = result.list[1];
+                            table.render(option1);
 
                         } else {
                             layer.alert(result.code + result.Message, { icon: 5 });
@@ -996,47 +1002,7 @@
                                 }
                             });
                         }
-                        //杈呭姪璁¢噺鍗曚綅浠g爜
-                        if (obj.event === 'HSecUnitCode')  //杈呭姪璁¢噺鍗曚綅浠g爜
-                        {
-                            //椤甸潰灞�-鑷畾涔�
-                            layer.open({
-                                type: 2,
-                                skin: 'layui-layer-rim', //鍔犱笂杈规
-                                title: '杈呭姪璁¢噺鍗曚綅鍒楄〃',
-                                closeBtn: 1,
-                                shift: 2,
-                                area: ['80%', '80%'],
-                                maxmin: true,
-                                content: ['../../PublicPage/UnitInformation.html', 'yes'],
-                                btn: ['纭畾', '鍙栨秷']
-                                , btn1: function (index, layero) {
-
-                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
-                                    if (checkStatus.data.length === 0) {
-                                        return layer.msg('璇烽�夋嫨鏁版嵁');
-                                    }
-
-                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
-                                    obj.update({
-                                        HSecUnitID: checkStatus.data[0].HItemID,
-                                        HSecUnitCode: checkStatus.data[0].HNumber,
-                                        HSecUnitName: checkStatus.data[0].HName,
-                                    });
-
-                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                                }
-                                , btn2: function (index, layero) {
-                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
-                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
-                                },
-                                end: function () {
-
-                                }
-                            });
-                        }
+                       
                         //璁¢噺鍗曚綅浠g爜
                         if (obj.event === 'HUnitCode')  //璁¢噺鍗曚綅浠g爜
                         {
@@ -1209,6 +1175,10 @@
                             layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍣ㄥ叿淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             return Result = false;
                         }
+                        if (sSubStr[i].HUnitID == "") {
+                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁¢噺鍗曚綅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return Result = false;
+                        }
                         if (sSubStr[i].HWHID == "") {
                             layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鏀舵枡浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             return Result = false;
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillList.html"
index cc771d0..37e7a67 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillList.html"
@@ -83,9 +83,11 @@
                             <div class="layui-btn-container">
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                             </div>
@@ -142,6 +144,12 @@
                         break;
                     //鎵撳嵃
                     case 'btn-print': get_PrintReport();
+                        break;
+                    //瀹℃牳
+                    case 'btn-audit': get_Audit();
+                        break;
+                    //鍙嶅鏍�
+                    case 'btn-Faudit': get_FAudit();
                         break;
                     //鍒锋柊
                     case 'get_Refresh': set_Refresh();
@@ -410,80 +418,70 @@
             }
 
             //瀹℃牳
-            function set_CheckBill() {
+            function get_Audit() {
                 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() + "/Sc_MouldProdInBill/set_CheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
+                        url: GetWEBURL() + "Sc_MouldProdInHouseBill/AuditMouldProdInHouseBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag":1 },
                         success: function (result) {
                             if (result.count == 1) {
                                 layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                    // 寰楀埌frame绱㈠紩
                                     var index = layer.getFrameIndex(window.name);
                                     //鍏抽棴褰撳墠frame
                                     layer.close(index);
                                     //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                    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('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
-                }
-            }
-            //鍙嶅鏍�
-            function set_AbandonCheck() {
-                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() + "/Sc_MouldProdInBill/set_AbandonCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                    // 寰楀埌frame绱㈠紩
-                                    var index = layer.getFrameIndex(window.name);
-                                    //鍏抽棴褰撳墠frame
-                                    layer.close(index);
-                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                    get_FastQuery(table, option);
+                                    window.location.reload();
                                 });
 
                             } else {
                                 layer.alert(result.code + result.Message, { icon: 5 });
                             }
-                            layer.close(wait);
                         }, error: function () {
-                            layer.close(wait);
                             layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                         }
                     });
                 }
                 else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�');
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
                 }
-
             }
-        
+
+            //鍙嶅鏍�
+            function get_FAudit() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "Sc_MouldProdInHouseBill/AuditMouldProdInHouseBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 2 },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    window.location.reload();
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+                }
+            }
           
             //鑾峰彇鍒楀
             function getColumnsWidth() {
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_MouldProdMoveBill.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_MouldProdMoveBill.html"
index 857b853..159c90a 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_MouldProdMoveBill.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_MouldProdMoveBill.html"
@@ -227,6 +227,9 @@
                     , { field: 'HMaterName', title: '鍣ㄥ叿鍚嶇О', edit: 'text', width: 100 }
                     , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
                     , { field: 'HBatchNo', title: '鎵规', edit: 'text', width: 100 }
+                    , { field: 'HUnitID', title: 'HUnitID', edit: 'text', width: 100, hide: true }
+                    , { field: 'HUnitCode', title: '璁¢噺鍗曚綅浠g爜', edit: 'text', event: 'HUnitCode', width: 100 }
+                    , { field: 'HUnitName', title: '璁¢噺鍗曚綅', edit: 'text', width: 100 }
                     , { field: 'HDesignLife', title: '璁捐瀵垮懡', edit: 'text', width: 100 }
                     , { field: 'HLeaveLife', title: '鍓╀綑瀵垮懡', edit: 'text', width: 100 }
                     , { field: 'HUseLife', title: '绱浣跨敤瀵垮懡', edit: 'text', width: 120 }
@@ -258,7 +261,7 @@
             //鍒ゆ柇鏄惁鏂板
             if (OperationType == 1) {
                 //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
-                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HOtherOrgID": sessionStorage["OrganizationID"], "HStockOrgID": 0, "HStockOrgCode": "", "HStockOrgName": "", "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" }];
+                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "","HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HOtherOrgID": sessionStorage["OrganizationID"], "HStockOrgID": 0, "HStockOrgCode": "", "HStockOrgName": "", "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" }];
                 table.render(option);
             }
             else {
@@ -294,7 +297,7 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HOtherOrgID": sessionStorage["OrganizationID"], "HStockOrgID": 0, "HStockOrgCode": "", "HStockOrgName": "", "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" };
+                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "","HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HOtherOrgID": sessionStorage["OrganizationID"], "HStockOrgID": 0, "HStockOrgCode": "", "HStockOrgName": "", "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" };
                 switch (obj.event) {
                     case 'btn-AddLine':
                         //table.cache["mainTable"].push(AddRow[rows]);
@@ -389,7 +392,47 @@
                                 }
                             });
                         }
+                        //璁¢噺鍗曚綅浠g爜
+                        if (obj.event === 'HUnitCode')  //璁¢噺鍗曚綅浠g爜
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '璁¢噺鍗曚綅鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../PublicPage/UnitInformation.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
 
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HUnitID: checkStatus.data[0].HItemID,
+                                        HUnitCode: checkStatus.data[0].HNumber,
+                                        HUnitName: checkStatus.data[0].HName,
+                                    });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
                         if (obj.event === 'HStockOrgCode')  //缁勭粐
                         {
                             //椤甸潰灞�-鑷畾涔�
@@ -954,6 +997,7 @@
                     Pub_Close(2);
                 }
             });
+
             function formatDate(date) {
                 var d = new Date(date),
                     month = '' + (d.getMonth() + 1),
@@ -965,6 +1009,7 @@
 
                 return [year, month, day].join('-');
             }
+
             form.on('submit(Saver)', function (data) {//淇濆瓨
                 //debugger;
                 data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
@@ -1112,6 +1157,10 @@
                         layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璋冨叆浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         return Result = false;
                     }
+                    if (sSubStr[i].HUnitID == "") {
+                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁¢噺鍗曚綅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return Result = false;
+                    }
                     if (sSubStr[i].HSCWHID == "") {
                         layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璋冨嚭浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         return Result = false;
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_MouldProdMoveBillList.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_MouldProdMoveBillList.html"
index bb4014b..f284720 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_MouldProdMoveBillList.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_MouldProdMoveBillList.html"
@@ -75,6 +75,8 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -334,6 +336,12 @@
                         break;
                     case 'btn-print': get_PrintReport();
                         break;
+                    //瀹℃牳
+                    case 'btn-audit': get_Audit();
+                        break;
+                    //鍙嶅鏍�
+                    case 'btn-Faudit': get_FAudit();
+                        break;
                     //鍒锋柊
                     case 'get_Refresh': get_Refresh();
                         break;
@@ -342,27 +350,72 @@
                         break;
                 };
             });
+            //瀹℃牳
+            function get_Audit() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "Sc_MouldProdMoveBill/AuditMouldProdMoveBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 1 },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    window.location.reload();
+                                });
 
-            ////杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            //$.ajax({
-            //    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-            //    url: GetWEBURL() + '/Sc_MouldProdOutBill/GetMouldProdOutBill',
-            //    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.code + data1.Message, { icon: 5 });
-            //        }
-            //    }, error: function () {
-            //        layer.close(index);
-            //        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-            //    }
-            //});
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+                }
+            }
+
+            //鍙嶅鏍�
+            function get_FAudit() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "Sc_MouldProdMoveBill/AuditMouldProdMoveBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 2 },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    window.location.reload();
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+                }
+            }
+
             //棰勮
             function get_ViewReport() {
                 var checkStatus = table.checkStatus('mainTable')
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_MouldProdOutBillEdit.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_MouldProdOutBillEdit.html"
index 782134c..6bc3c3a 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_MouldProdOutBillEdit.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_MouldProdOutBillEdit.html"
@@ -246,7 +246,7 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
+                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
                 switch (obj.event) {
                     //鏂板涓�琛�
                     case 'btn-AddLine': btnAddLine(NewRow);
@@ -651,6 +651,9 @@
                     , { field: 'HMaterName', title: '鍣ㄥ叿鍚嶇О', edit: 'text', width: 100 }
                     , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
                     , { field: 'HBatchNo', title: '鎵规', edit: 'text', width: 100 }
+                    , { field: 'HUnitID', title: 'HUnitID', edit: 'text', width: 100, hide: true }
+                    , { field: 'HUnitCode', title: '璁¢噺鍗曚綅浠g爜', edit: 'text', event: 'HUnitCode', width: 100 }
+                    , { field: 'HUnitName', title: '璁¢噺鍗曚綅', edit: 'text', width: 100 }
                     , { field: 'HDesignLife', title: '璁捐瀵垮懡', edit: 'text', width: 100 }
                     , { field: 'HLeaveLife', title: '鍓╀綑瀵垮懡', edit: 'text', width: 100 }
                     , { field: 'HUseLife', title: '绱Н浣跨敤瀵垮懡', edit: 'text', width: 100 }
@@ -685,7 +688,7 @@
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
                 get_MAXNum();
-                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
+                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "","HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
                 table.render(option);
             }
             //鑾峰彇鏈�澶у崟鎹彿
@@ -709,7 +712,7 @@
             function set_EditFromGrid(linterid) {
                 set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
                 set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
-                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
+                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
                 table.render(option);
             }
             //缂栬緫鑾峰彇琛ㄥご
@@ -888,7 +891,46 @@
                                 }
                             });
                         }
+                        if (obj.event === 'HUnitCode')  //璁¢噺鍗曚綅淇℃伅
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '璁¢噺鍗曚綅鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../PublicPage/UnitInformation.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
 
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HUnitID: checkStatus.data[0].HItemID,
+                                        HUnitCode: checkStatus.data[0].HNumber,
+                                        HUnitName: checkStatus.data[0].HName,
+                                    });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
                         if (obj.event === 'HWHCode')  //浠撳簱浠g爜
                         {
                             //椤甸潰灞�-鑷畾涔�
@@ -1030,6 +1072,10 @@
                             layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍙戞枡浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             return Result = false;
                         }
+                        if (sSubStr[i].HUnitID == "") {
+                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁¢噺鍗曚綅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return Result = false;
+                        }
                         //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
                         if (parseFloat(sSubStr[i].HQty) == 0) {
                             layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,浜у搧鍏ュ簱璁板綍鏈壂鐮侊紙瀹炲彂鏁伴噺涓�0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
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_MouldProdOutBillList.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_MouldProdOutBillList.html"
index e78e5d6..15dc7e3 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_MouldProdOutBillList.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_MouldProdOutBillList.html"
@@ -75,6 +75,8 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -330,6 +332,12 @@
                         break;
                     case 'btn-print': get_PrintReport();
                         break;
+                    //瀹℃牳
+                    case 'btn-audit': get_Audit();
+                        break;
+                    //鍙嶅鏍�
+                    case 'btn-Faudit': get_FAudit();
+                        break;
                     //鍒锋柊
                     case 'get_Refresh': get_Refresh();
                         break;
@@ -381,6 +389,73 @@
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
                 }
             }
+
+            //瀹℃牳
+            function get_Audit() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "Sc_MouldProdOutBill/AuditMouldProdOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 1 },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    window.location.reload();
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+                }
+            }
+
+            //鍙嶅鏍�
+            function get_FAudit() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "Sc_MouldProdOutBill/AuditMouldProdOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 2 },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    window.location.reload();
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+                }
+            }
+
             //#region 蹇�熻繃婊�
             function get_FastQuery(table, option) {
                 var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
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_MouldRepairChangeBillList.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_MouldRepairChangeBillList.html"
index 6e44950..50d0ae5 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_MouldRepairChangeBillList.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_MouldRepairChangeBillList.html"
@@ -72,6 +72,8 @@
                             <div class="layui-btn-container">
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -123,6 +125,12 @@
                         break;
                     //鍒犻櫎
                     case 'btn-Delete': set_DeleteBill();
+                        break;
+                    //瀹℃牳
+                    case 'btn-audit': get_Audit();
+                        break;
+                    //鍙嶅鏍�
+                    case 'btn-Faudit': get_FAudit();
                         break;
                     //鍒锋柊
                     case 'get_Refresh': get_Refresh();
@@ -349,6 +357,70 @@
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
                 }
             }
+            //瀹℃牳
+            function get_Audit() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "Sc_MouldRepairChangeHouseBill/AuditMouldRepairChangeBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 1 },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    window.location.reload();
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+                }
+            }
+            //鍙嶅鏍�
+            function get_FAudit() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "Sc_MouldRepairChangeHouseBill/AuditMouldRepairChangeBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 2},
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    window.location.reload();
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+                }
+            }
             //鍒锋柊
             function get_Refresh() {
                 set_ClearQuery();
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_MouldRepairInBillEdit.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_MouldRepairInBillEdit.html"
index 24167c4..1fe812a 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_MouldRepairInBillEdit.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_MouldRepairInBillEdit.html"
@@ -322,7 +322,7 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "", "HStockOrgID": sessionStorage["OrganizationID"] };
+                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "", "HStockOrgID": sessionStorage["OrganizationID"] };
                 switch (obj.event) {
                     //鏂板涓�琛�
                     case 'btn-AddLine': btnAddLine(NewRow);
@@ -842,6 +842,9 @@
                     , { field: 'HMaterName', title: '鍣ㄥ叿鍚嶇О', edit: 'text', width: 100 }
                     , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
                     , { field: 'HBatchNo', title: '鎵规', edit: 'text', width: 100 }
+                    , { field: 'HUnitID', title: 'HUnitID', edit: 'text', width: 100, hide: true }
+                    , { field: 'HUnitCode', title: '璁¢噺鍗曚綅浠g爜', edit: 'text', event: 'HUnitCode', width: 100 }
+                    , { field: 'HUnitName', title: '璁¢噺鍗曚綅', edit: 'text', width: 100 }
                     , { field: 'HDesignLife', title: '璁捐瀵垮懡', edit: 'text', width: 100 }
                     , { field: 'HLeaveLife', title: '鍓╀綑瀵垮懡', edit: 'text', width: 100 }
                     , { field: 'HUseLife', title: '浣跨敤瀵垮懡', edit: 'text', width: 100 }
@@ -870,7 +873,7 @@
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
                 get_MAXNum();
-                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "", "HStockOrgID": sessionStorage["OrganizationID"] }];
+                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "","HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "", "HStockOrgID": sessionStorage["OrganizationID"] }];
                 table.render(option);
             }
             //鑾峰彇鏈�澶у崟鎹彿
@@ -895,7 +898,7 @@
             function set_EditFromGrid(linterid) {
                 set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
                 set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
-                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "", "HStockOrgID": sessionStorage["OrganizationID"] }];
+                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "", "HStockOrgID": sessionStorage["OrganizationID"] }];
                 table.render(option);
             }
             //缂栬緫鑾峰彇琛ㄥご
@@ -1130,6 +1133,46 @@
                                 }
                             });
                         }
+                        if (obj.event === 'HUnitCode')  //璁¢噺鍗曚綅淇℃伅
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '璁¢噺鍗曚綅鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../PublicPage/UnitInformation.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HUnitID: checkStatus.data[0].HItemID,
+                                        HUnitCode: checkStatus.data[0].HNumber,
+                                        HUnitName: checkStatus.data[0].HName,
+                                    });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
                         obj.event = "";
                         return false;
                     }
@@ -1183,6 +1226,10 @@
                             layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍣ㄥ叿淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             return Result = false;
                         }
+                        if (sSubStr[i].HUnitID == "") {
+                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁¢噺鍗曚綅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return Result = false;
+                        }
                     }
                 }
                 else {
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_MouldRepairInBillList.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_MouldRepairInBillList.html"
index a5c24e5..1a0ac23 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_MouldRepairInBillList.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_MouldRepairInBillList.html"
@@ -75,6 +75,8 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -132,10 +134,10 @@
                     case 'btn-Delete': set_DeleteBill();
                         break;
                     //瀹℃牳
-                    case 'btn-CheckBill': set_CheckBill();
+                    case 'btn-audit': get_Audit();
                         break;
                     //鍙嶅鏍�
-                    case 'btn-AbandonCheck': set_AbandonCheck();
+                    case 'btn-Faudit': get_FAudit();
                         break;
                     //棰勮
                     case 'btn-view': get_ViewReport();
@@ -414,6 +416,70 @@
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
                 }
             }
+            //瀹℃牳
+            function get_Audit() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "Sc_MouldRepairInBill/AuditMouldRepairInBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 1 },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    window.location.reload();
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+                }
+            }
+            //鍙嶅鏍�
+            function get_FAudit() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "Sc_MouldRepairInBill/AuditMouldRepairInBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 2 },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    window.location.reload();
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+                }
+            }
             //鍒锋柊
             function get_Refresh() {
                 set_ClearQuery();
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_MouldRepairOutBillEdit.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_MouldRepairOutBillEdit.html"
index 6a5f4b2..c011cd2 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_MouldRepairOutBillEdit.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_MouldRepairOutBillEdit.html"
@@ -325,7 +325,7 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
+                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "","HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
                 switch (obj.event) {
                     //鏂板涓�琛�
                     case 'btn-AddLine': btnAddLine(NewRow);
@@ -839,6 +839,9 @@
                     , { field: 'HMaterName', title: '鍣ㄥ叿鍚嶇О', edit: 'text', width: 100 }
                     , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
                     , { field: 'HBatchNo', title: '鎵规', edit: 'text', width: 100 }
+                    , { field: 'HUnitID', title: 'HUnitID', edit: 'text', width: 100, hide: true }
+                    , { field: 'HUnitCode', title: '璁¢噺鍗曚綅浠g爜', edit: 'text', event: 'HUnitCode', width: 100 }
+                    , { field: 'HUnitName', title: '璁¢噺鍗曚綅', edit: 'text', width: 100 }
                     , { field: 'HDesignLife', title: '璁捐瀵垮懡', edit: 'text', width: 100 }
                     , { field: 'HLeaveLife', title: '鍓╀綑瀵垮懡', edit: 'text', width: 100 }
                     , { field: 'HUseLife', title: '浣跨敤瀵垮懡', edit: 'text', width: 100 }
@@ -867,7 +870,7 @@
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
                 get_MAXNum();
-                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
+                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "","HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
                 table.render(option);
             }
             //鑾峰彇鏈�澶у崟鎹彿
@@ -892,7 +895,7 @@
             function set_EditFromGrid(linterid) {
                 set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
                 set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
-                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
+                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
                 table.render(option);
             }
             //缂栬緫鑾峰彇琛ㄥご
@@ -1126,6 +1129,46 @@
                                 }
                             });
                         }
+                        if (obj.event === 'HUnitCode')  //璁¢噺鍗曚綅淇℃伅
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '璁¢噺鍗曚綅鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../PublicPage/UnitInformation.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HUnitID: checkStatus.data[0].HItemID,
+                                        HUnitCode: checkStatus.data[0].HNumber,
+                                        HUnitName: checkStatus.data[0].HName,
+                                    });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
                         obj.event = "";
                         return false;
                     }
@@ -1179,6 +1222,10 @@
                             layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍣ㄥ叿淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             return Result = false;
                         }
+                        if (sSubStr[i].HUnitID == "") {
+                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁¢噺鍗曚綅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return Result = false;
+                        }
                     }
                 }
                 else {
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_MouldRepairOutBillList.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_MouldRepairOutBillList.html"
index 97cb803..4312642 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_MouldRepairOutBillList.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_MouldRepairOutBillList.html"
@@ -75,6 +75,8 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -128,9 +130,17 @@
                     //缂栬緫
                     case 'btn-Edit': set_ShowBill();
                         break;
+                    //棰勮
                     case 'btn-view': get_ViewReport();
                         break;
+                    //鎵撳嵃
                     case 'btn-print': get_PrintReport();
+                        break;
+                    //瀹℃牳
+                    case 'btn-audit': get_Audit();
+                        break;
+                    //鍙嶅鏍�
+                    case 'btn-Faudit': get_FAudit();
                         break;
                     //鍒犻櫎
                     case 'btn-Delete': set_DeleteBill();
@@ -406,6 +416,70 @@
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
                 }
             }
+            //瀹℃牳
+            function get_Audit() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "Sc_MouldRepairOutBill/AuditMouldRepairOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 1 },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    window.location.reload();
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+                }
+            }
+            //鍙嶅鏍�
+            function get_FAudit() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "Sc_MouldRepairOutBill/AuditMouldRepairOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 2 },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    window.location.reload();
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+                }
+            }
             //鍒锋柊
             function get_Refresh() {
                 set_ClearQuery();
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 eb62826..5fa64f8 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"
@@ -61,7 +61,7 @@
                                         <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>
@@ -94,6 +94,8 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -145,9 +147,17 @@
                     //缂栬緫鎸夐挳
                     case 'btn-Edit':set_ShowBill();
                         break;
+                    //棰勮
                     case 'btn-view': get_ViewReport();
                         break;
+                    //鎵撳嵃
                     case 'btn-print': get_PrintReport();
+                        break;
+                    //瀹℃牳
+                    case 'btn-audit': get_Audit();
+                        break;
+                    //鍙嶅鏍�
+                    case 'btn-Faudit': get_FAudit();
                         break;
                     //鍒犻櫎鎸夐挳
                     case 'btn-Delete':set_DeleteBill();
@@ -155,7 +165,6 @@
                     //鍒锋柊
                     case 'get_Refresh': set_Refresh();
                         break;
-
                     //閫�鍑�
                     case 'get_Exit': Pub_Close(2);
                         break;
@@ -388,6 +397,70 @@
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
                 }
             }
+            //瀹℃牳
+            function get_Audit() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "Sc_MouldScrapInBill/AuditMouldScrapInBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 1 },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    window.location.reload();
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+                }
+            }
+            //鍙嶅鏍�
+            function get_FAudit() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "Sc_MouldScrapInBill/AuditMouldScrapInBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 2 },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    window.location.reload();
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+                }
+            }
                 //鍒犻櫎
                 function set_DeleteBill() {
                 var checkStatus = table.checkStatus('mainTable')
@@ -431,227 +504,7 @@
             function set_Refresh() {
                 $("#btnSearch").click();
             }
-            //    //瀹℃牳
-            //    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() + "/Sc_MouldScrapInBill/set_CheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-            //            data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
-            //            success: function (result) {
-            //                if (result.count == 1) {
-            //                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-            //                        // 寰楀埌frame绱㈠紩
-            //                        var index = layer.getFrameIndex(window.name);
-            //                        //鍏抽棴褰撳墠frame
-            //                        layer.close(index);
-            //                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-            //                        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('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
-            //    }
-            //}
-            //    //鍙嶅鏍�
-            //    function set_AbandonCheck() {
-            //    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() + "/Sc_MouldScrapInBill/set_AbandonCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-            //            data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
-            //            success: function (result) {
-            //                if (result.count == 1) {
-            //                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-            //                        // 寰楀埌frame绱㈠紩
-            //                        var index = layer.getFrameIndex(window.name);
-            //                        //鍏抽棴褰撳墠frame
-            //                        layer.close(index);
-            //                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-            //                        get_FastQuery(table, option);
-            //                    });
 
-            //                } else {
-            //                    layer.alert(result.code + result.Message, { icon: 5 });
-            //                }
-            //                layer.close(wait);
-            //            }, error: function () {
-            //                layer.close(wait);
-            //                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-            //            }
-            //        });
-            //    }
-            //    else {
-            //        layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�');
-            //    }
-
-            //}
-            //    //棰勮
-            //    function get_PrintReport() {
-            //    var checkStatus = table.checkStatus('mainTable')
-            //        , data = checkStatus.data;
-            //    if (checkStatus.data.length === 1) {
-            //        var InterID = data[0].hmainid.toString();
-            //        layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + InterID);
-            //        //window.open("../鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
-            //        window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + InterID + "&Type=HDepartMent" + "&OpenTmp=b");
-            //    }
-            //    else {
-            //        layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
-            //    }
-            //}
-            //    //鑾峰彇鍒楀
-            //    function getColumnsWidth() {
-            //    var result = [];
-            //    var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
-            //    //鑾峰彇鍒楀
-            //    $.ajax({
-            //        url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidthList',
-            //        async: false,
-            //        type: "Get",
-            //        dataType: "json",
-            //        data: { "colNum": colNum, "Name": Name },
-            //        success: function (data1) {
-            //            if (data1.code == 1) {
-            //                result = data1.data;
-            //            }
-            //            else if (data1.code == -1) {
-
-            //            }
-            //            else {
-            //                layer.alert(data1.Message, { icon: 5 });
-            //            }
-            //        }, error: function (e) {
-            //            layer.alert(e.Message, { icon: 5 });
-            //        }
-            //    });
-
-            //    return result;
-            //}
-            //    //淇濆瓨鍒楀
-            //    function set_SaveGridColWidth() {
-            //    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];
-            //        });
-            //    }
-            //    get_FastQuery(table, option);
-            //}
-            //    //榛樿鍒楀
-            //    function set_DefaultGridColWidth() {
-            //    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];
-            //        });
-            //    }
-            //    get_FastQuery(table, option);
-            //}
-
-            //    //澶嶅埗鍗曟嵁
-            //    function set_CopyBill() {
-
-            //}
-            //    //鍏抽棴鍗曟嵁
-            //    function set_CloseBill() {
-
-            //}
-            //    //鍙嶅叧闂崟鎹�
-            //    function set_CancelCloseBill() {
-
-            //}
-            //    //浣滃簾鍗曟嵁
-            //    function set_CancelltionBill() {
-
-            //}
-            //    //鍙嶄綔搴�
-            //    function set_AbandonCancelltion() {
-
-            //}
-
-                //蹇�熻繃婊�
                 function get_FastQuery(table, option) {
                 var HStatus = $("select[name='HStatus']").val();//鐘舵��
                 var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
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_MouldScrapOutBillList.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_MouldScrapOutBillList.html"
index 49bc289..93e8e42 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_MouldScrapOutBillList.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_MouldScrapOutBillList.html"
@@ -84,6 +84,8 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -147,9 +149,17 @@
                     //缂栬緫
                     case 'btn-Edit': set_ShowBill();
                         break;
+                    //棰勮
                     case 'btn-view': get_ViewReport();
                         break;
+                    //鎵撳嵃
                     case 'btn-print': get_PrintReport();
+                        break;
+                    //瀹℃牳
+                    case 'btn-audit': get_Audit();
+                        break;
+                    //鍙嶅鏍�
+                    case 'btn-Faudit': get_FAudit();
                         break;
                     //鍒犻櫎
                     case 'btn-Delete': set_DeleteBill();
@@ -157,7 +167,6 @@
                     //鍒锋柊
                     case 'get_Refresh': set_Refresh();
                         break;
-                  
                     //閫�鍑�
                     case 'get_Exit': Pub_Close(2);
                         break;
@@ -408,6 +417,70 @@
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
                 }
             }
+            //瀹℃牳
+            function get_Audit() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "Sc_MouldScrapOutHouseBill/AuditMouldScrapOutHouseBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 1 },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    window.location.reload();
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+                }
+            }
+            //鍙嶅鏍�
+            function get_FAudit() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "Sc_MouldScrapOutHouseBill/AuditMouldScrapOutHouseBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 2 },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    window.location.reload();
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+                }
+            }
             //鍒犻櫎
             function set_DeleteBill() {
                 var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
index a3ceb17..d448c29 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
@@ -120,20 +120,20 @@
                                         </div>
                                     </div>
                                     <div class="layui-row">
-                                        <!--<div class="layui-inline">
+                                        <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀵瑰簲ERP鐗╂枡</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterList" id="btnHMaterList" 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>
                                             </div>
-                                        </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="HMouleTypeName" id="HMouleTypeName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <input type="text" class="layui-input" name="HMouleTypeName" id="HMouleTypeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HMouleTypeID" id="HMouleTypeID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMouleList" id="btnHMouleList" 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>
@@ -143,7 +143,7 @@
                                         <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;">
+                                                <input type="text" class="layui-input" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HUnitID" id="HUnitID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHUnitList" id="btnHUnitList" 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>
@@ -167,7 +167,7 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浣跨敤閮ㄩ棬</label>
                                             <div class="layui-input-block" style="margin-left: 80px;">
-                                                <input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HDeptID" id="HDeptID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptList" id="btnHDeptList" 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>
@@ -179,7 +179,7 @@
                                         <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="HSupName" id="HSupName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <input type="text" class="layui-input" name="HSupName" id="HSupName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HSupID" id="HSupID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSupList" id="btnHSupList" 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>
@@ -197,7 +197,7 @@
                                         <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="HWHName" id="HWHName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <input type="text" class="layui-input" name="HWHName" id="HWHName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HWHID" id="HWHID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWHList" id="btnHWHList" 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>
@@ -213,7 +213,7 @@
                                         <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="HSPName" id="HSPName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <input type="text" class="layui-input" name="HSPName" id="HSPName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HSPID" id="HSPID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSPIDList" id="btnHSPIDList" 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>
@@ -430,6 +430,43 @@
             form.on('submit(btnSave)', function (data) {//鎻愪氦
                 set_btnSave(data);
             })
+
+            //瀵瑰簲Erp鐗╂枡
+            form.on('submit(btnHMaterList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鐗╂枡鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/PartInformation.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+                        $("#HMaterID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
 
             //妯″叿鍒嗙被
             form.on('submit(btnHMouleList)', function () {
@@ -833,8 +870,8 @@
                         $("#HSubjoin2").val(d.data[0].杈呭姪灞炴��2);
                         $("#HPICNo").val(d.data[0].鍥惧彿);
                         $("#HWorkMaterModel").val(d.data[0].鐢熶骇浜у搧鍨嬪彿);
-                        //$("#HMaterID").val(d.data[0].HMaterID);
-                        //$("#HMaterNumber").val(d.data[0].HMaterNumber);
+                        $("#HMaterID").val(d.data[0].HMaterID);
+                        $("#HMaterNumber").val(d.data[0].瀵瑰簲ERP鐗╂枡缂栫爜);
                         $("#HMouleTypeID").val(d.data[0].HMouldTypeID);
                         $("#HMouleTypeName").val(d.data[0].妯″叿鍝佺被);
                         $("#HUnitID").val(d.data[0].HUnitID);
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
index f08d8fc..79964b7 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
@@ -158,6 +158,7 @@
                         , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
                         , { field: '鏃ユ湡', title: '鏃ユ湡', templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
                         , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿' }
+                        , { field: '瀵瑰簲ERP鐗╂枡缂栫爜', title: '鐗╂枡缂栧彿' }
                         , { field: '妯″叿缂栧彿', title: '鍣ㄥ叿缂栧彿' }
                         , { field: '妯″叿鍚嶇О', title: '鍣ㄥ叿鍚嶇О' }
                         , { field: '妯″叿鍨嬪彿', title: '鍣ㄥ叿鍨嬪彿' }
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
index 53a4020..da07288 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
@@ -1051,7 +1051,7 @@
         function AllowLoadData(sSubStr) {
            
 
-            if ($("#HMouldCode").val() == '') {
+            if ($("#HMouldCodeHMouldCode").val() == '') {
                 layer.msg("鎴愬搧鍣ㄥ叿娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
             }
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\344\277\235\345\205\273\350\256\260\345\275\225\345\215\225/Sb_EquipMaintainBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\344\277\235\345\205\273\350\256\260\345\275\225\345\215\225/Sb_EquipMaintainBill_PDA.html"
index 7d7cfe8..dddba79 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\344\277\235\345\205\273\350\256\260\345\275\225\345\215\225/Sb_EquipMaintainBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\344\277\235\345\205\273\350\256\260\345\275\225\345\215\225/Sb_EquipMaintainBill_PDA.html"
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>璁惧缁翠慨璁板綍鍗�</title>
+    <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">
@@ -94,21 +94,15 @@
                                 <div class="layui-form-item" style="padding-top: 10px;">
                                     <div class="layui-row">
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">缁翠慨寮�濮�:</label>
+                                            <label class="layui-form-label" style="width: 75px;">寮�濮嬫棩鏈�:</label>
                                             <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HRepairBeginDate" id="HRepairBeginDate" placeholder="璇烽�夋嫨鏃ユ湡">
+                                                <input type="datetime" class="layui-input" name="HBeginDate" id="HBeginDate" placeholder="璇烽�夋嫨鏃ユ湡">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">缁翠慨缁撴潫:</label>
+                                            <label class="layui-form-label" style="width: 75px;">缁撴潫鏃ユ湡:</label>
                                             <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HRepairEndDate" id="HRepairEndDate" placeholder="璇烽�夋嫨鏃ユ湡">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">缁翠慨鍐呭:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <textarea name="HRepairContent" id="HRepairContent" placeholder="璇疯緭鍏ュ唴瀹�" class="layui-textarea"></textarea>
+                                                <input type="datetime" class="layui-input" name="HEndDate" id="HEndDate" placeholder="璇烽�夋嫨鏃ユ湡">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -136,32 +130,6 @@
                                         </div>
                                     </div>
                                     <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">缁翠慨浜�:</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" name="HEmpName" id="HEmpName" class="layui-input" style="width:80%;">
-                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input">
-                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEmp" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">缁翠慨椤圭洰:</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" name="HRepairName" id="HRepairName" class="layui-input" style="width:80%;">
-                                                <input type="hidden" name="HRepairID" id="HRepairID" class="layui-input">
-                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Repair" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">缁翠慨瑕佹眰:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" name="HExplanation" id="HExplanation" class="layui-input">
-                                            </div>
-                                        </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">璐熻矗浜�:</label>
                                             <div class="layui-input-block">
@@ -288,11 +256,11 @@
 
             //鏃ユ湡鏃堕棿閫夋嫨鍣�
             laydate.render({
-                elem: '#HRepairBeginDate'
+                elem: '#HBeginDate'
                 , type: 'datetime'
             });
             laydate.render({
-                elem: '#HRepairEndDate'
+                elem: '#HEndDate'
                 , type: 'datetime'
             });
             laydate.render({
@@ -360,9 +328,9 @@
                             if (result.count == 1) {
                                 var data = result.data[0];
                                 form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "HEquipID":data.hinterid,
-                                    "HBarName": data.HName,
-                                    "HBarModel": data.HModel2
+                                    "HEquipID":data.hmainid,
+                                    "HBarName": data.璁惧鍚嶇О,
+                                    "HBarModel": data.璁惧鍨嬪彿
                                 });
                                 $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
                                 $("#HBarCode").css("background-color", "#efefef4d");
@@ -401,14 +369,14 @@
                     layer.msg("璇烽�夋嫨閮ㄩ棬!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
                 }
-                if (!$("#HEmpID").val()) {
-                    layer.msg("璇烽�夋嫨缁翠慨浜�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                if (!$("#HRepairID").val()) {
-                    layer.msg("璇烽�夋嫨缁翠慨椤圭洰!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
+                //if (!$("#HEmpID").val()) {
+                //    layer.msg("璇烽�夋嫨缁翠慨浜�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return;
+                //}
+                //if (!$("#HRepairID").val()) {
+                //    layer.msg("璇烽�夋嫨缁翠慨椤圭洰!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return;
+                //}
                 if (!$("#HManagerID").val()) {
                     layer.msg("璇烽�夋嫨璐熻矗浜�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\202\271\346\243\200\350\256\260\345\275\225\345\215\225/Sb_EquipDotCheckBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\202\271\346\243\200\350\256\260\345\275\225\345\215\225/Sb_EquipDotCheckBill_PDA.html"
index 7b7c88a..ab21465 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\202\271\346\243\200\350\256\260\345\275\225\345\215\225/Sb_EquipDotCheckBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\202\271\346\243\200\350\256\260\345\275\225\345\215\225/Sb_EquipDotCheckBill_PDA.html"
@@ -94,21 +94,15 @@
                                 <div class="layui-form-item" style="padding-top: 10px;">
                                     <div class="layui-row">
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">缁翠慨寮�濮�:</label>
+                                            <label class="layui-form-label" style="width: 75px;">鐐规寮�濮嬫棩鏈�:</label>
                                             <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HRepairBeginDate" id="HRepairBeginDate" placeholder="璇烽�夋嫨鏃ユ湡">
+                                                <input type="datetime" class="layui-input" name="HBeginDate" id="HBeginDate" placeholder="璇烽�夋嫨鏃ユ湡">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">缁翠慨缁撴潫:</label>
+                                            <label class="layui-form-label" style="width: 75px;">鐐规缁撴潫鏃ユ湡:</label>
                                             <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HRepairEndDate" id="HRepairEndDate" placeholder="璇烽�夋嫨鏃ユ湡">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">缁翠慨鍐呭:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <textarea name="HRepairContent" id="HRepairContent" placeholder="璇疯緭鍏ュ唴瀹�" class="layui-textarea"></textarea>
+                                                <input type="datetime" class="layui-input" name="HEndDate" id="HEndDate" placeholder="璇烽�夋嫨鏃ユ湡">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -136,32 +130,6 @@
                                         </div>
                                     </div>
                                     <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">缁翠慨浜�:</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" name="HEmpName" id="HEmpName" class="layui-input" style="width:80%;">
-                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input">
-                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEmp" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">缁翠慨椤圭洰:</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" name="HRepairName" id="HRepairName" class="layui-input" style="width:80%;">
-                                                <input type="hidden" name="HRepairID" id="HRepairID" class="layui-input">
-                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Repair" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">缁翠慨瑕佹眰:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" name="HExplanation" id="HExplanation" class="layui-input">
-                                            </div>
-                                        </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">璐熻矗浜�:</label>
                                             <div class="layui-input-block">
@@ -288,11 +256,11 @@
 
             //鏃ユ湡鏃堕棿閫夋嫨鍣�
             laydate.render({
-                elem: '#HRepairBeginDate'
+                elem: '#HBeginDate'
                 , type: 'datetime'
             });
             laydate.render({
-                elem: '#HRepairEndDate'
+                elem: '#HEndDate'
                 , type: 'datetime'
             });
             laydate.render({
@@ -360,9 +328,9 @@
                             if (result.count == 1) {
                                 var data = result.data[0];
                                 form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "HEquipID":data.hinterid,
-                                    "HBarName": data.HName,
-                                    "HBarModel": data.HModel2
+                                    "HEquipID": data.hmainid,
+                                    "HBarName": data.璁惧鍚嶇О,
+                                    "HBarModel": data.璁惧鍨嬪彿
                                 });
                                 $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
                                 $("#HBarCode").css("background-color", "#efefef4d");
@@ -401,24 +369,24 @@
                     layer.msg("璇烽�夋嫨閮ㄩ棬!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
                 }
-                if (!$("#HEmpID").val()) {
-                    layer.msg("璇烽�夋嫨缁翠慨浜�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                if (!$("#HRepairID").val()) {
-                    layer.msg("璇烽�夋嫨缁翠慨椤圭洰!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                if (!$("#HManagerID").val()) {
-                    layer.msg("璇烽�夋嫨璐熻矗浜�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
+                //if (!$("#HEmpID").val()) {
+                //    layer.msg("璇烽�夋嫨缁翠慨浜�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return;
+                //}
+                //if (!$("#HRepairID").val()) {
+                //    layer.msg("璇烽�夋嫨缁翠慨椤圭洰!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return;
+                //}
+                //if (!$("#HManagerID").val()) {
+                //    layer.msg("璇烽�夋嫨璐熻矗浜�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return;
+                //}
                 data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
                 var sMainSub = JSON.stringify(data.field);
                 var index = layer.load();
                 $.ajax({
                     type: "POST",
-                    url: GetWEBURL() + "/Sc_MouldRepairWorkBill/MouldRepairWorkBill_Save",
+                    url: GetWEBURL() + "/Sb_EquipDotCheckBill/EquipDotCheckBill_Save",
                     async: true,
                     data: { "sMainSub": sMainSub },
                     dataType: "json",
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\350\256\260\345\275\225\345\215\225/Sb_EquipRepairWorkBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\350\256\260\345\275\225\345\215\225/Sb_EquipRepairWorkBill_PDA.html"
index c483f12..9a8c1f2 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\350\256\260\345\275\225\345\215\225/Sb_EquipRepairWorkBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\350\256\260\345\275\225\345\215\225/Sb_EquipRepairWorkBill_PDA.html"
@@ -360,9 +360,9 @@
                             if (result.count == 1) {
                                 var data = result.data[0];
                                 form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "HEquipID": data.hinterid,
-                                    "HBarName": data.HName,
-                                    "HBarSpec": data.HModel
+                                    "HEquipID": data.hmainid,
+                                    "HBarName": data.璁惧鍚嶇О,
+                                    "HBarModel": data.璁惧鍨嬪彿
                                 });
                                 $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
                                 $("#HBarCode").css("background-color", "#efefef4d");
@@ -418,7 +418,7 @@
                 var index = layer.load();
                 $.ajax({
                     type: "POST",
-                    url: GetWEBURL() + "/Sc_MouldRepairWorkBill/MouldRepairWorkBill_Save",
+                    url: GetWEBURL() + "/Sb_EquipRepairWorkBill/EquipRepairWorkBill_Save",
                     async: true,
                     data: { "sMainSub": sMainSub },
                     dataType: "json",
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html"
index 05a832b..587e59c 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html"
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="utf-8" />
-    <title>鏂板/缂栬緫鍣ㄥ叿閲囪喘鍏ュ簱鍗�</title>
+    <title>鐢ㄦ埛鍏宠仈渚涘簲鍟�</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
index e8291c9..f0d9bc8 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
@@ -842,7 +842,7 @@
                 if ($("#HRepairName").val() == '') {
                     layer.msg("缁翠慨椤圭洰娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return false;
-                }
+                } 
                 //鏁板瓧姝e垯(鍖呭惈灏忔暟)
                 var reg = /^\d+(\.\d+)?$/;
                 if (reg.test($("#HPlanTimes").val()) == false || $("#HPlanTimes").val() == '') {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\344\272\247\345\223\201\345\205\245\345\272\223\346\243\200\351\252\214\345\215\225/QC_LastPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\344\272\247\345\223\201\345\205\245\345\272\223\346\243\200\351\252\214\345\215\225/QC_LastPieceCheckBill.html"
index 2311af4..b573f2b 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\344\272\247\345\223\201\345\205\245\345\272\223\346\243\200\351\252\214\345\215\225/QC_LastPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\344\272\247\345\223\201\345\205\245\345\272\223\346\243\200\351\252\214\345\215\225/QC_LastPieceCheckBill.html"
@@ -9,21 +9,25 @@
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
-    <style>
-        .main-btn { /*澶撮儴涓绘寜閽�*/
-            padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
-            height: 30px;
-            line-height: 30px;
+    <style type="text/css">
+        .layui-form-item .layui-inline {
+            margin-right: 0;
         }
 
-        .btn-title {
-            font-size: 16px;
+        html {
+            background-color: white;
+            color: white;
         }
-        /*.table-select {
+
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+
+        td .layui-form-select {
             margin-top: -10px;
             margin-left: -15px;
             margin-right: -15px;
-        }*/
+        }
     </style>
 </head>
 <body>
@@ -55,221 +59,235 @@
                             <div class="layui-tab-item layui-show">
                                 <div class="layui-form-item" style="padding-top: 10px;">
                                     <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                            <div class="layui-input-inline">
                                                 <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HInterID" id="HInterID">
+                                                <input type="hidden" name="HInterID" id="HInterID" value="0">
+                                                <!--<input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID">-->
                                             </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="date" class="layui-input" name="HDate" id="HDate" style="padding-left: 32px;">
+
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                             </div>
                                         </div>
-                                        <div class="layui-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="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <input type="hidden" name="HSourceID" id="HSourceID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" 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>
+
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鐢熶骇璧勬簮</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HSourceName" id="HSourceName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HSourceID" id="HSourceID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HSource" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                 </button>
                                             </div>
                                         </div>
                                     </div>
                                     <div class="layui-row">
-                                        <div class="layui-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="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">浠诲姟鍗曞彿</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HICMOBillNo" id="HICMOBillNo" class="layui-input" value="" style="float: left; background-color: #efefef4d; width: 150px;">
                                                 <input type="hidden" name="HICMOID" id="HICMOID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" 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 type="button" lay-submit="" class="layui-btn" lay-filter="HICMO" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                 </button>
                                             </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="HInStockQty" id="HInStockQty" style="padding-left: 32px;">
+
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍏ュ簱鏁伴噺</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HInStockQty" id="HInStockQty" autocomplete="off">
                                             </div>
                                         </div>
-                                        <div class="layui-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="HRightQty" id="HRightQty" style="padding-left: 32px;">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍚堟牸鏁伴噺</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HRightQty" id="HRightQty" autocomplete="off">
+                                            </div>
+                                        </div>
+
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">浠诲姟鍗曞唴鐮�</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HICMOInterID" id="HICMOInterID" autocomplete="off">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鎶芥鏁伴噺</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HCheckQty" id="HCheckQty" autocomplete="off">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">涓嶅悎鏍兼暟閲�</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HBadQty" id="HBadQty" autocomplete="off">
+                                            </div>
+                                        </div>
+
+                                    </div>
+                                    <div class="layui-row">
+
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">妫�楠屽憳</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HFirstCheckEmpName" id="HFirstCheckEmpName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HFirstCheckEmpID" id="HFirstCheckEmpID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HFirstCheckEmp" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">浜у搧鍐呯爜</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HMaterName" id="HMaterName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HMater" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍒ゅ畾缁撹</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HCheckerResult" id="HCheckerResult" autocomplete="off">
+                                            </div>
+                                        </div>
+
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">璐ㄦ绉�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HCheckDeptName" id="HCheckDeptName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HCheckDeptID" id="HCheckDeptID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HCheckDept" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">璐ㄦ绉戠鍚�</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HCheckDeptResult" id="HCheckDeptResult" autocomplete="off">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">璐ㄦ閮�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HCheckDept2Name" id="HCheckDept2Name" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HCheckDeptID2" id="HCheckDeptID2" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HCheckDept2" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+
+
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">璐ㄦ閮ㄧ绔�</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HCheckDeptResult2" id="HCheckDeptResult2" autocomplete="off">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鏉″舰鐮�</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HBarCode" id="HBarCode" autocomplete="off">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鐐夋壒鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HStoveBatchNo" id="HStoveBatchNo" autocomplete="off">
+                                            </div>
+                                        </div>
+
+
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">瀹㈡埛</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HCusName" id="HCusName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HCusID" id="HCusID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HCus" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍚堝悓鎵瑰彿</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HContrctBatchNo" id="HContrctBatchNo" autocomplete="off">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鎺掍骇鍗曞彿</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HSortBillNo" id="HSortBillNo" autocomplete="off">
                                             </div>
                                         </div>
                                     </div>
                                     <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">浠诲姟鍗曞唴鐮�</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HICMOInterID" id="HICMOInterID" style="padding-left: 32px;">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">浜у湴</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HProdAreaName" id="HProdAreaName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HProdAreaID" id="HProdAreaID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HProdArea" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
                                             </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="HCheckQty" id="HCheckQty" style="padding-left: 32px;">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍔犲伐绫诲瀷</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HProdTypeName" id="HProdTypeName" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HProdTypeID" id="HProdTypeID" value="0">
                                             </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="HBadQty" id="HBadQty" style="padding-left: 32px;">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">宸ヨ壓璺嚎</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HRoutingInterName" id="HRoutingInterName" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HRoutingInterID" id="HRoutingInterID" value="0">
+                                            </div>
+                                        </div>
+
+
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍖呰鏂瑰紡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HPackTypeName" id="HPackTypeName" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HPackTypeID" id="HPackTypeID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鎷変笣鏂瑰悜</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HDrawingDireName" id="HDrawingDireName" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HDrawingDireID" id="HDrawingDireID" value="0">
                                             </div>
                                         </div>
                                     </div>
                                     <div class="layui-row">
-                                        <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="HFirstCheckEmpID" id="HFirstCheckEmpID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" 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>
-                                            </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="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" 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>
-                                            </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: 120px;">
-                                                <input type="text" class="layui-input" name="HCheckerResult" id="HCheckerResult" style="padding-left: 32px;">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <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="HCheckDeptID" id="HCheckDeptID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" 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>
-                                            </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="HCheckDeptResult" id="HCheckDeptResult" style="padding-left: 32px;">
-                                            </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="HCheckDeptID2" id="HCheckDeptID2" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" 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>
-                                            </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="HCheckDeptResult2" id="HCheckDeptResult2" style="padding-left: 32px;">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鏉″舰鐮�</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HBarCode" id="HBarCode" style="padding-left: 32px;">
-                                            </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="HStoveBatchNo" id="HStoveBatchNo" style="padding-left: 32px;">
-                                            </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="HCusID" id="HCusID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" 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>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鍚堝悓鎵瑰彿</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HContrctBatchNo" id="HContrctBatchNo" style="padding-left: 32px;">
-                                            </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="HSortBillNo" id="HSortBillNo" style="padding-left: 32px;">
-                                            </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="HProdAreaID" id="HProdAreaID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" 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>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <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="HProdTypeID" id="HProdTypeID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" 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>
-                                            </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="HRoutingInterID" id="HRoutingInterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" 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>
-                                            </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="HPackTypeID" id="HPackTypeID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" 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>
-                                            </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="HDrawingDireID" id="HDrawingDireID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" 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>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HSortBillNo" id="HSortBillNo" style="padding-left: 32px;">
+                                        <div class="layui-col-xs7 layui-inline">
+                                            <label class="layui-form-label">澶囨敞</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
                                             </div>
                                         </div>
                                     </div>
@@ -350,17 +368,12 @@
         <!--<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 type="text/html" id="HSupColor">
-        {{#  if(d.HSupFlag === "true"){ }}
-        <span style="color: white;background-color:#5FB878;">{{ d.HSupFlag }}</span>
-        {{#  } else { }}
-        <span style="color: white;background-color:red;">{{ d.HSupFlag }}</span>
-        {{#  } }}
-    </script>
     <script src="../../../layuiadmin/layui/layui.js"></script>
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <script>
 
         layui.config({
@@ -373,108 +386,143 @@
                 , layer = layui.layer
                 , table = layui.table
                 , form = layui.form
+                , laydate = layui.laydate
                 , 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"; });
+            var params = get_UrlVars();
+            if (typeof (params[params[0]]) == "undefined") {
+                var OperationType = 1;//鎿嶄綔绫诲瀷
+                var closeType = 2;  //鍏抽棴绫诲瀷
+            } else {
+                var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+                var linterid = params[params[1]];//婧愬崟id
+                var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+                var closeType = params[params[3]];  //鍏抽棴绫诲瀷
             }
+            var hID = params[params[1]];//缂栬緫鏌ョ湅
+            //甯歌鐢ㄦ硶
+            laydate.render({
+                elem: '#HDate'
 
-            var params = getUrlVars();
-            //鑾峰彇鍙傛暟
-            function getUrlVars() {
-                var vars = [], hash;
-                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
-                for (var i = 0; i < hashes.length; i++) {
-                    hash = hashes[i].split('=');
-                    vars.push(hash[0]);
-                    vars[hash[0]] = hash[1];
-                }
-                return vars;
-            }
+            });
+            ////鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            //if (sessionStorage.login != "login") {
+            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            //    }, function () { window.location.href = "../../user/login.html"; });
+            //}
 
-            var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+            //var params = getUrlVars();
+            ////鑾峰彇鍙傛暟
+            //function getUrlVars() {
+            //    var vars = [], hash;
+            //    var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+            //    for (var i = 0; i < hashes.length; i++) {
+            //        hash = hashes[i].split('=');
+            //        vars.push(hash[0]);
+            //        vars[hash[0]] = hash[1];
+            //    }
+            //    return vars;
+            //}
 
-            //鍒ゆ柇鏄惁鏂板
-            if (linterid == null || linterid == 0) {
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetMAXNum",
-                    type: "GET",
-                    data: { "HBillType": '7501' },
-                    success: function (d) {
-                        //console.log(d.data);
-                        $("#HInterID").val(d.data[0].HInterID);
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                        $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
-                    }
-                });
-            }
-            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
-                RoadBillMain(linterid);
-                RoadBillSub(linterid);
-            }
-            //鍒濆琛ㄦ牸鏁版嵁
-            var rowdata = [{
-                "HQCCheckClassNumber": "", "HQCCheckClassName": "", "HQCCheckClassID": "0", "HQCCheckItemID": "0", "HQCCheckItemName": "", "HQCCheckItemNumber": "", "HQCStd": ""
-                , "HQCRelValue": "", "HResult": "", "HProcCheckEmp": "0", "HProcCheckEmpName": "", "HProcCheckEmpNumber": ""
-            }];
-
+            //var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+            //var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+            var tableReload = table.reload;
             var option = {
                 elem: '#mainTable'
                 , toolbar: '#toolbarDemo'
+                , height: 500
                 , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
-                , cellMinWidth: 90
+                //,url: '/demo/table/user/' //鏁版嵁鎺ュ彛
+                , page: true //寮�鍚垎椤�
                 , cols: [[ //琛ㄥご
-                    { type: 'checkbox', totalRowText: '鍚堣琛�' }
-                    , { type: 'HSno', title: '搴忓彿', totalRow: true }
-                    , { field: 'HQCCheckClassID', title: '妫�楠岄」鐩被鍒獻D', edit: 'text' }
-                    , { field: 'HQCCheckClassName', title: '妫�楠岄」鐩被鍒�', edit: 'text' }
-                    , { field: 'HQCCheckClassNumber', title: '妫�楠岄」鐩被鍒唬鐮�' }//, hide: true
-                    , { field: 'HQCCheckItemID', title: '妫�楠岄」鐩甀D', edit: 'text', width: 115 }
-                    , { field: 'HQCCheckItemName', title: '妫�楠岄」鐩�', edit: 'text' }
-                    , { field: 'HQCCheckItemNumber', title: '妫�楠岄」鐩唬鐮�' }
-                    , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text', width: 110 }
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+                    , { field: 'HQCCheckClassID', title: 'HQCCheckClassID', edit: 'text', width: 100, hide: true }
+                    , { field: 'HQCCheckClassNumber', title: '妫�楠岄」鐩被鍒�', edit: 'text', event: "HQCCheckClassCheck", width: 100 }
+                    , { field: 'HQCCheckClassName', title: '妫�楠岄」鐩被鍒悕绉�', edit: 'text', width: 100, hide: true }
+                    , { field: 'HQCCheckItemID', title: 'HQCCheckItemID', edit: 'text', hide: true }
+                    , { field: 'HQCCheckItemNumber', title: '妫�楠岄」鐩�', edit: 'text', event: "HQCCheckItemCheck", width: 100 }
+                    , { field: 'HQCCheckItemName', title: '妫�楠岄」鐩悕绉�', edit: 'text', width: 100, hide: true }
                     , { field: 'HQCRelValue', title: '妫�楠屾暟鎹�', edit: 'text' }
-                    , { field: 'HResult', title: '缁撹', edit: 'text' }
-                    , { field: 'HProcCheckEmp', title: '妫�楠屽憳ID', edit: 'text' }
-                    , { field: 'HProcCheckEmpName', title: '妫�楠屽憳', edit: 'text' }
-                    , { fixed: 'HProcCheckEmpNumber', title: '妫�楠屽憳浠g爜', edit: 'text' }
-                    , { fixed: 'HProcCheckTime', title: '妫�楠屾棩鏈�', edit: 'text' }
+                    , { field: 'HResult', title: '鍒ゅ畾', edit: 'text', event: "" }
+                    , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text', event: "" }
+                    , { field: 'HProcCheckEmpID', title: 'HProcCheckEmpID', edit: 'text', width: 100, hide: true }
+                    , { field: 'HProcCheckEmpName', title: '妫�娴嬪憳', edit: 'text', event: 'HProcCheckEmpCheck', width: 150 }
+                    , { field: 'HProcCheckEmpNumber', title: '妫�娴嬪憳浠g爜', edit: 'text', width: 100, hide: true }
+                    , { field: 'HProcCheckTime', title: '妫�娴嬫棩鏈�', event: "", edit: 'text' }
+                    , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 150 }
                 ]]
                 //, done: function (res, curr, count) {
                 //    $(".layui-table-body, .layui-table-box, .layui-table-cell").css('overflow', 'visible');
                 //}
             };
-            //鍒濆鍔犺浇琛ㄦ牸
-            option.data = rowdata;
-            table.render(option);
+            //鍒ゆ柇鏄惁鏂板
+            if (OperationType == 1) {
+                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HMaker").val(sessionStorage["HUserName"]);
 
-         
+                //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
+                option.data = [{
+                    "HQCCheckClassID": " ", "HQCCheckClassNumber": " ", "HQCCheckClassName": " ", "HQCCheckItemID": " ",
+                    "HQCCheckItemNumber": " ", "HQCCheckItemName": " ", "HQCRelValue": "  ", "HResult": "   "
+                    , "HQCStd": 0, "HProcCheckEmpID": " ", "HProcCheckEmpNumber": " ", "HProcCheckEmpName": " ", "HProcCheckTime": "  ", "HRemark": "  "
+                }];
+                table.render(option);
+            }
+            else {
+                $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
+                //缂栬緫鍔犺浇鏁版嵁
+                $.ajax({
+                    url: GetWEBURL() + '/QC_LastPieceCheckBill/QC_LastPieceCheckBillListProjectDetai',
+                    type: "GET",
+                    data: { "sqlWhere": "and HInterID=" + hID },
+                    success: function (result) {
+                        //console.log(result);
+                        //console.log('gouba' + result);
+                        if (result.count == 1) {
+                            option.data = result.data;
+                            table.render(option);
+
+                        } else {
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(index0);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
             //澶村伐鍏锋爮浜嬩欢
+            var rowid = 0;
+            var rows = 0;
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                //鏂板琛岃〃鏍兼暟鎹�
+                    , data = checkStatus.data;;
+                var AddRow = table.cache['mainTable'];
                 var NewRow = {
-                    "HQCCheckClassNumber": "", "HQCCheckClassName": "", "HQCCheckClassID": "0", "HQCCheckItemID": "0", "HQCCheckItemName": "", "HQCCheckItemNumber": "", "HQCStd": ""
-                    , "HQCRelValue": "", "HResult": "", "HProcCheckEmp": "0", "HProcCheckEmpName": "", "HProcCheckEmpNumber": ""
+                    "HQCCheckClassID": " ", "HQCCheckClassNumber": " ", "HQCCheckClassName": " ", "HQCCheckItemID": " ",
+                    "HQCCheckItemNumber": " ", "HQCCheckItemName": " ", "HQCRelValue": "  ", "HResult": "   "
+                    , "HQCStd": 0, "HProcCheckEmpID": " ", "HProcCheckEmpNumber": " ", "HProcCheckEmpName": " ", "HProcCheckTime": "  ", "HRemark": "  "
                 };
                 switch (obj.event) {
                     case 'btn-AddLine':
+                        //table.cache["mainTable"].push(AddRow[rows]);
                         table.cache["mainTable"].push(NewRow);
                         option.data = table.cache["mainTable"];
                         table.render(option);
+
+                        rows++;
+                        //layer.msg('澧炲姞涓�琛屾寜閽紒')
                         break;
                     case 'btn-CopyLine':
                         var copydata = JSON.stringify(data);
                         if (data.length <= 0) {
-                            layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                            layer.alert("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
                         }
                         else if (data.length > 1) {
-                            layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                            layer.alert("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
                         }
                         else {
                             var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
@@ -482,11 +530,35 @@
                             table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
                             option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
                             table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
-                            //layer.alert(copyrow);
+
                         }
                         break;
                 }
             });
+            ////鍒ゆ柇鏄惁鏂板
+            //if (linterid == null || linterid == 0) {
+            //    $.ajax({
+            //        url: GetWEBURL() + "/Web/GetMAXNum",
+            //        type: "GET",
+            //        data: { "HBillType": '7501' },
+            //        success: function (d) {
+            //            //console.log(d.data);
+            //            $("#HInterID").val(d.data[0].HInterID);
+            //            $("#HBillNo").val(d.data[0].HBillNo);
+            //            $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+            //        }
+            //    });
+            //}
+            //else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+            //    RoadBillMain(linterid);
+            //    RoadBillSub(linterid);
+            //}
+
+            ////鍒濆鍔犺浇琛ㄦ牸
+            //option.data = rowdata;
+            //table.render(option);
+
+
 
             //琛屽唴浜嬩欢
             table.on('tool(mainTable)', function (obj) {
@@ -505,217 +577,587 @@
                         }
                     });
                 }
-                //鍗曞嚮鏀瑰彉澶栧崗鏍囪鍊�
-                if (obj.event === 'HSupFlagEvent') {
-                    var flag = obj.data.HSupFlag;
-                    if (flag === "false") {
-                        flag = "true";
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        if (obj.event === 'HQCCheckClassCheck')  //妯″叿淇℃伅
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '妫�楠岄」鐩被鍒�',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_QCCheckClass.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HQCCheckClassID: checkStatus.data[0].HItemID,
+                                        HQCCheckClassNumber: checkStatus.data[0].浠g爜,
+                                        HQCCheckClassName: checkStatus.data[0].鍚嶇О,
+
+                                    });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+
+                        if (obj.event === 'HQCCheckItemCheck')  //妫�楠岄」鐩�
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '妫�楠岄」鐩�',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_QCCheckItemListView.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index];
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    obj.update({
+                                        HQCCheckItemName: checkStatus.data[0].鍚嶇О
+                                        , HQCCheckItemID: checkStatus.data[0].HItemID
+                                        , HQCCheckItemNumber: checkStatus.data[0].浠g爜
+                                    });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        if (obj.event === 'HProcCheckEmpCheck')  //妫�娴嬪憳
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '妫�娴嬪憳鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html ', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HProcCheckEmpName: checkStatus.data[0].HName
+                                        , HProcCheckEmpID: checkStatus.data[0].HItemID
+                                        , HProcCheckEmpNumber: checkStatus.data[0].HNumber
+                                    });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+
+
+                        obj.event = "";
+                        return false;
+
                     }
-                    else if (flag === "true") {
-                        flag = "false";
-                    }
-                    else {
-                        flag = "true";
-                    }
-                    obj.update({
-                        HSupFlag: flag
-                    });
-                }
+                })
             });
-
-            $('#HName').on('keydown', function (event) {//宸ヨ壓璺嚎鍚嶇О
-                if (event.keyCode == 118) {
-                    layer.msg("宸ヨ壓璺嚎鍚嶇ОF7鎸夐挳")
-                }
-            });
-
-
-            //淇濆瓨鎻愪氦
-            form.on('submit(btnSave)', function (data) {//鎻愪氦
-                //var tableData = data.field;
-                var sMainStr = JSON.stringify(data.field);
-                var sSubStr = JSON.stringify(table.cache['mainTable']);
-                var sMainSub = sMainStr + ';' + sSubStr;
-                var index = layer.load();
+            function RoadBillMain(hID)//鍔犺浇琛ㄥご
+            {
+                //alert(hID);
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
                 $.ajax({
-                    type: "POST",
-                    //url: GetWEBURL() + "/Gy_RoutingBill/AddBill",
-                    url:"http://localhost:12761/QC_LastPieceCheckBill/AddBill",
-                    async: true,
-                    data: { "sMainSub": sMainSub },
-                    dataType: "json",
-                    success: function (data) {
-                        if (data.count == 1) {
-                            //layer.confirm(data.Message, {
-                            //    icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
-                            //    btn2: function () {
-                            //        //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
-                            //        //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
-                            //        parent.location.href = "../../../views/index.html"
-                            //    }//鍏抽棴
-                            //}, function () { window.location.reload(); });//鏂板
-                            layer.close(index);
-                            layer.msg("鎻愪氦鎴愬姛");
-                        }
-                        else {
-                            layer.close(index);
-                            layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
+                    url: GetWEBURL() + "/QC_LastPieceCheckBill/QC_LastPieceCheckBillListCheckDetail",
+                    type: "GET",
+                    data: {
+                        "HID": hID
                     },
-                    error: function (err) {
-                        layer.close(index);
-                        layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    success: function (result) {
+
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data.h_v_QC_LastPieceCheckBillListDetail[0];
+                            console.info(data);
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HBillNo": data.鍗曟嵁鍙�
+                                , "HDate": formatDate(data.鏃ユ湡)
+                                , "HSourceID": data.HSourceID
+                                , "HSourceName": data.鐢熶骇璧勬簮鍚嶇О
+                                , "HICMOBillNo": data.浠诲姟鍗曞彿
+                                , "HICMOID": data.HICMOID
+                                , "HInStockQty": data.鍏ュ簱鏁伴噺
+                                , "HRightQty": data.鍚堟牸鏁伴噺
+                                , "HICMOInterID": data.浠诲姟鍗曞唴鐮�
+                                , "HCheckQty": data.鎶芥鏁伴噺
+                                , "HBadQty": data.涓嶅悎鏍兼暟閲�
+                                , "HFirstCheckEmpID": data.妫�楠屽憳ID
+                                , "HFirstCheckEmpName": data.妫�楠屽憳鍚嶇О
+                                , "HFirstCheckEmp": data.妫�楠屽憳
+                                , "HMaterID": data.HMaterID
+                                , "HMaterName": data.浜у搧鍐呯爜
+                                , "HCheckerResult": data.鍒ゅ畾缁撹
+                                , "HCheckDeptID": data.璐ㄦ绉慖D
+                                , "HCheckDeptName": data.璐ㄦ绉�
+                                , "HCheckDept2Name": data.璐ㄦ閮�
+                                , "HCheckDeptID2": data.璐ㄦ閮↖D
+                                , "HCheckDeptResult": data.璐ㄦ绉戠鍚�
+                                , "HCheckDeptResult2": data.璐ㄦ閮ㄧ鍚�
+                                , "HBarCode": data.鏉″舰鐮�
+                                , "HStoveBatchNo": data.鐐夋壒鍙�
+                                , "HCusName": data.瀹㈡埛
+                                , "HCusID": data.HCusID
+                                , "HContrctBatchNo": data.鍚堝悓鎵瑰彿
+                                , "HSortBillNo": data.鎺掍骇鍗曞彿
+                                , "HProdAreaID": data.HProdAreaID
+                                , "HProdAreaName": data.浜у湴
+                                , "HProdTypeName": data.鍔犲伐绫诲瀷
+                                , "HProdTypeID": data.HProdTypeID
+                                , "HRoutingInterName": data.宸ヨ壓璺嚎
+                                , "HRoutingInterID": data.HRoutingInterID
+                                , "HPackTypeName": data.鍖呰鏂瑰紡
+                                , "HPackTypeID": data.HPackTypeID
+                                , "HDrawingDireName": data.鎷変笣鏂瑰悜
+                                , "HDrawingDireID": data.HDrawingDireID
+                                , "HRemark": data.琛ㄥご澶囨敞
+                            });
+
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+            var date = new Date();
+            var day = date.getDate();
+            var month = date.getMonth() + 1;
+            var year = date.getFullYear();
+            var shijian = year + "-" + month + "-" + day;
+            //鍒ゆ柇鏄惁鏂板
+            if (hID == null || hID == 0) {
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("0");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '7501' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(shijian);
+                        $("#HInterID").val(0);
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                RoadBillMain(hID);
+                /* RoadBillSub(linterid);*/
+            }
+
+            //琛ㄥご淇℃伅鐢熶骇璧勬簮寮圭獥
+            form.on('submit(HSource)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鐢熶骇璧勬簮鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_GetProductionResourcesList.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSourceName").val(checkStatus.data[0].HName);
+                        $("#HSourceID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+            //琛ㄥご淇℃伅浠诲姟鍗曞彿寮圭獥
+            form.on('submit(HICMO)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鐢熶骇璧勬簮鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_GetProductionResourcesList.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HICMOBillNo").val(checkStatus.data[0].HName);
+                        $("#HICMOBillID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
                     }
                 });
             });
 
-
-            function RoadBillMain(linterid)//鍔犺浇琛ㄥご
-            {
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetPonderationBill",
-                    type: "GET",
-                    data: { "HInterID": linterid },
-                    success: function (d) {
-                        // console.log(d.data);
-                        $("#HInterID").val(d.data[0].HInterID);
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                        $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
-
-                    }
-                })
-            }
-
-
-
-
-            //閫夋嫨涓嶈壇鍘熷洜
-            form.on('submit(HBadReasonID-BT)', function () {//閫夋嫨浠撳簱
+            //琛ㄥご淇℃伅浠诲姟鍗曞彿寮圭獥
+            form.on('submit(HFirstCheckEmp)', function () {
+                //椤甸潰灞�-鑷畾涔�
                 layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '涓嶈壇鍘熷洜鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-            });
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '妫�楠屽憳鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
 
-            //閫夋嫨宸ュ簭璁″垝鍗�
-            form.on('submit(HPlanID-BT)', function () {//閫夋嫨宸ュ簭璁″垝鍗�
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HFirstCheckEmpName").val(checkStatus.data[0].HName);
+                        $("#HFirstCheckEmpID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+            //琛ㄥご淇℃伅浠诲姟鍗曞彿寮圭獥
+            form.on('submit(HMater)', function () {
+                //椤甸潰灞�-鑷畾涔�
                 layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '宸ュ簭璁″垝鍗曞垪琛�'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ProcessPlanViewList.html', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-            });
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '浜у搧鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
 
-            //閫夋嫨璐d换浜�
-            form.on('submit(HEmployeeID-BT)', function () {//閫夋嫨璐d换浜�
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HMaterName").val(checkStatus.data[0].HName);
+                        $("#HMaterID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+            //琛ㄥご淇℃伅浠诲姟鍗曞彿寮圭獥
+            form.on('submit(HCheckDept)', function () {
+                //椤甸潰灞�-鑷畾涔�
                 layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '鑱屽憳鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-            });
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '璐ㄦ绉戝垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
 
-            //閫夋嫨鐢宠宸ュ簭
-            form.on('submit(HSQProcID-BT)', function () {//閫夋嫨鐢宠宸ュ簭
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HCheckDeptName").val(checkStatus.data[0].HName);
+                        $("#HCheckDeptID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+            //琛ㄥご淇℃伅浠诲姟鍗曞彿寮圭獥
+            form.on('submit(HCheckDept)', function () {
+                //椤甸潰灞�-鑷畾涔�
                 layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '鐢宠宸ュ簭鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-            });
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '璐ㄦ绉戝垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
 
-            //閫夋嫨璐d换宸ュ簭
-            form.on('submit(HZRProcID-BT)', function () {//閫夋嫨璐d换宸ュ簭
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HCheckDeptName").val(checkStatus.data[0].HName);
+                        $("#HCheckDeptID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+            //琛ㄥご淇℃伅浠诲姟鍗曞彿寮圭獥
+            form.on('submit(HCheckDept2)', function () {
+                //椤甸潰灞�-鑷畾涔�
                 layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '璐d换宸ュ簭鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-            });
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '璐ㄦ閮ㄥ垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
 
-            //缂栬緫
-            form.on('submit(cmdModify)', function () {//缂栬緫
-                var sSubStr = table.cache['wl-table'];
-                //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HCheckDept2Name").val(checkStatus.data[0].HName);
+                        $("#HCheckDept2ID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+            //琛ㄥご淇℃伅瀹㈡埛寮圭獥
+            form.on('submit(HCus)', function () {
+                //椤甸潰灞�-鑷畾涔�
                 layer.open({
-                    type: 2
-                    , area: ['100%', '100%']
-                    , title: '鏄庣粏鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '瀹㈡埛鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_CustomerList.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HCusName").val(checkStatus.data[0].HName);
+                        $("#HCusID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
-                })
-                // }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
             });
+            //琛ㄥご淇℃伅瀹㈡埛寮圭獥
+            form.on('submit(HProdArea)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '浜у湴鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_CustomerList.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
 
-            form.on('submit(Cancel)', function () {
-                //sessionStorage["SourceFlag"] = false;
-                parent.location.href = "../../../views/index.html"
-                //window.close();//鍏抽棴褰撳墠椤�
-            })
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HProdAreaName").val(checkStatus.data[0].HName);
+                        $("#HProdAreaID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
 
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
             form.on('submit(Saver)', function (data) {//淇濆瓨
                 //debugger;
+                data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
-                var sMainSub = sMainStr + ';' + sSubStr;
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
+                if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
+                {
+                    return false;
+                }
                 $.ajax(
                     {
                         type: "POST",
-                        url: GetWEBURL() + "SaveBadReasonList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        url: GetWEBURL() + "/QC_LastPieceCheckBill/AddBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                         async: true,
                         data: { "msg": sMainSub },
                         dataType: "json",
                         success: function (data) {
                             if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                layer.msg(data.Message, { icon: 1 });
-                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                    var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                    parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+                                });
                             }
                             else {
 
@@ -735,7 +1177,6 @@
                 layer.alert(sMsg, { icon: 5 });
 
             }
-
             //鐩戝惉鎻愪氦
             form.verify({
                 numberOrEmpty: function (value, item) {
@@ -758,98 +1199,92 @@
             HReasonName = obj[0].HName;
             ReasonID = obj[0].HItemID;
         }
-        function GetHPlanValue(obj) {  //杩斿洖宸ュ簭璁″垝鍗�
-            $("#HMainSourceInterID").val(obj[0].hmainid);
-            $("#HMainSourceEntryID").val(obj[0].hsubid);
-            $("#HMainSourceBillNo").val(obj[0].鍗曟嵁鍙�);
-            $("#HMaterID").val(obj[0].HMaterID);
-            $("#HMaterNumber").val(obj[0].鐗╂枡浠g爜);
-            $("#HMater").val(obj[0].鐗╂枡鍚嶇О);
-            $("#HCenterID").val(obj[0].HCenterID);
-            $("#HWorkCenterName").val(obj[0].宸ヤ綔涓績);
-            $("#HModel").val(obj[0].瑙勬牸鍨嬪彿);
-            $("#HPlanQty").val(obj[0].璁″垝鏁伴噺);
-
-
+        //杩斿洖鐗╂枡
+        function GetHMaterNameValue(obj) {  //杩斿洖鐗╂枡
+            $("#HMater").val(obj[0].HName);
+            $("#HMaterID").val(obj[0].HItemID);
+            $("#HMaterNumber").val(obj[0].HNumber);
         }
+        //杩斿洖宸ュ簭
+        function GetHProcValue(obj) {  //杩斿洖宸ュ簭
+            $("#HProcName").val(obj[0].宸ュ簭);
+            $("#HProcID").val(obj[0].HItemID);
+            $("#HProcNumber").val(obj[0].宸ュ簭浠g爜);
+        }
+        function GetHDeptNameValue(obj) {  //杩斿洖閮ㄩ棬
+            $("#HDepName").val(obj[0].HName);
+            $("#HDeptID").val(obj[0].HItemID);
+            $("#HDeptNumber").val(obj[0].HNumber);
+        }
+        //杩斿洖鍗曚綅
+        function GetHUnitNameValue(obj) {
+            $("#HUName").val(obj[0].HName);
+            $("#HUnitID").val(obj[0].HItemID);
+            $("#HUnitNumber").val(obj[0].HNumber);
+        }
+
         function GetHKeeperValue(obj) {  //杩斿洖璐d换浜�
             EmpName = obj[0].HName;
-            // $("#HEmpName").val(obj[0].HName);
-            //$("#HItemID").val(obj[0].HItemID);
-        }
-        function GetHProcValue(obj) {  //杩斿洖鐢宠宸ュ簭
-            SQProcName = obj[0].宸ュ簭;
-            ProcID = obj[0].HItemID;
-            //$("#HSQProcName").val(obj[0].宸ュ簭);
-            //$("#HProcID").val(obj[0].HItemID);
         }
         function GetHZRValue(obj) {   //杩斿洖璐d换宸ュ簭
             ZRProcName = obj[0].宸ュ簭;
-            //$("#HZRProcName").val(obj[0].宸ュ簭);
-            //$("#HItemID").val(obj[0].HItemID);
         }
-        //HWorker
         function GetHWorkerValue(obj) {  //杩斿洖涓嶈壇纭浜�
             QRName = obj[0].HName;
-            //$("#HQRName").val(obj[0].HName);
-            //$("#HItemID").val(obj[0].HItemID);
         }
-        function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
-            //if ($("#HSourceBillNo").val() == '') {
-            //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
-            //    return false;
+        //闈炵┖楠岃瘉
+        function AllowLoadData(sSubStr) {
+            var HStockStyle = $("#HStockStyle").val();
+            var Result = true;
+            //if ($("#HWHID").val() == '' || $("#HWHID").val() == null) {
+            //    layer.msg("鍣ㄥ叿浠撳簱涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //    return Result = false;
             //}
-            if ($("#HDeptName").val() == '') {
-                layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-            if ($("#HSecManager").val() == '') {
-                layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-            if ($("#HKeeper").val() == '') {
-                layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-            //if ($("#HWHNAME").val() == '') {
-            //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
-            //    return false;
+            //if ($("#HSecManagerID").val() == '' || $("#HSecManagerID").val() == null) {
+            //    layer.msg("棰嗘枡浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //    return Result = false;
             //}
-            if ($("#HBillNo").val() == '') {
-                layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-            if ($("#HInterID").val() == '') {
-                layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-            if (typeof (sSubStr) == "undefined") {
-                layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-            if (!typeof (sSubStr) == "undefined") {
-                //for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
-                //    if (parseFloat(sSubStr[i].HQtyMust) > 0) {
-                //        if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
-                //        {
-                //            layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
-                //            return false;
-                //        }
-                //    }
-                //}
-                for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
-                    if (parseFloat(sSubStr[i].HQty) > 0) {
-                        s = 1;
-                    }
-                }
-                if (s == 0) {
-                    layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return false;
-                }
-            }
-            else {
-                return true;
-            }
+            //if ($("#HKeeperID").val() == '' || $("#HKeeperID").val() == null) {
+            //    layer.msg("鍙戞枡浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //    return Result = false;
+            //}
+            //if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
+            //    layer.msg("閮ㄩ棬涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //    return Result = false;
+            //}
+            //if (typeof (sSubStr) == "undefined" || sSubStr == "") {
+            //    layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //    return Result = false;
+            //}
+            //if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+            //    sSubStr = JSON.parse(sSubStr);
+            //    for (var i = 0; i < sSubStr.length; i++) {
+            //        if (sSubStr[i].HMaterID == "") {
+            //            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍣ㄥ叿淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //            return Result = false;
+            //        }
+            //        if (sSubStr[i].HWHID == "") {
+            //            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璋冨叆浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //            return Result = false;
+            //        }
+            //        if (sSubStr[i].HSCWHID == "") {
+            //            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璋冨嚭浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //            return Result = false;
+            //        }
+            //        if (HStockStyle == "璺ㄧ粍缁囪皟鎷�" && sSubStr[i].HStockOrgID == sSubStr[i].HOtherOrgID) {
+            //            layer.msg("璋冩嫧绫诲瀷涓鸿法缁勭粐璋冩嫧锛屾槑缁嗚褰曠" + (i + 1) + "琛�,璋冨嚭缁勭粐鍜屽綋鍓嶇粍缁囦竴鑷� !", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //            return Result = false;
+            //        }
+            //        if (HStockStyle == "鍚岀粍缁囪皟鎷�" && sSubStr[i].HStockOrgID != sSubStr[i].HOtherOrgID) {
+            //            layer.msg("璋冩嫧绫诲瀷涓哄悓缁勭粐璋冩嫧锛屾槑缁嗚褰曠" + (i + 1) + "琛�,璋冨嚭缁勭粐鍜屽綋鍓嶇粍缁囦笉涓�鑷� !", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //            return Result = false;
+            //        }
+            //    }
+            //}
+            /*else {*/
+            /* return Result = true;*/
+            //}
+            return Result;
         }
     </script>
 </body>
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\344\272\247\345\223\201\345\205\245\345\272\223\346\243\200\351\252\214\345\215\225/QC_LastPieceCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\344\272\247\345\223\201\345\205\245\345\272\223\346\243\200\351\252\214\345\215\225/QC_LastPieceCheckBillList.html"
index 1a0da43..53dd67e 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\344\272\247\345\223\201\345\205\245\345\272\223\346\243\200\351\252\214\345\215\225/QC_LastPieceCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\344\272\247\345\223\201\345\205\245\345\272\223\346\243\200\351\252\214\345\215\225/QC_LastPieceCheckBillList.html"
@@ -244,7 +244,7 @@
                                 var index = layer.load();
                                 //閫昏緫鍒犻櫎鏂规硶
                                 $.ajax({
-                                    url: GetWEBURL() + 'DeltetQC_FirstPieceCheck',
+                                    url: GetWEBURL() + 'QC_LastPieceCheckBill/DeltetLastPieceCheckBill',
                                     type: "GET",
                                     data: { "HInterID": InterID },
                                     success: function (result) {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBill.html"
index 0ddee79..fc582eb 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBill.html"
@@ -330,13 +330,19 @@
                 , page: true //寮�鍚垎椤�
                 , cols: [[ //琛ㄥご
                      {type:'checkbox', fixed: 'left'}
-                    ,{ templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left',event:"qwe" }
-                    , { field: 'HQCCheckClassID', title: '妫�楠岄」鐩被鍒�', event: "", edit: 'text'}
-                    , { field: 'HQCCheckItemID', title: '妫�楠岄」鐩甀D', edit: 'text'}
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+                    , { field: 'HQCCheckClassID', title: 'HQCCheckClassID', edit: 'text', width: 100, hide: true }
+                    , { field: 'HQCCheckClassNumber', title: '妫�楠岄」鐩被鍒�', edit: 'text', event: "HQCCheckClassCheck", width: 100 }
+                    , { field: 'HQCCheckClassName', title: '妫�楠岄」鐩被鍒悕绉�', edit: 'text', width: 100, hide: true }
+                    , { field: 'HQCCheckItemID', title: 'HQCCheckItemID', edit: 'text', hide: true }
+                    , { field: 'HQCCheckItemNumber', title: '妫�楠岄」鐩�', edit: 'text', event: "HQCCheckItemCheck", width: 100 }
+                    , { field: 'HQCCheckItemName', title: '妫�楠岄」鐩悕绉�', edit: 'text', width: 100, hide: true }
                     , { field: 'HQCRelValue', title: '妫�楠屾暟鎹�', edit: 'text' }
                     , { field: 'HResult', title: '鍒ゅ畾', edit: 'text', event: "" }
-                    , { field: 'HQCStd', title: '妫�楠屾爣鍑�',edit: 'text', event: "" }
-                    , { field: 'HProcCheckEmp', title: '妫�娴嬪憳' , edit: 'text'}
+                    , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text', event: "" }
+                    , { field: 'HProcCheckEmpID', title: 'HProcCheckEmpID', edit: 'text', width: 100, hide: true }
+                    , { field: 'HProcCheckEmpName', title: '妫�娴嬪憳', edit: 'text', event: 'HProcCheckEmpCheck', width: 150 }
+                    , { field: 'HProcCheckEmpNumber', title: '妫�娴嬪憳浠g爜', edit: 'text', width: 100, hide: true }
                     , { field: 'HProcCheckTime', title: '妫�娴嬫棩鏈�', event: "", edit: 'text' }
                     , { field: 'HRemark', title: '澶囨敞', edit: 'text'}
                      ,{fixed: 'right', title:'鎿嶄綔', toolbar: '#barDemo', width:150}
@@ -358,8 +364,9 @@
                 $("#HDeleteMan").val(sessionStorage["HUserName"]);
                 //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
                 option.data = [{
-                    "HQCCheckClassID": " ", "HQCCheckItemID": " ", "HQCRelValue": "  ", "HResult": "   "
-                    , "HQCStd": 0, "HProcCheckEmp": 0, "HProcCheckTime": "  ", "HRemark": "  "
+                    "HQCCheckClassID": " ", "HQCCheckClassNumber": " ", "HQCCheckClassName": " ", "HQCCheckItemID": " ",
+                    "HQCCheckItemNumber": " ", "HQCCheckItemName": " ","HQCRelValue": "  ", "HResult": "   "
+                    , "HQCStd": 0, "HProcCheckEmpID": " ", "HProcCheckEmpNumber": " ", "HProcCheckEmpName": " ", "HProcCheckTime": "  ", "HRemark": "  "
                 }];
                 table.render(option);
             }
@@ -397,8 +404,9 @@
                     ,data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
                 var NewRow = {
-                    "HQCCheckClassID": " ", "HQCCheckItemID": " ", "HQCRelValue": "  ", "HResult": "   "
-                    , "HQCStd": 0, "HProcCheckEmp": 0, "HProcCheckTime": "  ", "HRemark": "  "
+                    "HQCCheckClassID": " ", "HQCCheckClassNumber": " ", "HQCCheckClassName": " ", "HQCCheckItemID": " ",
+                    "HQCCheckItemNumber": " ", "HQCCheckItemName": " ", "HQCRelValue": "  ", "HResult": "   "
+                    , "HQCStd": 0, "HProcCheckEmpID": " ", "HProcCheckEmpNumber": " ", "HProcCheckEmpName": " ", "HProcCheckTime": "  ", "HRemark": "  "
                 };
                 switch (obj.event) {
                     case 'btn-AddLine':
@@ -432,1961 +440,134 @@
             table.on('tool(mainTable)', function (obj) {
                 var data = obj.data;
                 var rowIndex = $(obj.tr).attr("data-index");
-                if (obj.event==='del') {
-                    layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+                if (obj.event === 'del') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
                         console.log("绱㈠紩涓�:" + rowIndex);
-                        if (rowIndex ==='0') {
+                        if (rowIndex === '0') {
                             layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
                         } else {
                             obj.del();
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.reload(option);
                             layer.close(index);
                         }
                     });
                 }
-                if (obj.event === 'ReasonNameEvent') {
-                    var _obj = obj;
-                    switch (rowIndex) {
-                        case "0":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
+
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        if (obj.event === 'HQCCheckClassCheck')  //妯″叿淇℃伅
+                        {
+                            //椤甸潰灞�-鑷畾涔�
                             layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '妫�楠岄」鐩被鍒�',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_QCCheckClass.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HQCCheckClassID: checkStatus.data[0].HItemID,
+                                        HQCCheckClassNumber: checkStatus.data[0].HNumber,
+                                        HQCCheckClassName: checkStatus.data[0].HName,
                                     });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                                 }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "1":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        if (obj.event == 'HQCCheckItemCheck') {
                             layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '妫�楠岄」鐩�',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true,
+                                content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_QCCheckItemListView.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index];
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    obj.update({
+                                        HQCCheckItemName: checkStatus.data[0].HQCCheckItemName
+                                        , HQCCheckItemID: checkStatus.data[0].HItemID
+                                        , HQCCheckItemNumber: checkStatus.data[0].HQCCheckItemNumber
                                     });
+                                   
+                                    layer.close(layer.index);
                                 }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "2":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
+                                , btn2: function (index, layero) {
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        if (obj.event === 'HProcCheckEmpCheck') {//鑱屽憳
                             layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '妫�娴嬪憳鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true,
+                                content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index];
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    obj.update({
+                                        HProcCheckEmpName: checkStatus.data[0].HName
+                                        , HProcCheckEmpID: checkStatus.data[0].HItemID
+                                        , HProcCheckEmpNumber: checkStatus.data[0].HNumber
                                     });
+
+                                    layer.close(layer.index);
                                 }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "3":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
+                                , btn2: function (index, layero) {
+                                },
+                                end: function () {
+
                                 }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "4":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "5":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "6":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "7":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "8":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "9":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "10":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "11":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "12":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "13":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "14":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "15":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "16":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
+                            });
+                        }
+                        obj.event = "";
+                        return false;
 
                     }
-                }
-                else if (obj.event === 'EmpNameEvent') {
-                     var _obj = obj;
-                    switch (rowIndex) {
-                        case "0":
-                            //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "1":
-                             //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "2":
-                              //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "3":
-                              //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "4":
-                           //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "5":
-                             //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "6":
-                            //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "7":
-                         //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "8":
-                              //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "9":
-                           //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "10":
-                            //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "11":
-                          //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "12":
-                              //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "13":
-                              //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "14":
-                             //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "15":
-                            //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "16":
-                              //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-
-                    }
-                }
-                else if (obj.event === 'SQProcNameEvent') {
-                     var _obj = obj;
-                    switch (rowIndex) {
-                        case "0":
-                            //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "1":
-                                 //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "2":
-                             //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "3":
-                                //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "4":
-                                //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "5":
-                               //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "6":
-                                //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "7":
-                              //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "8":
-                               //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "9":
-                              //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "10":
-                               //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "11":
-                             //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "12":
-                                //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "13":
-                             //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "14":
-                               //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "15":
-                               //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "16":
-                            //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-
-                    }
-                }
-                else if (obj.event === 'ZRProcNameEvent') {
-                     var _obj = obj;
-                    switch (rowIndex) {
-                        case "0":
-                            //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "1":
-                              //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "2":
-                        //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "3":
-                               //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "4":
-                               //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "5":
-                            //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "6":
-                               //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "7":
-                            //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "8":
-                            //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "9":
-                               //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "10":
-                             //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "11":
-                             //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "12":
-                              //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "13":
-                              //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "14":
-                               //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "15":
-                              //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "16":
-                             //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-
-                    }
-                }
-                else if (obj.event === 'BadQtyEvent') {
-                     var _obj = obj;
-                    switch (rowIndex) {
-                        case "0":
-
-                            break;
-                         case "1":
-
-                            break;
-                         case "2":
-
-                            break;
-                         case "3":
-
-                            break;
-                         case "4":
-
-                            break;
-                         case "5":
-
-                            break;
-                         case "6":
-
-                            break;
-                         case "7":
-
-                            break;
-                         case "8":
-
-                            break;
-                         case "9":
-
-                            break;
-                         case "10":
-
-                            break;
-                         case "11":
-
-                            break;
-                         case "12":
-
-                            break;
-                         case "13":
-
-                            break;
-                         case "14":
-
-                            break;
-                         case "15":
-
-                            break;
-                         case "16":
-                            //$(obj.tr).find(".layui-table-edit").keyup(function () {
-                            //    var $input = $(this), val = $input.val();
-                            //    if (!val) val = "1";
-                            //    $input.val(val.replace(/[^\d]/g, ''));
-                            //});
-                            break;
-
-                    }
-                }
-                else if (obj.event === 'RemarkEvent') {
-                     var _obj = obj;
-                    switch (rowIndex) {
-                        case "0":
-
-                            break;
-                         case "1":
-
-                            break;
-                         case "2":
-
-                            break;
-                         case "3":
-
-                            break;
-                         case "4":
-
-                            break;
-                         case "5":
-
-                            break;
-                         case "6":
-
-                            break;
-                         case "7":
-
-                            break;
-                         case "8":
-
-                            break;
-                         case "9":
-
-                            break;
-                         case "10":
-
-                            break;
-                         case "11":
-
-                            break;
-                         case "12":
-
-                            break;
-                         case "13":
-
-                            break;
-                         case "14":
-
-                            break;
-                         case "15":
-
-                            break;
-                         case "16":
-
-                            break;
-
-                    }
-                }
-                else if (obj.event === 'PSProcNameEvent') {
-                     var _obj = obj;
-                    switch (rowIndex) {
-                        case "0":
-                              //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "1":
-                                 //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "2":
-                                //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "3":
-                              //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "4":
-                                //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "5":
-                                 //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "6":
-                                 //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "7":
-                                //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "8":
-                                  //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "9":
-                                 //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "10":
-                             //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "11":
-                                //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "12":
-                               //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "13":
-                                //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "14":
-                                //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "15":
-                                 //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "16":
-                               //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-
-                    }
-                }
-                else if (obj.event === 'CloseManEvent') {
-                     var _obj = obj;
-                    switch (rowIndex) {
-                        case "0":
-
-                            break;
-                         case "1":
-
-                            break;
-                         case "2":
-
-                            break;
-                         case "3":
-
-                            break;
-                         case "4":
-
-                            break;
-                         case "5":
-
-                            break;
-                         case "6":
-
-                            break;
-                         case "7":
-
-                            break;
-                         case "8":
-
-                            break;
-                         case "9":
-
-                            break;
-                         case "10":
-
-                            break;
-                         case "11":
-
-                            break;
-                         case "12":
-
-                            break;
-                         case "13":
-
-                            break;
-                         case "14":
-
-                            break;
-                         case "15":
-
-                            break;
-                         case "16":
-
-                            break;
-
-                    }
-                }
-
-
-
+                })
             });
-
 
 
             function RoadBillMain(hID)//鍔犺浇琛ㄥご
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBillList.html"
new file mode 100644
index 0000000..e55bed4
--- /dev/null
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBillList.html"
@@ -0,0 +1,1008 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鏂板/缂栬緫鏉ユ枡妫�楠屽崟</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <style type="text/css">
+        .layui-form-item .layui-inline {
+            margin-right: 0;
+        }
+
+        html {
+            background-color: white;
+            color: white;
+        }
+
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 15px;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" lay-filter="component-form-group" action="">
+                    <div class="layui-card-header">
+                        <div class="layui-btn-group">
+                            <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <h1 style="text-align: center; padding: 10px 0;"><b>鏉ユ枡妫�楠屽崟</b></h1>
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID" value="0">
+                                                <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">渚涘簲鍟�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">浜у搧鍐呯爜</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HMaterName" id="HMaterName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍏ュ簱鏁伴噺</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HInStockQty" id="HInStockQty" autocomplete="off">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍚堟牸鏁伴噺</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HRightQty" id="HRightQty" autocomplete="off">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">妫�楠屽憳</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HFirstCheckEmpName" id="HFirstCheckEmpName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HFirstCheckEmpID" id="HFirstCheckEmpID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鎶芥鏁伴噺</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HCheckQty" id="HCheckQty" autocomplete="off">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">涓嶅悎鏍兼暟閲�</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HBadQty" id="HBadQty" autocomplete="off">
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">閽㈡潗鐐夊彿</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HSteelStoveNo" id="HSteelStoveNo" autocomplete="off">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">澶栬</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HAspect" id="HAspect" autocomplete="off">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">灏哄</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HSize" id="HSize" autocomplete="off">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">閽㈠巶鎶ュ憡涓婁紶</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HSteelCompReport" id="HSteelCompReport" autocomplete="off">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍒ゅ畾缁撹</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HCheckerResult" id="HCheckerResult" autocomplete="off">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs7 layui-inline">
+                                            <label class="layui-form-label">澶囨敞</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+
+
+                            <!--鍒跺崟淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浣滃簾浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HDeleteMan " id="HDeleteMan " style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+
+
+                                    </div>
+
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-row">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
+                                                <div class="layui-input-block" style="margin-left: 120px;">
+                                                    <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+
+                        </div>
+                    </script>
+                    <script type="text/html" id="xuhao">
+                        {{d.LAY_TABLE_INDEX+1}}
+                    </script>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script type="text/html" id="barDemo">
+        <!--<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 src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+
+            var params = get_UrlVars();
+            if (typeof (params[params[0]]) == "undefined") {
+                var OperationType = 1;//鎿嶄綔绫诲瀷
+                var closeType = 2;  //鍏抽棴绫诲瀷
+            } else {
+                var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+                var linterid = params[params[1]];//婧愬崟id
+                var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+                var closeType = params[params[3]];  //鍏抽棴绫诲瀷
+            }
+            var hID = params[params[1]];//缂栬緫鏌ョ湅
+            //甯歌鐢ㄦ硶
+            laydate.render({
+                elem: '#HDate'
+
+            });
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            //if (sessionStorage.login != "login") {
+            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            //    }, function () { window.location.href = "../../user/login.html"; });
+            //}
+            var tableReload = table.reload;
+            var option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , height: 500
+                , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                //,url: '/demo/table/user/' //鏁版嵁鎺ュ彛
+                , page: true //寮�鍚垎椤�
+                , cols: [[ //琛ㄥご
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+                    , { field: 'HQCCheckClassID', title: 'HQCCheckClassID', edit: 'text', width: 100, hide: true }
+                    , { field: 'HQCCheckClassNumber', title: '妫�楠岄」鐩被鍒�', edit: 'text', event: "HQCCheckClassCheck", width: 100 }
+                    , { field: 'HQCCheckClassName', title: '妫�楠岄」鐩被鍒悕绉�', edit: 'text', width: 100, hide: true }
+                    , { field: 'HQCCheckItemID', title: 'HQCCheckItemID', edit: 'text', hide: true }
+                    , { field: 'HQCCheckItemNumber', title: '妫�楠岄」鐩�', edit: 'text', event: "HQCCheckItemCheck", width: 100 }
+                    , { field: 'HQCCheckItemName', title: '妫�楠岄」鐩悕绉�', edit: 'text', width: 100, hide: true }
+                    , { field: 'HQCRelValue', title: '妫�楠屾暟鎹�', edit: 'text' }
+                    , { field: 'HResult', title: '鍒ゅ畾', edit: 'text', event: "" }
+                    , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text', event: "" }
+                    , { field: 'HProcCheckEmpID', title: 'HProcCheckEmpID', edit: 'text', width: 100, hide: true }
+                    , { field: 'HProcCheckEmpName', title: '妫�娴嬪憳', edit: 'text', event: 'HProcCheckEmpCheck', width: 150 }
+                    , { field: 'HProcCheckEmpNumber', title: '妫�娴嬪憳浠g爜', edit: 'text', width: 100, hide: true }
+                    , { field: 'HProcCheckTime', title: '妫�娴嬫棩鏈�', event: "", edit: 'text' }
+                    , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 150 }
+                ]]
+            };
+            //鍒ゆ柇鏄惁鏂板
+            if (OperationType == 1) {
+                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                //$("#HCheckDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //$("#HChecker").val(sessionStorage["HUserName"]);
+                //$("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //$("#HUpDater").val(sessionStorage["HUserName"]);
+                //$("#HCloseDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //$("#HDeleteDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //$("#HCloseMan").val(sessionStorage["HUserName"]);
+                //$("#HDeleteMan").val(sessionStorage["HUserName"]);
+                //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
+                option.data = [{
+                    "HQCCheckClassID": " ", "HQCCheckClassNumber": " ", "HQCCheckClassName": " ", "HQCCheckItemID": " ",
+                    "HQCCheckItemNumber": " ", "HQCCheckItemName": " ", "HQCRelValue": "  ", "HResult": "   "
+                    , "HQCStd": 0, "HProcCheckEmpID": " ", "HProcCheckEmpNumber": " ", "HProcCheckEmpName": " ", "HProcCheckTime": "  ", "HRemark": "  "
+                }];
+                table.render(option);
+            }
+            else {
+                $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
+                //缂栬緫鍔犺浇鏁版嵁
+                $.ajax({
+                    url: GetWEBURL() + '/QC_POStockInCheckBill/QC_POStockInCheckBillListProjectDetai',
+                    type: "GET",
+                    data: { "sqlWhere": "and HInterID=" + hID },
+                    success: function (result) {
+                        //console.log(result);
+                        //console.log('gouba' + result);
+                        if (result.count == 1) {
+                            option.data = result.data;
+                            table.render(option);
+
+                        } else {
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(index0);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //澶村伐鍏锋爮浜嬩欢
+            var rowid = 0;
+            var rows = 0;
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;;
+                var AddRow = table.cache['mainTable'];
+                var NewRow = {
+                    "HQCCheckClassID": " ", "HQCCheckClassNumber": " ", "HQCCheckClassName": " ", "HQCCheckItemID": " ",
+                    "HQCCheckItemNumber": " ", "HQCCheckItemName": " ", "HQCRelValue": "  ", "HResult": "   "
+                    , "HQCStd": 0, "HProcCheckEmpID": " ", "HProcCheckEmpNumber": " ", "HProcCheckEmpName": " ", "HProcCheckTime": "  ", "HRemark": "  " };
+                switch (obj.event) {
+                    case 'btn-AddLine':
+                        //table.cache["mainTable"].push(AddRow[rows]);
+                        table.cache["mainTable"].push(NewRow);
+                        option.data = table.cache["mainTable"];
+                        table.render(option);
+
+                        rows++;
+                        //layer.msg('澧炲姞涓�琛屾寜閽紒')
+                        break;
+                    case 'btn-CopyLine':
+                        var copydata = JSON.stringify(data);
+                        if (data.length <= 0) {
+                            layer.alert("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                        }
+                        else if (data.length > 1) {
+                            layer.alert("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                        }
+                        else {
+                            var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                            var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                            table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+
+                        }
+                        break;
+                }
+            });
+            //琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'del') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                        console.log("绱㈠紩涓�:" + rowIndex);
+                        if (rowIndex === '0') {
+                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        } else {
+                            obj.del();
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.reload(option);
+                            layer.close(index);
+                        }
+                    });
+                }
+
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        if (obj.event === 'HQCCheckClassCheck')  //妯″叿淇℃伅
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '妫�楠岄」鐩被鍒�',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_QCCheckClass.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HQCCheckClassID: checkStatus.data[0].HItemID,
+                                        HQCCheckClassNumber: checkStatus.data[0].浠g爜,
+                                        HQCCheckClassName: checkStatus.data[0].鍚嶇О,
+
+                                    });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+
+                        if (obj.event === 'HQCCheckItemCheck')  //妫�楠岄」鐩�
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '妫�楠岄」鐩�',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_QCCheckItemListView.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index];
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    obj.update({
+                                        HQCCheckItemName: checkStatus.data[0].鍚嶇О
+                                        , HQCCheckItemID: checkStatus.data[0].HItemID
+                                        , HQCCheckItemNumber: checkStatus.data[0].浠g爜
+                                    });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        if (obj.event === 'HProcCheckEmpCheck')  //妫�娴嬪憳
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '妫�娴嬪憳鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html ','yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HProcCheckEmpName: checkStatus.data[0].HName
+                                        , HProcCheckEmpID: checkStatus.data[0].HItemID
+                                        , HProcCheckEmpNumber: checkStatus.data[0].HNumber
+                                    });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                       
+                       
+                        obj.event = "";
+                        return false;
+
+                    }
+                })
+            });
+           
+            //鐩戝惉鍗曞厓鏍肩紪杈�
+            table.on('edit(mainTable)', function (obj) {
+                // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+                var oldText = $(this).prev().text();
+                var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+                    , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+                    , field = obj.field; //寰楀埌瀛楁
+                //layer.msg('[ID: ' + data.id + '] ' + field + ' 瀛楁鏇存敼涓猴細' + value);
+
+                switch (field) {
+                    case "HDesignLife":  //璁捐瀵垮懡
+                        value = isNaN(value) ? 0 : value;
+                        var HUseLife = isNaN(data.HUseLife) ? 0 : data.HUseLife;
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HDesignLife: value,                          //璁捐瀵垮懡
+                            HLeaveLife: value - HUseLife,           //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
+                        });
+                        break;
+                    case "HLeaveLife":  //鍓╀綑瀵垮懡
+                        var HDesignLife = isNaN(data.HDesignLife) ? 0 : data.HDesignLife;
+                        var HUseLife = isNaN(data.HUseLife) ? 0 : data.HUseLife;
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.tr.find('td[data-field=HLeaveLife] input').val(HDesignLife - HUseLife);
+                        obj.update({
+                            HLeaveLife: HDesignLife - HUseLife,   //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
+                        });
+                        break;
+                    case "HUseLife":    //浣跨敤瀵垮懡
+                        var HDesignLife = isNaN(data.HDesignLife) ? 0 : data.HDesignLife;
+                        value = isNaN(value) ? 0 : value;
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HLeaveLife: HDesignLife - value, //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
+                        });
+                        break;
+                    case "HQty":        //瀹炲彂鏁伴噺
+                        value = isNaN(value) ? 0 : value;
+                        var HPrice = isNaN(data.HPrice) ? 0 : data.HPrice;
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HMoney: value * HPrice, //閲戦=瀹炴敹鏁伴噺*鍗曚环
+                        });
+                        break;
+                    case "HPrice":      //鍗曚环
+                        value = isNaN(value) ? 0 : value;
+                        var HQty = isNaN(data.HQty) ? 0 : data.HQty;
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HMoney: value * HQty, //閲戦=瀹炴敹鏁伴噺*鍗曚环
+                        });
+                        break;
+                    case "HMoney":     //閲戦
+                        var HPrice = isNaN(data.HPrice) ? 0 : data.HPrice;
+                        var HQty = isNaN(data.HQty) ? 0 : data.HQty;
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HMoney: HPrice * HQty, //閲戦=瀹炴敹鏁伴噺*鍗曚环
+                        });
+                        break;
+                    default:
+                }
+            });
+            function RoadBillMain(hID)//鍔犺浇琛ㄥご
+            {
+                //alert(hID);
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                $.ajax({
+                    url: GetWEBURL() + "/QC_POStockInCheckBill/QC_POStockInCheckBillListCheckDetail",
+                    type: "GET",
+                    data: {
+                        "HID": hID
+                    },
+                    success: function (result) {
+
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data.h_v_QC_Edit_POStockInCheckBillList[0];
+                            console.info(data);
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HBillNo": data.鍗曟嵁鍙�
+                                , "HDate": formatDate(data.鏃ユ湡)
+                                , "HSupID": data.HSupID
+                                , "HSupName": data.渚涘簲鍟嗗悕绉�
+                                , "HMater": data.浜у搧鍚嶇О
+                                , "HMaterID": data.浜у搧ID
+                                , "HMaterNumber": data.浜у搧鍐呯爜
+                                , "HInStockQty": data.鍏ュ簱鏁伴噺
+                                , "HRightQty": data.鍚堟牸鏁伴噺
+                                , "HEmpName": data.妫�楠屽憳鍚嶇О
+                                , "HFirstCheckEmp": data.妫�楠屽憳
+                                , "HCheckQty": data.鎶芥鏁伴噺
+                                , "HBadQty": data.涓嶅悎鏍兼暟閲�
+                                , "HSteelStoveNo": data.閽㈡潗鐐夊彿
+                                , "HAspect": data.澶栬
+                                , "HSize": data.灏哄
+                                , "HSteelCompReport": data.閽㈠巶鎶ュ憡涓婁紶
+                                , "HCheckerResult": data.鍒ゅ畾缁撹
+                                , "HRemark": data.琛ㄥご澶囨敞
+                            });
+
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+
+
+            var date = new Date();
+            var day = date.getDate();
+            var month = date.getMonth() + 1;
+            var year = date.getFullYear();
+            var shijian = year + "-" + month + "-" + day;
+
+            //鍒ゆ柇鏄惁鏂板
+            if (hID == null || hID == 0) {
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("0");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '7503' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(shijian);
+                        $("#HInterID").val(0);
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                RoadBillMain(hID);
+                /* RoadBillSub(linterid);*/
+            }
+
+            //琛ㄥご淇℃伅浠撳簱寮圭獥
+            form.on('submit(HSupList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '渚涘簲鍟嗗垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSupName").val(checkStatus.data[0].HName);
+                        $("#HSupID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+
+            //琛ㄥご淇℃伅浜у搧鍐呯爜
+            form.on('submit(HMaterList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '浜у搧鍐呯爜鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HMaterName").val(checkStatus.data[0].HName);
+                        $("#HMaterID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //妫�楠屽憳寮圭獥
+            form.on('submit(HEmpList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '妫�楠屽憳鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HFirstCheckEmpName").val(checkStatus.data[0].HName);
+                        $("#HFirstCheckEmpID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {
+                if (OperationType == 1) {
+                    Pub_Close(closeType);//鐩存帴鏂板closeType鍊间负2锛屽垪琛ㄨ皟鏂板closeType鍊间粠鍒楄〃浼犻��
+                }
+                else if (OperationType == 3) {
+                    Pub_Close(closeType);
+                }
+                else {
+                    Pub_Close(2);
+                }
+            });
+            function formatDate(date) {
+                var d = new Date(date),
+                    month = '' + (d.getMonth() + 1),
+                    day = '' + d.getDate(),
+                    year = d.getFullYear();
+
+                if (month.length < 2) month = '0' + month;
+                if (day.length < 2) day = '0' + day;
+
+                return [year, month, day].join('-');
+            }
+            form.on('submit(Saver)', function (data) {//淇濆瓨
+                //debugger;
+                data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(table.cache['mainTable']);
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
+                if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
+                {
+                    return false;
+                }
+                $.ajax(
+                    {
+                        type: "POST",
+                        url: GetWEBURL() + "/QC_POStockInCheckBill/AddBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: { "msg": sMainSub },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                    var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                    parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+                                });
+                            }
+                            else {
+
+                                f_alert(data.Message);
+                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                            }
+                            layer.closeAll("loading");
+                        },
+                        error: function (err) {
+
+                            f_alert("閿欒:" + err);
+                            console.log("Reason" + sMainStr);
+                        }
+                    });
+            });
+            function f_alert(sMsg) {
+                layer.alert(sMsg, { icon: 5 });
+
+            }
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+
+
+        });
+        //瀹氫箟鍏ㄥ眬鍙橀噺
+        var HReasonName, ReasonID, EmpName, SQProcName,
+            ProcID, ZRProcName, QRName
+            ;
+        function GetHReasonValue(obj)  //杩斿洖涓嶈壇鍘熷洜
+        {
+            HReasonName = obj[0].HName;
+            ReasonID = obj[0].HItemID;
+        }
+        //杩斿洖鐗╂枡
+        function GetHMaterNameValue(obj) {  //杩斿洖鐗╂枡
+            $("#HMater").val(obj[0].HName);
+            $("#HMaterID").val(obj[0].HItemID);
+            $("#HMaterNumber").val(obj[0].HNumber);
+        }
+        //杩斿洖宸ュ簭
+        function GetHProcValue(obj) {  //杩斿洖宸ュ簭
+            $("#HProcName").val(obj[0].宸ュ簭);
+            $("#HProcID").val(obj[0].HItemID);
+            $("#HProcNumber").val(obj[0].宸ュ簭浠g爜);
+        }
+        function GetHDeptNameValue(obj) {  //杩斿洖閮ㄩ棬
+            $("#HDepName").val(obj[0].HName);
+            $("#HDeptID").val(obj[0].HItemID);
+            $("#HDeptNumber").val(obj[0].HNumber);
+        }
+        //杩斿洖鍗曚綅
+        function GetHUnitNameValue(obj) {
+            $("#HUName").val(obj[0].HName);
+            $("#HUnitID").val(obj[0].HItemID);
+            $("#HUnitNumber").val(obj[0].HNumber);
+        }
+
+        function GetHKeeperValue(obj) {  //杩斿洖璐d换浜�
+            EmpName = obj[0].HName;
+        }
+        function GetHZRValue(obj) {   //杩斿洖璐d换宸ュ簭
+            ZRProcName = obj[0].宸ュ簭;
+        }
+        function GetHWorkerValue(obj) {  //杩斿洖涓嶈壇纭浜�
+            QRName = obj[0].HName;
+        }
+        //闈炵┖楠岃瘉
+        function AllowLoadData(sSubStr) {
+            var HStockStyle = $("#HStockStyle").val();
+            var Result = true;
+            //if ($("#HWHID").val() == '' || $("#HWHID").val() == null) {
+            //    layer.msg("鍣ㄥ叿浠撳簱涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //    return Result = false;
+            //}
+            //if ($("#HSecManagerID").val() == '' || $("#HSecManagerID").val() == null) {
+            //    layer.msg("棰嗘枡浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //    return Result = false;
+            //}
+            //if ($("#HKeeperID").val() == '' || $("#HKeeperID").val() == null) {
+            //    layer.msg("鍙戞枡浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //    return Result = false;
+            //}
+            //if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
+            //    layer.msg("閮ㄩ棬涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //    return Result = false;
+            //}
+            //if (typeof (sSubStr) == "undefined" || sSubStr == "") {
+            //    layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //    return Result = false;
+            //}
+            //if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+            //    sSubStr = JSON.parse(sSubStr);
+            //    for (var i = 0; i < sSubStr.length; i++) {
+            //        if (sSubStr[i].HMaterID == "") {
+            //            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍣ㄥ叿淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //            return Result = false;
+            //        }
+            //        if (sSubStr[i].HWHID == "") {
+            //            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璋冨叆浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //            return Result = false;
+            //        }
+            //        if (sSubStr[i].HSCWHID == "") {
+            //            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璋冨嚭浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //            return Result = false;
+            //        }
+            //        if (HStockStyle == "璺ㄧ粍缁囪皟鎷�" && sSubStr[i].HStockOrgID == sSubStr[i].HOtherOrgID) {
+            //            layer.msg("璋冩嫧绫诲瀷涓鸿法缁勭粐璋冩嫧锛屾槑缁嗚褰曠" + (i + 1) + "琛�,璋冨嚭缁勭粐鍜屽綋鍓嶇粍缁囦竴鑷� !", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //            return Result = false;
+            //        }
+            //        if (HStockStyle == "鍚岀粍缁囪皟鎷�" && sSubStr[i].HStockOrgID != sSubStr[i].HOtherOrgID) {
+            //            layer.msg("璋冩嫧绫诲瀷涓哄悓缁勭粐璋冩嫧锛屾槑缁嗚褰曠" + (i + 1) + "琛�,璋冨嚭缁勭粐鍜屽綋鍓嶇粍缁囦笉涓�鑷� !", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //            return Result = false;
+            //        }
+            //    }
+            //}
+            /*else {*/
+               /* return Result = true;*/
+            //}
+            return Result;
+        }
+
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_POStockInCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_POStockInCheckBillList.html"
index 7db3ce2..b7b3933 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_POStockInCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_POStockInCheckBillList.html"
@@ -167,18 +167,19 @@
                         , { field: '浜у搧鍐呯爜', title: '浜у搧鍐呯爜' }
                         , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
                         , { field: '浜у搧鍨嬪彿', title: '浜у搧鍨嬪彿', width: 115 }
-                        , { field: '妫�楠屽憳浠g爜', title: '妫�楠屽憳浠g爜', width: 115 }
-                        , { field: '妫�楠屽憳鍚嶇О', title: '妫�楠屽憳鍚嶇О', width: 115 }
+                        , { field: 'HProcCheckEmpID', title: 'HProcCheckEmpID', width: 200, hide: true }
+                        , { field: '妫�娴嬪憳浠g爜', title: '妫�娴嬪憳浠g爜', width: 125 }
+                        , { field: 'HFirstCheckEmp', title: '妫�娴嬪憳', width: 125 }
                         , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 160 }
-                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 160 }
-                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 160 }
-                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 160 }
-                        , { field: '淇敼浜�', title: '淇敼浜�', width: 160 }
-                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 160 }
-                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 160 }
-                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 160 }
-                        , { field: '浣滃簾浜�', title: '浣滃簾浜�', hide: true, width: 160 }
-                        , { field: '浣滃簾鏃ユ湡 ', title: '浣滃簾鏃ユ湡', width: 215 }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 125 }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '淇敼浜�', title: '淇敼浜�', width: 125 }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 125 }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 125 }
+                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
                         , { field: '鍗曟嵁绫诲瀷 ', title: '鍗曟嵁绫诲瀷 ', width: 115 }
                     ]]
                 };
@@ -190,9 +191,9 @@
             function get_Display(sWhere) {
                 var ajaxLoad = layer.load();
                 $.ajax({
-                    url: GetWEBURL() + '/QC_Management/MES_QC_POStockInCheckBillList_Json',
+                    url: GetWEBURL() + '/QC_POStockInCheckBill/GetPOStockInCheckBill',
                     type: "GET",
-                    data: { "sqlWhere": sWhere },
+                    data: { "sWhere": sWhere },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
@@ -224,7 +225,7 @@
                     , area: ['100%', '100%']
                     , title: '鏉ユ枡妫�楠屽崟-鏂板'
                     , shift: 0//寮瑰嚭鍔ㄧ敾
-                    , content:'../鏉ユ枡妫�楠屽崟/QC_Add_Edit_POStockInCheckBill.html?OperationType=1&linterid=&HSouceBillType='
+                    , content:'../鏉ユ枡妫�楠屽崟/QC_Add_Edit_POStockInCheckBillList.html?OperationType=1&linterid=&HSouceBillType='
                 })
             }
             //#endregion
@@ -241,7 +242,7 @@
                         , area: ['100%', '100%']
                         , title: '鏉ユ枡妫�楠屽崟-缂栬緫'
                         , shift: 0//寮瑰嚭鍔ㄧ敾
-                        , content:'../鏉ユ枡妫�楠屽崟/QC_Add_Edit_POStockInCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                        , content:'../鏉ユ枡妫�楠屽崟/QC_Add_Edit_POStockInCheckBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                     })
                 } else {
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
@@ -259,7 +260,7 @@
                         var wait = layer.load();
                         //閫昏緫鍒犻櫎鏂规硶
                         $.ajax({
-                            url: GetWEBURL() + 'DeltetQC_POStockInCheck',
+                            url: GetWEBURL() + 'QC_POStockInCheckBill/DeltetPOStockInCheckBill',
                             type: "GET",
                             data: { "HItemID": HItemID },
                             success: function (result) {
@@ -303,7 +304,7 @@
                         , area: ['100%', '100%']
                         , title: '璐ㄩ噺姹囨姤鍗�-娴忚'
                         , shift: 0//寮瑰嚭鍔ㄧ敾
-                        , content: '../鏉ユ枡妫�楠屽崟/QC_Add_Edit_POStockInCheckBill.html?OperationType=4&linterid=' + linterid + '&HSouceBillType='
+                        , content: '../鏉ユ枡妫�楠屽崟/QC_Add_Edit_POStockInCheckBillList.html?OperationType=4&linterid=' + linterid + '&HSouceBillType='
                     })
                 } else {
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹祻瑙堬紒');
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
index b323663..ff4c1d3 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
@@ -30,7 +30,7 @@
                                     </div>
                                 </div>
                                 <div class="layui-inline">
-                                    <label class="layui-form-label">鍙戝竷鐘舵��</label>
+                                    <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>
@@ -730,7 +730,7 @@
                             data: { "Hmainid": hmainid, "HSupplierId": HSupplierId },
                             success: function (data1) {
                                 if (data1.Message.indexOf("鎴愬姛") > 0) {
-                                    layer.msg("鍙戝竷鎴愬姛", { time: 3 * 1000, icon: 1 }, function () {
+                                    layer.msg("鍒嗛厤鎴愬姛", { time: 3 * 1000, icon: 1 }, function () {
                                         var index = layer.getFrameIndex(window.name);
                                         //鍏抽棴褰撳墠frame
                                         layer.close(index);

--
Gitblit v1.9.1