From 7b156987df2fba8f47e38b89de4a23c35c913cf4 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期一, 16 八月 2021 13:31:36 +0800
Subject: [PATCH] 合并

---
 WebTM/views/Baseset/基础资料/Sc_ICMOBillListView.html         |    2 
 WebTM/views/设备管理/Sb_EquipMaintainPlanBillList.html        |  410 +-
 WebTM/views/模治具管理/模治具管理/Sc_MouldDotCheckPlanBillList.html |  392 +-
 WebTM/views/生产管理/生产完工单/Sc_Add_MESEndWorkBillList.html     |  340 +
 WebTM/views/PublicPage/PartInformation.html               |   27 
 WebTM/views/设备管理/Sb_EquipMaintainBillList.html            |  413 +-
 WebTM/Properties/PublishProfiles/JFTM.pubxml.user         |    8 
 WebTM/views/IpadIndex.html                                |   10 
 WebTM/views/生产管理/生产停工单/Sc_MESStopWorkBillList.html        |  547 +-
 WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainBillList.html | 2901 +++-------------
 WebTM/views/ReportHtml.html                               |   22 
 WebTM/views/生产管理/生产开工单/Sc_Add_MESBeginWorkBillList.html   |  419 +-
 WebTM/views/生产管理/生产完工单/Sc_MESEndWorkBillList.html         |  509 +-
 WebTM/views/生产管理/生产停工单/Sc_Add_MESStopWorkBillList.html    |  312 +
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_CheckItem.html        |    2 
 WebTM/views/PublicPage/SupplierInformation.html           |   30 
 WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainPlanBillList.html |  413 +-
 WebTM/views/PublicPage/CustomerInformation.html           |   19 
 WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainBillList.html     |  461 +-
 WebTM/layuiadmin/layui/css/ReportPlatform.css             |    2 
 WebTM/views/index.html                                    |   45 
 WebTM/views/生产管理/产量汇报单/Sc_ProductReportBillList_Web.html  |  437 ++
 WebTM/WebTM.csproj.user                                   |    2 
 WebTM/views/生产管理/生产开工单/Sc_MESBeginWorkBillList.html       |  497 +
 WebTM/views/PublicPage/UserInformation.html               |   22 
 WebTM/views/生产管理/产量汇报单/Sc_Add_ProductReportBillList.html  |  314 +
 WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html        |  228 
 WebTM/views/PublicPage/DeptInformation.html               |   30 
 WebTM/views/PublicPage/WareHouseInformation.html          |   31 
 WebTM/views/PublicPage/UnitInformation.html               |   30 
 WebTM/views/基础资料/公用基础资料/Gy_Employee.html                  |    3 
 WebTM/views/设备管理/Sb_EquipDotCheckPlanBillList.html        |  410 +-
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_MouldType.html        |  251 +
 WebTM/views/模治具管理/模治具管理/Sc_MouldDotCheckBillList.html     |  403 +-
 WebTM/views/生产管理/产量汇报单/Sc_ProductReportBillList.html      |  185 
 WebTM/layuiadmin/Scripts/webConfig.js                     |    2 
 WebTM/views/基础资料/公用基础资料/Gy_MouldType.html                 |  431 ++
 WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html               |   36 
 WebTM/WebTM.csproj                                        |    3 
 39 files changed, 5,458 insertions(+), 5,141 deletions(-)

diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 6a4d5c7..964ef58 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -639,7 +639,7 @@
       <publishTime>05/10/2021 09:25:59</publishTime>
     </File>
     <File Include="layuiadmin/Scripts/webConfig.js">
-      <publishTime>08/06/2021 13:48:38</publishTime>
+      <publishTime>08/05/2021 15:19:15</publishTime>
     </File>
     <File Include="layuiadmin/style/admin.css">
       <publishTime>05/10/2021 09:25:59</publishTime>
@@ -846,7 +846,7 @@
       <publishTime>05/10/2021 09:25:59</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/WMSBarCodeDetailsList.html">
-      <publishTime>08/06/2021 13:45:20</publishTime>
+      <publishTime>08/05/2021 17:05:23</publishTime>
     </File>
     <File Include="views/component/anim/index.html">
       <publishTime>05/10/2021 09:25:59</publishTime>
@@ -1299,7 +1299,7 @@
       <publishTime>05/10/2021 09:25:59</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html">
-      <publishTime>08/06/2021 13:45:20</publishTime>
+      <publishTime>08/05/2021 17:07:15</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBill_FastList.html">
       <publishTime>05/10/2021 09:25:59</publishTime>
@@ -1494,7 +1494,7 @@
       <publishTime>05/10/2021 09:25:59</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html">
-      <publishTime>07/30/2021 07:48:36</publishTime>
+      <publishTime>08/06/2021 21:23:02</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/H_ProcessDetail.html">
       <publishTime>05/10/2021 09:25:59</publishTime>
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index abe926a..a3b35c9 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -106,6 +106,7 @@
     <Content Include="views\grf\b1.grf" />
     <Content Include="views\grf\b.grf" />
     <Content Include="views\ReportHtml.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_MouldType.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\b.grf" />
     <None Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
@@ -504,6 +505,7 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Employee.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Unit.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_CheckItem.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MouldType.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_QCCheckClass.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Warehouse_Edit.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_EquipMent_Edit.html" />
@@ -592,6 +594,7 @@
     <Content Include="views\鐢熶骇宸ュ簭绠$悊\宸ュ簭姹囨姤鍗昞xmlLBM_ProcessReport.aspx" />
     <Content Include="views\鐢熶骇绠$悊\浜ч噺姹囨姤鍗昞Sc_Add_ProductReportBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\浜ч噺姹囨姤鍗昞Sc_ProductReportBillList.html" />
+    <Content Include="views\鐢熶骇绠$悊\浜ч噺姹囨姤鍗昞Sc_ProductReportBillList_Web.html" />
     <Content Include="views\鐢熶骇绠$悊\鎶ュ伐骞冲彴鍔熻兘椤礬LineBind.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇涓婃枡鍗昞Sc_MaterToSourceBillList - 澶嶅埗.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇涓婃枡鍗昞Sc_MaterToSourceBillList.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index c147982..0f41c16 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <NameOfLastUsedPublishProfile>JFTM</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>D:\椤圭洰\LayUI\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
     <ProjectView>ShowAllFiles</ProjectView>
     <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 5316143..5a0ed17 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -4,7 +4,7 @@
     //var WEBURL = "http://localhost:8085/API/";   //zgq鏈湴
     //var WEBURL = "http://localhost:8080/API/";   //棰滄檽鍐涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/lubao";   //棰滄檽鍐涙湰鍦伴厤缃�
-    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄩ湶鏈湴閰嶇疆
+    var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄩ湶鏈湴閰嶇疆
     //var WEBURL = "http://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/layuiadmin/layui/css/ReportPlatform.css b/WebTM/layuiadmin/layui/css/ReportPlatform.css
index e439a44..3bfb0bf 100644
--- a/WebTM/layuiadmin/layui/css/ReportPlatform.css
+++ b/WebTM/layuiadmin/layui/css/ReportPlatform.css
@@ -142,7 +142,7 @@
 .imgtitle {
     text-align: center;
     display: block;
-    font-size: 30px;
+    font-size: 20px;
 }
 
 .layui-icon {
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView.html"
index 440043a..29e768b 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView.html"
@@ -48,7 +48,7 @@
                 //var sMainStr = JSON.stringify(table.cache['ck-table']);
                 var checkStatus = table.checkStatus('ck-table')
                  , data = checkStatus.data;
-                parent.GetICMOBillValue(data);
+                parent.GetICMOBillValue(data[0].hmainid);
                 var index = parent.layer.getFrameIndex(window.name);
                 parent.layer.close(index);
             });
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 75272cf..da8a597 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -554,7 +554,7 @@
                 shift: 2,
                 area: ['100%', '100%'],
                 maxmin: true,
-                content: '鐢熶骇绠$悊/鐢熶骇寮�宸ュ崟/Sc_Add_MESBeginWorkBillList.html?hID=&Type=2',
+                content: '鐢熶骇绠$悊/鐢熶骇寮�宸ュ崟/Sc_Add_MESBeginWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
                 end: function () {
                    
                 },
@@ -594,7 +594,7 @@
                 shift: 2,
                 area: ['100%', '100%'],
                 maxmin: true,
-                content: '鐢熶骇绠$悊/浜ч噺姹囨姤鍗�/Sc_Add_ProductReportBillList.html?hID=&Type=2',
+                content: '鐢熶骇绠$悊/浜ч噺姹囨姤鍗�/Sc_Add_ProductReportBillList.html?OperationType=2&linterid=&HSouceBillType=',
                 end: function () {
 
                 },
@@ -634,7 +634,7 @@
                 shift: 2,
                 area: ['100%', '100%'],
                 maxmin: true,
-                content: '鐢熶骇绠$悊/鐢熶骇瀹屽伐鍗�/Sc_Add_MESEndWorkBillList.html?hID=&Type=2',
+                content: '鐢熶骇绠$悊/鐢熶骇瀹屽伐鍗�/Sc_Add_MESEndWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
                 end: function () {
 
                 },
@@ -674,7 +674,7 @@
                 shift: 2,
                 area: ['100%', '100%'],
                 maxmin: true,
-                content: '鐢熶骇绠$悊/鐢熶骇鍋滃伐鍗�/Sc_Add_MESStopWorkBillList.html?hID=&Type=2',
+                content: '鐢熶骇绠$悊/鐢熶骇鍋滃伐鍗�/Sc_Add_MESStopWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
                 end: function () {
 
                 },
@@ -710,7 +710,7 @@
                 shift: 2,
                 area: ['100%', '100%'],
                 maxmin: true,
-                content: '鐢熶骇绠$悊/浜ч噺姹囨姤鍗�/Sc_ProductReportBillList.html?hID=&Type=2',
+                content: '鐢熶骇绠$悊/浜ч噺姹囨姤鍗�/Sc_ProductReportBillList.html?OperationType=2&linterid=&HSouceBillType=',
                 end: function () {
 
                 },
diff --git a/WebTM/views/PublicPage/CustomerInformation.html b/WebTM/views/PublicPage/CustomerInformation.html
index 7fa9da4..5aa9ae7 100644
--- a/WebTM/views/PublicPage/CustomerInformation.html
+++ b/WebTM/views/PublicPage/CustomerInformation.html
@@ -87,7 +87,8 @@
                 , laydate = layui.laydate
                 , util = layui.util
                 , tree = layui.tree
-            var sWhere = " where HStopFlag=0  and HUSEORGID = " + sessionStorage["OrganizationID"]+" ";
+            var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鏍戝瀷
+            var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " ";  //鍒楄〃
 
             tree.render({
                 elem: '#treeCustomer',
@@ -157,7 +158,7 @@
             $.ajax({
                 url: GetWEBURL() + '/PublicPageMethod/CustomerList',
                 type: "GET",
-                data: { "sWhere": SeachFilter(sWhere) },
+                data: { "sWhere": SeachFilter(sWhere1) },
                 success: function (data1) {
                     if (data1.count == 1) {
                         option.data = data1.data;
@@ -179,7 +180,7 @@
                 $.ajax({
                     url: GetWEBURL() + '/PublicPageMethod/CustomerList',
                     type: "GET",
-                    data: { "sWhere": SeachFilter(sWhere) },
+                    data: { "sWhere": SeachFilter(sWhere1) },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
@@ -192,7 +193,7 @@
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+                sWhere1 = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             });
 
             //浠ヤ笂鏄痩ayui妯″潡
@@ -205,7 +206,7 @@
             $.ajax({
                 url: GetWEBURL() + '/Gy_MaintenanceMode/CustomerLoadTree',
                 type: "GET",
-                data: { "sWhere": SeachFilter(sWhere) },
+                data: { "sWhere": sWhere },
                 async: false,
                 success: function (result) {
                     var data = result.data;
@@ -236,16 +237,16 @@
             return treeData;
         }
 
-        function SeachFilter(sWhere) {
+        function SeachFilter(sWhere1) {
             var HNumber = $("#HNumber").val();
             var HName = $("#HName").val();
             if (HNumber) {
-                sWhere += " and HNumber like '%" + HNumber + "%'";
+                sWhere1 += " and HNumber like '%" + HNumber + "%'";
             }
             if (HName) {
-                sWhere += " and HName like '%" + HName + "%'";
+                sWhere1 += " and HName like '%" + HName + "%'";
             }
-            return sWhere;
+            return sWhere1;
         }
 
     </script>
diff --git a/WebTM/views/PublicPage/DeptInformation.html b/WebTM/views/PublicPage/DeptInformation.html
index 7e1ed80..9b49b3b 100644
--- a/WebTM/views/PublicPage/DeptInformation.html
+++ b/WebTM/views/PublicPage/DeptInformation.html
@@ -87,7 +87,8 @@
                 , laydate = layui.laydate
                 , util = layui.util
                 , tree = layui.tree
-            var sWhere = "";
+            var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鏍戝瀷
+            var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " ";  //鍒楄〃
 
             tree.render({
                 elem: '#treeDepartment',
@@ -156,7 +157,7 @@
             $.ajax({
                 url: GetWEBURL() + '/PublicPageMethod/DeptList',
                 type: "GET",
-                data: { "sWhere": sWhere },
+                data: { "sWhere": SeachFilter(sWhere1) },
                 success: function (data1) {
                     if (data1.count == 1) {
                         option.data = data1.data;
@@ -175,18 +176,11 @@
 
             //鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
-                var HNumber = $("#HNumber").val();
-                var HName = $("#HName").val();
-                if (HNumber) {
-                    sWhere += " and HNumber like '%" + HNumber + "%'";
-                }
-                if (HName) {
-                    sWhere += " and HName like '%" + HName + "%'";
-                }
+               
                 $.ajax({
                     url: GetWEBURL() + '/PublicPageMethod/DeptList',
                     type: "GET",
-                    data: { "sWhere": sWhere },
+                    data: { "sWhere": SeachFilter(sWhere1) },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
@@ -199,7 +193,7 @@
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+                sWhere1 = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             });
 
             //浠ヤ笂鏄痩ayui妯″潡
@@ -243,7 +237,17 @@
             return treeData;
         }
 
-
+        function SeachFilter(sWhere1) {
+            var HNumber = $("#HNumber").val();
+            var HName = $("#HName").val();
+            if (HNumber) {
+                sWhere1 += " and HNumber like '%" + HNumber + "%'";
+            }
+            if (HName) {
+                sWhere1 += " and HName like '%" + HName + "%'";
+            }
+            return sWhere1;
+        }
     </script>
 
 </body>
diff --git a/WebTM/views/PublicPage/PartInformation.html b/WebTM/views/PublicPage/PartInformation.html
index b3ddf5e..84e36d3 100644
--- a/WebTM/views/PublicPage/PartInformation.html
+++ b/WebTM/views/PublicPage/PartInformation.html
@@ -87,7 +87,8 @@
                 , laydate = layui.laydate
                 , util = layui.util
                 , tree = layui.tree
-            var sWhere = "";
+            var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鏍戝瀷
+            var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " ";  //鍒楄〃
 
             tree.render({
                 elem: '#treePart',
@@ -157,7 +158,7 @@
             $.ajax({
                 url: GetWEBURL() + '/PublicPageMethod/PartList',
                 type: "GET",
-                data: { "sWhere": sWhere },
+                data: { "sWhere": SeachFilter(sWhere1) },
                 success: function (data1) {
                     if (data1.count == 1) {
                         option.data = data1.data;
@@ -176,18 +177,11 @@
 
             //鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
-                var HNumber = $("#HNumber").val();
-                var HName = $("#HName").val();
-                if (HNumber) {
-                    sWhere += " and HNumber like '%" + HNumber + "%'";
-                }
-                if (HName) {
-                    sWhere += " and HName like '%" + HName + "%'";
-                }
+               
                 $.ajax({
                     url: GetWEBURL() + '/PublicPageMethod/PartList',
                     type: "GET",
-                    data: { "sWhere": sWhere },
+                    data: { "sWhere": SeachFilter(sWhere1) },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
@@ -244,6 +238,17 @@
             return treeData;
         }
 
+        function SeachFilter(sWhere1) {
+            var HNumber = $("#HNumber").val();
+            var HName = $("#HName").val();
+            if (HNumber) {
+                sWhere += " and HNumber like '%" + HNumber + "%'";
+            }
+            if (HName) {
+                sWhere += " and HName like '%" + HName + "%'";
+            }
+            return sWhere1;
+        }
 
     </script>
 
diff --git a/WebTM/views/PublicPage/SupplierInformation.html b/WebTM/views/PublicPage/SupplierInformation.html
index 3591084..e4f77e7 100644
--- a/WebTM/views/PublicPage/SupplierInformation.html
+++ b/WebTM/views/PublicPage/SupplierInformation.html
@@ -87,7 +87,8 @@
                 , laydate = layui.laydate
                 , util = layui.util
                 , tree = layui.tree
-            var sWhere = "";
+            var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鏍戝瀷
+            var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " ";  //鍒楄〃
 
             tree.render({
                 elem: '#treeSupplier',
@@ -156,7 +157,7 @@
             $.ajax({
                 url: GetWEBURL() + '/PublicPageMethod/SupplierList',
                 type: "GET",
-                data: { "sWhere": sWhere },
+                data: { "sWhere": SeachFilter(sWhere1) },
                 success: function (data1) {
                     if (data1.count == 1) {
                         option.data = data1.data;
@@ -175,18 +176,11 @@
 
             //鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
-                var HNumber = $("#HNumber").val();
-                var HName = $("#HName").val();
-                if (HNumber) {
-                    sWhere += " and HNumber like '%" + HNumber + "%'";
-                }
-                if (HName) {
-                    sWhere += " and HName like '%" + HName + "%'";
-                }
+              
                 $.ajax({
                     url: GetWEBURL() + '/PublicPageMethod/SupplierList',
                     type: "GET",
-                    data: { "sWhere": sWhere },
+                    data: { "sWhere": SeachFilter(sWhere1) },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
@@ -199,7 +193,7 @@
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+                sWhere1 = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             });
 
             //浠ヤ笂鏄痩ayui妯″潡
@@ -243,7 +237,17 @@
             return treeData;
         }
 
-
+        function SeachFilter(sWhere1) {
+            var HNumber = $("#HNumber").val();
+            var HName = $("#HName").val();
+            if (HNumber) {
+                sWhere1 += " and HNumber like '%" + HNumber + "%'";
+            }
+            if (HName) {
+                sWhere1 += " and HName like '%" + HName + "%'";
+            }
+            return sWhere1;
+        }
     </script>
 
 </body>
diff --git a/WebTM/views/PublicPage/UnitInformation.html b/WebTM/views/PublicPage/UnitInformation.html
index e45ee86..204f90c 100644
--- a/WebTM/views/PublicPage/UnitInformation.html
+++ b/WebTM/views/PublicPage/UnitInformation.html
@@ -87,7 +87,8 @@
                 , laydate = layui.laydate
                 , util = layui.util
                 , tree = layui.tree
-            var sWhere = "";
+            var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鏍戝瀷
+            var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " ";  //鍒楄〃
 
             tree.render({
                 elem: '#treeUnit',
@@ -156,7 +157,7 @@
             $.ajax({
                 url: GetWEBURL() + '/PublicPageMethod/UnitList',
                 type: "GET",
-                data: { "sWhere": sWhere },
+                data: { "sWhere": SeachFilter(sWhere1) },
                 success: function (data1) {
                     if (data1.count == 1) {
                         option.data = data1.data;
@@ -175,18 +176,11 @@
 
             //鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
-                var HNumber = $("#HNumber").val();
-                var HName = $("#HName").val();
-                if (HNumber) {
-                    sWhere += " and HNumber like '%" + HNumber + "%'";
-                }
-                if (HName) {
-                    sWhere += " and HName like '%" + HName + "%'";
-                }
+                
                 $.ajax({
                     url: GetWEBURL() + '/PublicPageMethod/UnitList',
                     type: "GET",
-                    data: { "sWhere": sWhere },
+                    data: { "sWhere": SeachFilter(sWhere1) },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
@@ -199,7 +193,7 @@
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+                sWhere1 = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             });
 
             //浠ヤ笂鏄痩ayui妯″潡
@@ -243,7 +237,17 @@
             return treeData;
         }
 
-
+        function SeachFilter(sWhere1) {
+            var HNumber = $("#HNumber").val();
+            var HName = $("#HName").val();
+            if (HNumber) {
+                sWhere1 += " and HNumber like '%" + HNumber + "%'";
+            }
+            if (HName) {
+                sWhere1 += " and HName like '%" + HName + "%'";
+            }
+            return sWhere1;
+        }
     </script>
 
 </body>
diff --git a/WebTM/views/PublicPage/UserInformation.html b/WebTM/views/PublicPage/UserInformation.html
index 3d7704b..5d472fb 100644
--- a/WebTM/views/PublicPage/UserInformation.html
+++ b/WebTM/views/PublicPage/UserInformation.html
@@ -33,7 +33,7 @@
                                         <div class="layui-col-xs3 layui-inline" style="width: 23%;">
                                             <div id="treeUser" lay-filter="treeUser" class="demo-tree demo-tree-box" style="height: 580px; overflow: scroll;"></div>
                                         </div>
-                                        <div class="layui-col-xs9 layui-inline">
+                                        <div class="layui-col-xs9 layui-inline" style="width: 74%;">
                                             <div class="layui-row">
                                                 <div class="layui-inline">
                                                     <label class="layui-form-label">浠g爜</label>
@@ -87,7 +87,8 @@
                 , laydate = layui.laydate
                 , util = layui.util
                 , tree = layui.tree
-            var sWhere = " where HStopFlag=0  and HUSEORGID = " + sessionStorage["OrganizationID"] + " ";
+            var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鏍戝瀷
+            var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " ";  //鍒楄〃
 
             tree.render({
                 elem: '#treeUser',
@@ -156,7 +157,7 @@
             $.ajax({
                 url: GetWEBURL() + '/PublicPageMethod/UserList',
                 type: "GET",
-                data: { "sWhere": SeachFilter(sWhere) },
+                data: { "sWhere": SeachFilter(sWhere1) },
                 success: function (data1) {
                     if (data1.count == 1) {
                         option.data = data1.data;
@@ -179,7 +180,7 @@
                 $.ajax({
                     url: GetWEBURL() + '/PublicPageMethod/UserList',
                     type: "GET",
-                    data: { "sWhere": SeachFilter(sWhere) },
+                    data: { "sWhere": SeachFilter(sWhere1) },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
@@ -192,7 +193,7 @@
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+                sWhere1 = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             });
 
             //浠ヤ笂鏄痩ayui妯″潡
@@ -205,7 +206,7 @@
             $.ajax({
                 url: GetWEBURL() + '/Gy_MaintenanceMode/UserLoadTree',
                 type: "GET",
-                data: { "sWhere": SeachFilter(sWhere) },
+                data: { "sWhere": sWhere },
                 async: false,
                 success: function (result) {
                     var data = result.data;
@@ -236,17 +237,18 @@
             return treeData;
         }
 
-        function SeachFilter(sWhere)
+        function SeachFilter(sWhere1)
         {
             var HNumber = $("#HNumber").val();
             var HName = $("#HName").val();
+            sWhere1 = " where 1=1 ";
             if (HNumber) {
-                sWhere += " and HNumber like '%" + HNumber + "%'";
+                sWhere1 += " and HNumber like '%" + HNumber + "%'";
             }
             if (HName) {
-                sWhere += " and HName like '%" + HName + "%'";
+                sWhere1 += " and HName like '%" + HName + "%'";
             }
-            return sWhere;
+            return sWhere1;
         }
 
     </script>
diff --git a/WebTM/views/PublicPage/WareHouseInformation.html b/WebTM/views/PublicPage/WareHouseInformation.html
index b495457..23c194a 100644
--- a/WebTM/views/PublicPage/WareHouseInformation.html
+++ b/WebTM/views/PublicPage/WareHouseInformation.html
@@ -87,7 +87,9 @@
                 , laydate = layui.laydate
                 , util = layui.util
                 , tree = layui.tree
-            var sWhere = "";
+
+            var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鏍戝瀷
+            var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " ";  //鍒楄〃
 
             tree.render({
                 elem: '#treeWareHouse',
@@ -156,7 +158,7 @@
             $.ajax({
                 url: GetWEBURL() + '/PublicPageMethod/WareHouseList',
                 type: "GET",
-                data: { "sWhere": sWhere },
+                data: { "sWhere": SeachFilter(sWhere1) },
                 success: function (data1) {
                     if (data1.count == 1) {
                         option.data = data1.data;
@@ -175,18 +177,11 @@
 
             //鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
-                var HNumber = $("#HNumber").val();
-                var HName = $("#HName").val();
-                if (HNumber) {
-                    sWhere += " and HNumber like '%" + HNumber + "%'";
-                }
-                if (HName) {
-                    sWhere += " and HName like '%" + HName + "%'";
-                }
+               
                 $.ajax({
                     url: GetWEBURL() + '/PublicPageMethod/WareHouseList',
                     type: "GET",
-                    data: { "sWhere": sWhere },
+                    data: { "sWhere": SeachFilter(sWhere1) },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
@@ -199,7 +194,7 @@
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+                sWhere1 = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             });
 
             //浠ヤ笂鏄痩ayui妯″潡
@@ -243,7 +238,17 @@
             return treeData;
         }
 
-
+        function SeachFilter(sWhere1) {
+            var HNumber = $("#HNumber").val();
+            var HName = $("#HName").val();
+            if (HNumber) {
+                sWhere1 += " and HNumber like '%" + HNumber + "%'";
+            }
+            if (HName) {
+                sWhere1 += " and HName like '%" + HName + "%'";
+            }
+            return sWhere1;
+        }
     </script>
 
 </body>
diff --git a/WebTM/views/ReportHtml.html b/WebTM/views/ReportHtml.html
index 08c741c..f845922 100644
--- a/WebTM/views/ReportHtml.html
+++ b/WebTM/views/ReportHtml.html
@@ -198,9 +198,10 @@
                     async: false,
                     dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json  script  jsonp
                     success: function (data1) {
+                        console.log(data1);
                         for (var key in data1.list)
                         {
-                            resultTableHead.push({ "id": data1.list[key], "name": data1.list[key] });
+                            resultTableHead.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                         }
                         set_InitGrid(sWhere);
                     }, error: function (err) {
@@ -217,26 +218,39 @@
                 //濉厖琛ㄦ牸澶存暟缁�
                 var data = resultTableHead;
                 cols_arr[0] = [];
-                cols_arr[0][0] = { checkbox: true, fixed: true };
+                cols_arr[0][0] = { checkbox: true, fixed: true, totalRowText: '鍚堣' };
                 for (var i = 0; i < data.length; i++) {
                     if (data[i].name == 'HItemID') {
                         cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', hide: true }; //闅愯棌id鍒�
                     }
                     else
                     {
-                        cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center'};
+                        switch (data[i].Type)
+                        {
+                            //int
+                            case 'Int32':
+                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true ,sort: true};
+                                break;
+                            //Decimal
+                            case 'Decimal': 
+                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true};
+                                break;
+                            default:
+                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center' ,sort: true};
+                        }
                     }
                 }
                 //濉厖琛ㄦ牸鏁版嵁
                 table.render({
                     elem: '#layTable',
                     url: GetWEBURL() + '/Sc_MESReportFrom/ReportFromBillList',
-                    toolbar: '#toolbarDemo', //寮�鍚ご閮ㄥ伐鍏锋爮锛屽苟涓哄叾缁戝畾宸︿晶妯℃澘
+                    //toolbar: '#toolbarDemo', //寮�鍚ご閮ㄥ伐鍏锋爮锛屽苟涓哄叾缁戝畾宸︿晶妯℃澘
                     title: '鐢ㄦ埛鏁版嵁琛�',
                     cols: cols_arr,    //濉厖琛ㄦ牸澶存暟鎹�,
                     id: 'layTable', //琛ㄦ牸id
                     where: { sWhere: sWhere}, //鎵╁睍鍙傛暟,鍙互浼犳暟鎹埌鍚庡彴
                     page: true,   //寮�鍚垎椤�
+                    totalRow: true, //寮�鍚悎璁�
                     limit: 10,     //涓�椤佃兘澶熸樉绀虹殑鏈�澶ф暟鐩�
                     limits: [10, 20, 40, 60,80,100], //鎺у埗澶氬皯琛屼竴椤碉紙榛樿浜旀潯涓�椤碉級
                     method: 'get',  //鎻愪氦鏂瑰紡
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 99e2737..4f4faca 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -302,7 +302,7 @@
                                         <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_Add_ICMOReportBillList.html">鐢熶骇姹囨姤鍗�</a></dd>
                                         <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBillList.html">鐢熶骇姹囨姤鍗曠淮鎶�</a></dd>
                                         <dd><a lay-href="">浜ч噺姹囨姤鍗昻ull</a></dd>
-                                        <dd><a lay-href="">浜ч噺姹囨姤鍗曠淮鎶ull</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/浜ч噺姹囨姤鍗�/Sc_ProductReportBillList_Web.html">浜ч噺姹囨姤鍗曠淮鎶�</a></dd>
                                         <dd><a lay-href="">璐ㄩ噺姹囨姤鍗昻ull</a></dd>
                                         <dd><a lay-href="">璐ㄩ噺姹囨姤鍗曠淮鎶ull</a></dd>
                                     </dl>
@@ -310,12 +310,11 @@
                                 <dd>
                                     <a>寮�缁撶彮绠$悊</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇寮�宸ュ崟/Sc_Add_MESBeginWorkBillList">寮�鐝崟</a></dd>
-
+                                        <dd><a lay-href="">寮�鐝崟null</a></dd>
                                         <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇寮�宸ュ崟/Sc_MESBeginWorkBillList.html">寮�鐝崟缁存姢</a></dd>
-                                        <dd><a lay-href="鐢熶骇绠$悊/鍋滃伐鎸傝捣鍗�/Sc_Add_MESStopWorkBillList.html">鍋滃伐鎸傝捣鍗�</a></dd>
-                                        <dd><a lay-href="鐢熶骇绠$悊/鍋滃伐鎸傝捣鍗�/Sc_MESStopUpWorkBillList.html">鍋滃伐鎸傝捣鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇瀹屽伐鍗�/Sc_Add_MESEndWorkBillList.html">缁撶彮鍗�</a></dd>
+                                        <dd><a lay-href="">鍋滃伐鎸傝捣鍗昻ull</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鍋滃伐鍗�/Sc_MESStopWorkBillList.html">鍋滃伐鎸傝捣鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="">缁撶彮鍗昻ull</a></dd>
                                         <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇瀹屽伐鍗�/Sc_MESEndWorkBillList.html">缁撶彮鍗曠淮鎶�</a></dd>
                                     </dl>
                                 </dd>
@@ -454,7 +453,7 @@
                                 <dd>
                                     <a>鍩虹寤烘ā</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="">妯℃不鍏峰垎绫诲垪琛╪</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType.html">妯℃不鍏峰垎绫诲垪琛�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_Mould_Edit.html">妯℃不鍏锋。妗�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_Mould.html">妯℃不鍏锋。妗堢淮鎶�</a></dd>
                                     </dl>
@@ -488,14 +487,14 @@
                                 <dd>
                                     <a>鏃ュ父绠$悊</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainPlanBillList.html">淇濆吇璁″垝鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainPlanBillList.html">淇濆吇璁″垝鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainBillList.html">淇濆吇璁板綍鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainBillList.html">淇濆吇璁板綍鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckPlanBillList.html">鐐规璁″垝鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldDotCheckPlanBillList.html">鐐规璁″垝鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckBillList.html">鐐规璁板綍鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldDotCheckBillList.html">鐐规璁板綍鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainPlanBillList.html">淇濆吇璁″垝鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainPlanBillList.html">淇濆吇璁″垝鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainBillList.html">淇濆吇璁板綍鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainBillList.html">淇濆吇璁板綍鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldDotCheckPlanBillList.html">鐐规璁″垝鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckPlanBillList.html">鐐规璁″垝鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldDotCheckBillList.html">鐐规璁板綍鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckBillList.html">鐐规璁板綍鍗曠淮鎶�</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
@@ -535,14 +534,14 @@
                                 <dd>
                                     <a>鏃ュ父绠$悊</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipMaintainPlanBillEdit.html">淇濆吇璁″垝鍗�</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipMaintainPlanBillList.html">淇濆吇璁″垝鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipMaintainBillEdit.html">淇濆吇璁板綍鍗�</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipMaintainBillList.html">淇濆吇璁板綍鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckPlanBillEdit.html">鐐规璁″垝鍗�</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckPlanBillList.html">鐐规璁″垝鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckBillEdit.html">鐐规璁板綍鍗�</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckBillList.html">鐐规璁板綍鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipMaintainPlanBillList.html">淇濆吇璁″垝鍗�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipMaintainPlanBillEdit.html">淇濆吇璁″垝鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipMaintainBillList.html">淇濆吇璁板綍鍗�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipMaintainBillEdit.html">淇濆吇璁板綍鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckPlanBillList.html">鐐规璁″垝鍗�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckPlanBillEdit.html">鐐规璁″垝鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckBillList.html">鐐规璁板綍鍗�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckBillEdit.html">鐐规璁板綍鍗曠淮鎶�</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
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_CheckItem.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_CheckItem.html"
index 30cd780..f074b98 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_CheckItem.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_CheckItem.html"
@@ -158,7 +158,7 @@
                 data.field.HItemID = hID == "" ? 0 : hID;
 
                 data.field.HParentID = TagParentId == "" ? 0 : TagParentId;
-                data.field.HLevel = HType == "" ? 1 : HType;
+                //data.field.HLevel = HType == "" ? 1 : HType;
 
                 var oMain = JSON.stringify(data.field)
 
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_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/Add_Edit_Gy_MouldType.html"
new file mode 100644
index 0000000..65dbe09
--- /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_MouldType.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">
+    <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">浠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" />
+                                                    <input id="HParentID" name="HParentID" type="hidden" />
+                                                    <input id="HLevel" name="HLevel" 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 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>
+        //鑾峰彇鍙傛暟
+        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"; });
+            //}
+
+
+
+            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_MouldType_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;
+                data.field.HLevel = $("#HLevel").val() == "" ? 1 : $("#HLevel").val();
+
+                var oMain = JSON.stringify(data.field)
+
+                var sMainSub = oMain + ';' + hID + ';' + user + ';' + ModRightNameAdd;
+                if (HType == "Modify") {
+
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "/Gy_ModelType/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_ModelType/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);
+                            }
+                        });
+                }
+            });
+            function f_alert(sMsg) {
+                layer.alert(sMsg, { icon: 5 });
+
+            }
+
+            if (HType == "Modify") {
+                $.ajax({
+                    url: GetWEBURL() + "/Gy_ModelType/xg",
+                    type: "GET",
+                    data: {
+                        "HInterID": hID
+                    },
+                    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
+                        //});
+                    }
+
+                });
+            }
+        });
+    </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_Employee.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_Employee.html"
index f3167c1..5b3d4d1 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_Employee.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_Employee.html"
@@ -124,9 +124,6 @@
             form.on('submit(btnReSearch)', function (data) {
                 set_ClearQuery();
             });
-
-
-
             //閲嶇疆杩囨护鏉′欢
             function set_ClearQuery() {
                 $("#HNumber").val("");
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"
new file mode 100644
index 0000000..4464985
--- /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_MouldType.html"
@@ -0,0 +1,431 @@
+锘�<!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/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>
+    <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 style="padding: 10px;">
+                                    <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnAdd"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+                                    <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnModify"><i class="layui-icon layui-icon-edit"></i>淇敼</button>
+                                    <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                </div>
+
+                                <div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">
+                                    <div class="layui-row" style="padding:10px 0">
+                                        <div class="layui-col-xs3 layui-inline" style="width: 23%;">
+                                            <div id="treeCheckItem" lay-filter="treeCheckItem" class="demo-tree demo-tree-box" style="height: 520px; overflow: scroll;"></div>
+                                        </div>
+                                        <div class="layui-col-xs9 layui-inline">
+                                            <div class="layui-row">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">浠g爜</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">鍚嶇О</label>
+                                                    <div class="layui-input-block">
+                                                        <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>
+                                            </div>
+                                            <div>
+                                                <table class="" id="mainTable" lay-filter="mainTable"></table>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+
+    <script>
+        var treeCkData = { id: 0 };
+        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 () {
+            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 = "";
+            let that = this;
+            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 });
+                        }
+                    });
+                }
+            });
+
+
+            var option = {
+                elem: '#mainTable'
+                //, toolbar: '#toolbarDemo'
+                , height: '500'
+                , page: true
+                , cellMinWidth: 90
+                , cols: [[
+                    { type: 'radio', fixed: 'left' }
+                    , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+                    , { field: 'HParentID', title: 'HParentID', 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}
+                ]]
+            };
+
+            var index = layer.load(0, { shade: false });
+            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            $.ajax({
+                url: GetWEBURL() + '/Gy_ModelType/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 });
+                }
+            });
+
+
+
+            //鏂板
+            form.on('submit(btnAdd)', function (obj) {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板妫�楠岄」鐩�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_MouldType.html?hID=' + TagId + '&Level=' + Level+''],
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+                return false;//杩欓噷鍔犱釜return false;灏变笉浼氫袱娆℃彁浜�
+            })
+
+            //鍒犻櫎
+            form.on('submit(btndelete)', function (obj) {
+                var ModRightNameDelete = 'Gy_QCCheckItem_Delete'
+                if (TagId != "") {
+                    layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
+                        btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+                        , yes: function (index, layero) {
+
+                            $.ajax({
+                                url: GetWEBURL() + '/Gy_ModelType/Delete_Json',
+                                type: "GET",
+                                //async: true,
+                                data: { "HItemID": TagId, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
+                                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 {
+                    var checkStatus = table.checkStatus('mainTable')
+                        , data = checkStatus.data;
+                    var layEvent = checkStatus.event;
+                    if (checkStatus.data.length === 1) {
+                        layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
+                            btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+                            , yes: function (index, layero) {
+
+                                $.ajax({
+                                    url: GetWEBURL() + '/Gy_ModelType/Delete_Json',
+                                    type: "GET",
+                                    //async: true,
+                                    data: { "HItemID": data[0].HItemID, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
+                                    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('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                    }
+                }
+            });
+
+
+
+
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                var HNumber = $("#HNumber").val();
+                var HName = $("#HName").val();
+                if (HNumber) {
+                    sWhere += " and HNumber like '%" + HNumber + "%'";
+                }
+                if (HName) {
+                    sWhere += " and HName like '%" + HName + "%'";
+                }
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_ModelType/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缂撳瓨
+            });
+
+
+            //淇敼鎸夐挳
+            form.on('submit(btnModify)', function (data) {
+                if (TagId != "") {
+                    layer.open({
+                        type: 2
+                        , area: ['80%', '80%']
+                        , title: '缂栬緫妯℃不鍏峰垎绫�'
+                        , closeBtn: 1
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_MouldType.html?hID=' + TagId + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+                }
+                else {
+                    var checkStatus = table.checkStatus('mainTable')
+                        , data = checkStatus.data;
+                    if (checkStatus.data.length === 1) {
+                        var hID = data[0].HItemID;
+                        TagParentId = data[0].HParentID;
+                        //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                        layer.open({
+                            type: 2
+                            , area: ['80%', '80%']
+                            , title: '缂栬緫妯℃不鍏峰垎绫�'
+                            , closeBtn: 1
+                            , shade: 0.6 //閬僵閫忔槑搴�
+                            , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                            , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                            , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_MouldType.html?hID=' + hID + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
+
+                            , resize: false,
+                            end: function () {
+                                //鍒锋柊椤甸潰,
+                                location.reload();
+                            }
+                            , cancel: function () {
+                                //$(".layui-btn").removeClass("layui-btn-disabled");
+                            }
+                        })
+
+                    } else {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                    }
+                }
+            });
+
+
+            //laydate.render({
+            //    elem: '#HDate'
+            //    , type: 'datetime'
+            //    , trigger: 'click'
+            //    , format:'yyyy-MM-dd HH:mm'
+            //});
+
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+
+        //鏌ヨ鏍戠姸鏁版嵁
+        function getData(sWhere) {
+            var treeData;
+
+            $.ajax({
+                url: GetWEBURL() + '/Gy_ModelType/LoadTree',
+                type: "GET",
+                data: { "sWhere": sWhere },
+                async: false,
+                success: function (result) {
+                    var data = result.data;
+                    //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
+                    treeData = LoadTree(data);
+
+                }
+            });
+            return treeData;
+        }
+        /**澶勭悊鏍戝舰灞曠ず鏁版嵁锛岃姹傛湁ID鍜孭arentID銆乼itle瀛楁**/
+        function LoadTree(data) {
+            let map = {};
+            let treeData = [];
+            data.forEach(it => {
+                map[it.id] = it;    //ID涓烘瘡涓妭鐐圭殑id
+            })
+            //鐢熸垚缁撴灉闆�
+            data.forEach(it => {
+                const parent = map[it.HParentID];   //ParentID涓虹埗鑺傜偣鐨刬d
+                if (parent) {
+                    if (!Array.isArray(parent.children)) parent.children = [];
+                    parent.children.push(it);
+                } else {
+                    treeData.push(it)
+                }
+            })
+            return treeData;
+        }
+
+
+    </script>
+
+</body>
+</html>
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/Sc_Add_MouldMaintainBillList.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/Sc_Add_MouldMaintainBillList.html"
index 6740e28..ac91645 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/Sc_Add_MouldMaintainBillList.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/Sc_Add_MouldMaintainBillList.html"
@@ -55,6 +55,15 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">浜у搧妯″叿</label>
                                                 <div class="layui-input-inline">
+                                                    <input type="text" name="HMouldName" id="HMouldName" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HMouldList" style="width:40px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                    </button>
+                                                </div>
+
+                                                <label class="layui-form-label">浜у搧妯″叿</label>
+                                                <div class="layui-input-inline">
                                                     <input type="text" name="HMouldID" id="HMouldID" class="layui-input" value="0">
                                                 </div>
                                             </div>
@@ -69,7 +78,11 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">淇濆吇璁″垝鍐呯爜</label>
                                                 <div class="layui-input-inline">
-                                                    <input type="text" name="HPlanInterID" id="HPlanInterID" class="layui-input" value="0">
+                                                    <input type="text" name="HPlanInterName" id="HPlanInterName" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="hidden" name="HPlanInterID" id="HPlanInterID" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HPlanInterpList" 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">
@@ -103,19 +116,31 @@
                                 </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 class="layui-tab layui-tab-card">
+                            <ul class="layui-tab-title">
+                                <li class="layui-this">淇濆吇椤逛俊鎭�</li>
+                                <li>閰嶄欢淇℃伅</li>
+                            </ul>
+                            <div class="layui-tab-content">
+                                <div class="layui-tab-item layui-show">
+                                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                                </div>
+                                <div class="layui-tab-item layui-show">
+                                    <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+                                </div>
                             </div>
-                        </script>
-                        <script type="text/html" id="xuhao">
-                            {{d.LAY_TABLE_INDEX+1}}
-                        </script>
+                          </div>
+                         <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>
@@ -129,30 +154,25 @@
     <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 = 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]];//婧愬崟绫诲瀷
         }
-
-
-
-        var params = getUrlVars();
-        var hID = params[params[0]];//缂栬緫鏌ョ湅
-
 
         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
@@ -160,2180 +180,127 @@
                 , form = layui.form
                 , laydate = layui.laydate
                 , element = layui.element;
+            var option;
+            var option2;
+            var option1;
+            var sBillType = "3807";
+            var TabRow = { "HMaterID": 0, "HUnitID": "0 ", "HQty": "0   ", "HQtyMust": "0", "HManagerID": "0", "HRemark": "  " };
+            var TabRow1 = { "HMaterID": 0, "HUnitID": "0 ", "HQty": "0   ", "HQtyMust": "0", "HManagerID": "0", "HRemark": "  " };
+            //#endregion
 
-            //甯歌鐢ㄦ硶
-            laydate.render({
-                elem: '#HDate'
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
 
-            });
-            laydate.render({
-                elem: '#HBeginDate'
-            });
-            laydate.render({
-                elem: '#HEndDate'
-            });
-            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
-            //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
-                //,url: '/demo/table/user/' //鏁版嵁鎺ュ彛
-                , page: true //寮�鍚垎椤�
-                , cols: [[ //琛ㄥご
-                    { type: 'checkbox', fixed: 'left' }
-                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
-                    , { field: 'HMaterID', title: '閰嶄欢浠g爜', edit: 'text', event: "" }
-                    , { field: 'HUnitID', title: '鍗曚綅浠g爜', edit: 'text', event: "" }
-                    , { field: 'HQty', title: '瀹為檯鐢ㄩ噺', edit: 'text' }
-                    , { field: 'HQtyMust', title: '鏍囧噯鐢ㄩ噺', edit: 'text' }
-                    , { field: 'HManagerID', title: '璐熻矗浜轰唬鐮�', edit: 'text' }
-                    , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
-                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 150 }
-                ]]
-                , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
-            };
-            //鍒ゆ柇鏄惁鏂板
-            if (hID == null || hID == 0) {
-                //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
-                option.data = [{ "HMaterID": 0, "HUnitID": "0 ", "HQty": "0   ", "HQtyMust": "0", "HManagerID": "0", "HRemark": "  " }];
-                table.render(option);
+            //鍒濆鍖栬〃鍗曟彃浠�
+            set_InitFrom();
+
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
+            }
+            else if (OperationType == 3) {//缂栬緫
+
+                set_EditFromGrid();
             }
             else {
-                $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
-                //缂栬緫鍔犺浇鏁版嵁
-                $.ajax({
-                    url: GetWEBURL() + 'Sc_MouldMaintainBill/Sc_MouldMaintainBillListProjectDetai',
-                    type: "GET",
-                    data: { "sqlWhere": "and HInterID=" + hID },
-                    success: function (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 });
-                    }
-                });
-
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
             }
 
 
-            //澶村伐鍏锋爮浜嬩欢
-            var rowid = 0;
-            var rows = 0;
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            // 澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
+                var rowid = 0;
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HMaterID": 0, "HUnitID": "0 ", "HQty": "0   ", "HQtyMust": "0", "HManagerID": "0", "HRemark": "  " };
+                var NewRow = TabRow;
                 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('澧炲姞涓�琛屾寜閽紒')
+                    //鏂板涓�琛�
+                    case 'btn-AddLine': btnAddLine(NewRow);
                         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);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
-                            //layer.alert(copyrow);
-                        }
+                    //澶嶅埗涓�琛�
+                    case 'btn-CopyLine': btnCopyLine(data);
                         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 {
-                            var oldData = table.cache["mainTable"];
-                            oldData.splice(obj.tr.data('index'), 1);
-                            table.reload('mainTable', { data: oldData });
-                            layer.close(index);
-                        }
-                    });
-                }
-                if (obj.event === 'ReasonNameEvent') {
-                    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_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        , HBadReasonID: ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            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_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        , HBadReasonID: ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            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_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        , HBadReasonID: ReasonID
-                                    });
-                                }
-                            })
-                            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
-                                    });
-                                }
-                            })
-                            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;
-
-                    }
-                }
-                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;
-                    }
-                }
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
             });
-            function RoadBillMain(hID)//鍔犺浇琛ㄥご
-            {
-                alert(hID);
-                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
-                $.ajax({
-                    url: GetWEBURL() + "Sc_MouldMaintainBill/Sc_MouldMaintainBillListCheckDetai",
-                    type: "GET",
-                    data: {
-                        "HID": hID
+
+            //淇濆吇璁″垝鍐呯爜
+            form.on('submit(HPlanInterpList)', function () {//閫夋嫨鍗曚綅
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '淇濆吇璁″垝鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
                     },
-                    success: function (result) {
-                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            var data = result.data.h_v_Sc_MouldMaintainBillList[0];
-                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                "HBillNo": data.鍗曟嵁鍙�
-                                , "HDate": data.鏃ユ湡
-                                , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
-                                , "HBeginDate": data.淇濆吇寮�濮嬫棩鏈�
-                                , "HEndDate": data.淇濆吇缁撴潫鏃ユ湡
-                                , "HExplanation": data.鎽樿
-                                , "HRemark": data.澶囨敞
-                                , "HPlanNo": data.淇濆吇璁″垝缂栧彿
-                                , "HPlanInterID": data.淇濆吇璁″垝鍐呯爜
-                                , "HMouldID": data.HMouldID
+                    end: function () {
 
-                            });
+                    },
+                    success: function (layero, index) {
 
-                        } else {
-                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                    }
+                });
+            });
+
+            //浜у搧妯″叿
+            form.on('submit(HMouldList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '浜у搧妯″叿鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/MouldInformation.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('璇烽�夋嫨鏁版嵁');
                         }
-                    }, error: function () {
-                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                        $("#HMouldName").val(checkStatus.data[0].HName);
+                        $("#HMouldID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
                     }
                 });
-            }
-
-
-            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": '3807' },
-                    success: function (d) {
-                        //console.log(d.data);
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                        $("#HDate").val(shijian);
-                        $("#HBeginDate").val(shijian);
-                        $("#HEndDate").val(shijian);
-                        $("#HInterID").val(0);
-                    }
-                });
-            }
-            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
-                RoadBillMain(hID);
-                /* RoadBillSub(linterid);*/
-            }
-
-            //閫夋嫨浜у搧寮圭獥
-            form.on('submit(HMateria-BT)', function () {//浜у搧
-                layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '鐗╂枡'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
-                    , resize: false
-                    , cancel: function (index, layero) {
-                    }
-                })
-            });
-            //閫夋嫨宸ュ簭
-            form.on('submit(HProc-BT)', function () {//閫夋嫨宸ュ簭
-                layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '宸ュ簭鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                    , resize: false
-                    , cancel: function (index, layero) {
-                    }
-                })
             });
 
-            //閫夋嫨閮ㄩ棬
-            form.on('submit(HDepart-BT)', function () {//閫夋嫨閮ㄩ棬
-                layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '閮ㄩ棬鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
-                    , resize: false
-                    , cancel: function (index, layero) {
-                    }
-                })
-            });
             //閫夋嫨鍗曚綅
             form.on('submit(HUnitID-BT)', function () {//閫夋嫨鍗曚綅
                 layer.open({
@@ -2351,55 +318,178 @@
                 })
             });
 
-            form.on('submit(Exit)', function (data) {//
-                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
-            });
+            //琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
+            function set_GridCellCheck(obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        if (obj.event === 'HMaterCode')  //鐗╂枡淇℃伅
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '鐗╂枡鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                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('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HMaterID: checkStatus.data[0].HItemID,
+                                        HMaterCode: checkStatus.data[0].HNumber,
+                                        HMaterName: checkStatus.data[0].HName,
+                                        HMaterSpec: checkStatus.data[0].HModel,
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+                                }
+                            });
+                        }
 
-            //閫夋嫨璐d换浜�
-            form.on('submit(HEmployeeID-BT)', function () {//閫夋嫨璐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
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                        if (obj.event === 'HUnitCode')  //鍗曚綅淇℃伅
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '鍗曚綅鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                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 === 'HSourceCode')  //璧勬簮淇℃伅
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '璧勬簮鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true,
+                                content: ['../../PublicPage/SourceInformation.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({
+                                        HSourceID: checkStatus.data[0].HItemID,
+                                        HSourceCode: checkStatus.data[0].HNumber,
+                                        HSourceName: checkStatus.data[0].HName
+                                    });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+
+                        if (obj.event === 'HWorkerCode')  //浜哄憳淇℃伅
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '璧勬簮鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true,
+                                content: ['../../PublicPage/UserInformation.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({
+                                        HWorkerid: checkStatus.data[0].HItemID,
+                                        HWorkerCode: checkStatus.data[0].HNumber,
+                                        HWorkerName: checkStatus.data[0].HName
+                                    });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        obj.event = "";
+                        return false;
+
                     }
                 })
-            });
+            }
 
-            //閫夋嫨璐d换宸ュ簭
-            form.on('submit(HZRProcID-BT)', function () {//閫夋嫨璐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
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-            });
-
-
-
-            form.on('submit(Cancel)', function () {
-                //sessionStorage["SourceFlag"] = false;
-                parent.location.href = "../../../views/index.html"
-                //window.close();//鍏抽棴褰撳墠椤�
-            })
-
-
-
+            //淇濆瓨
             form.on('submit(Saver)', function (data) {//淇濆瓨
                 //debugger;
                 var sMainStr = JSON.stringify(data.field);
@@ -2422,148 +512,267 @@
                                 });
                             }
                             else {
-
-                                f_alert(data.Message);
-                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                                layer.alert(data.Message, { icon: 5 });
                             }
                             layer.closeAll("loading");
                         },
                         error: function (err) {
-
-                            f_alert("閿欒:" + err);
-                            console.log("Reason" + sMainStr);
+                            layer.alert("閿欒:" + err, { icon: 5 });
                         }
                     });
             });
-            function f_alert(sMsg) {
-                layer.alert(sMsg, { icon: 5 });
 
-            }
-
-            //鐩戝惉鎻愪氦
-            form.verify({
-                numberOrEmpty: function (value, item) {
-                    // if (value != '') {
-                    if (!/^\d+$/.test(value)) {
-                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
-                    }
-                    //}
-                }
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {//
+                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
             });
 
 
-        });
-        //瀹氫箟鍏ㄥ眬鍙橀噺
-        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);
-        }
+            //#endregion
 
-        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;
-            //}
-            if ($("#HDeptName").val() == '') {
-                layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
+            //鍒濆鍖栬〃鍗曟彃浠�
+            function set_InitFrom()
+            {
+                //甯歌鐢ㄦ硶
+                laydate.render({
+                    elem: '#HDate'
+
+                });
+                laydate.render({
+                    elem: '#HBeginDate'
+                });
+                laydate.render({
+                    elem: '#HEndDate'
+                });
             }
-            if ($("#HSecManager").val() == '') {
-                layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid()
+            {
+                Table1();  //淇濆吇椤瑰垪琛�
+                Table2();  //閰嶄欢椤瑰垪琛�
+              
             }
-            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 ($("#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;
+
+            //鍒濆鍖栦繚鍏婚」鍒楄〃
+            function Table1()
+            {
+                //琛ㄥご
+                columns = [
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+                    , { field: 'HMaintainItemID', title: '淇濆吇椤圭洰ID', edit: 'text', event: "" }
+                    , { field: 'HMaintainNumber', title: '淇濆吇椤圭洰浠g爜', edit: 'text', event: "" }
+                    , { field: 'HMaintainItem', title: '淇濆吇椤圭洰', edit: 'text', event: "" }
+                    , { field: 'HMaintainPart', title: '淇濆吇閮ㄤ綅', edit: 'text', event: "" }
+                    , { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text', event: "" }
+                    , { field: 'HManagerID', title: '璐熻矗浜篒D', edit: 'text' }
+                    , { field: 'HManagerNumber', title: '璐熻矗浜轰唬鐮�', edit: 'text' }
+                    , { field: 'HManagerName', title: '璐熻矗浜�', edit: 'text' }
+                    , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+                ];
+                option = {
+                    id: 'mainTable'
+                    , elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , page: false
+                    , cellMinWidth: 120
+                    , height: 500
+                    , cols: [columns]
+                    , done: function (res, curr, count) {
+
                     }
+                };
+            }
+
+            //鍒濆鍖栭厤浠堕」鍒楄〃
+            function Table2() {
+                //琛ㄥご
+                columns = [
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+                    , { field: 'HMaintainItemID', title: '淇濆吇椤圭洰ID', edit: 'text', event: "" }
+                    , { field: 'HMaintainNumber', title: '淇濆吇椤圭洰浠g爜', edit: 'text', event: "" }
+                    , { field: 'HMaintainItem', title: '淇濆吇椤圭洰', edit: 'text', event: "" }
+                    , { field: 'HMaintainPart', title: '淇濆吇閮ㄤ綅', edit: 'text', event: "" }
+                    , { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text', event: "" }
+                    , { field: 'HManagerID', title: '璐熻矗浜篒D', edit: 'text' }
+                    , { field: 'HManagerNumber', title: '璐熻矗浜轰唬鐮�', edit: 'text' }
+                    , { field: 'HManagerName', title: '璐熻矗浜�', edit: 'text' }
+                    , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+                ];
+                option2 = {
+                    id: 'mainTable1'
+                    , elem: '#mainTable1'
+                    , toolbar: '#toolbarDemo'
+                    , page: false
+                    , cellMinWidth: 120
+                    , height: 500
+                    , cols: [columns]
+                    , done: function (res, curr, count) {
+
+                    }
+                };
+            }
+
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew()
+            {
+                //鑾峰彇鏈�澶у崟鎹彿
+                //get_MAXNum();
+                option.data = [TabRow];
+                option2.data = [TabRow1];
+                table.render(option);
+                table.render(option2);
+            }
+
+            //缂栬緫
+            function set_EditFromGrid()
+            {
+                set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
+                set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
+                option.data = [TabRow];
+                table.render(option);
+                option2.data = [TabRow1];
+                table.render(option2);
+            }
+
+            //鑾峰彇鏈�澶у崟鎹彿鍙婇粯璁ゅ�艰祴鍊�
+            function get_MAXNum() {
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("0");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '3807' },
+                    success: function (d) {
+                        $("#HInterID").val(0);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                        $("#HBeginDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                        $("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                        
+                    }
+                });
+            }
+
+            //缂栬緫鑾峰彇琛ㄥご
+            function set_EditForm(linterid) {
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                $.ajax({
+                    url: GetWEBURL() + "Sc_MouldMaintainBill/Sc_MouldMaintainBillListCheckDetai",
+                    type: "GET",
+                    data: {
+                        "HID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data.h_v_Sc_MouldMaintainBillList[0];
+                            form.val("component-form-group", { 
+                                "HBillNo": data.鍗曟嵁鍙�
+                                , "HDate": formatDate(data.鏃ユ湡)
+                                , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+                                , "HBeginDate": formatDate(data.淇濆吇寮�濮嬫棩鏈�)
+                                , "HEndDate": formatDate(data.淇濆吇缁撴潫鏃ユ湡)
+                                , "HExplanation": data.鎽樿
+                                , "HRemark": data.澶囨敞
+                                , "HPlanNo": data.淇濆吇璁″垝缂栧彿
+                                , "HPlanInterID": data.淇濆吇璁″垝鍐呯爜
+                                , "HMouldID": data.HMouldID
+
+                            });
+
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+
+            // 缂栬緫鑾峰彇琛ㄥご鏃舵椂闂存牸寮忕煫姝f柟寮�
+            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('-');
+            }
+  
+            // 缂栬緫鑾峰彇琛ㄤ綋
+            function set_EditGrid(linterid) {
+                $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+                //缂栬緫鍔犺浇鏁版嵁
+                $.ajax({
+                    url: GetWEBURL() + 'Sc_MouldMaintainBill/Sc_MouldMaintainBillListProjectDetai',
+                    type: "GET",
+                    data: { "HInterID": linterid },
+                    success: function (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 });
+                    }
+                });
+            }
+
+            //澧炲姞涓�琛�
+            function btnAddLine(NewRow) {
+                table.cache["mainTable"].push(NewRow);
+                option.data = table.cache["mainTable"];
+                table.render(option);
+            }
+
+            //澶嶅埗涓�琛�
+            function btnCopyLine(data) {
+                var copydata = JSON.stringify(data);
+                if (data.length <= 0) {
+                    layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
                 }
-                if (s == 0) {
-                    layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return false;
+                else if (data.length > 1) {
+                    layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                }
+                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);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
                 }
             }
-            else {
-                return true;
+
+            //琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+            function set_GridDelete(obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'del') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+                        if (rowIndex === '0') {
+                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        } else {
+                            obj.del();
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.reload(option);
+                            layer.close(index);
+                        }
+                    });
+                }
             }
-        }</script>
+
+        });
+    </script>
 </body>
 </html>
\ No newline at end of file
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/Sc_MouldDotCheckBillList.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/Sc_MouldDotCheckBillList.html"
index 755f93c..093877b 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/Sc_MouldDotCheckBillList.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/Sc_MouldDotCheckBillList.html"
@@ -1,8 +1,8 @@
 锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<title>妯″叿鐐规璁板綍琛ㄥ垪琛�</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>妯″叿鐐规璁板綍琛ㄥ垪琛�</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -115,251 +115,224 @@
                 , laypage = layui.laypage
                 , laydate = layui.laydate
                 , util = layui.util
-            //鏌ヨ鏉′欢
             var sWhere = "";
-
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                , height: 'full-50'
-                , page: true
-                , cellMinWidth: 90
-                , cols: [[
-                    { type: 'checkbox', fixed: 'left' }
-                    ,{ field: 'hmainid', title: '鍗曟嵁ID', hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
-                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
-                    , { field: '鐐规璁″垝缂栧彿', title: '鐐规璁″垝缂栧彿', width: 200 }
-                    , { field: '鐐规璁″垝鍐呯爜', title: '鐐规璁″垝鍐呯爜', width: 200, hide: true }
-                    , { field: 'HMouldID', title: 'HMouldID', width: 200, hide: true }
-                    , { field: '浜у搧妯″叿浠g爜', title: '浜у搧妯″叿浠g爜', width: 200 }
-                    , { field: '浜у搧妯″叿', title: '浜у搧妯″叿', width: 200 }
-                    , { field: '鐐规寮�濮嬫棩鏈�', title: '鐐规寮�濮嬫棩鏈�', width: 200 }
-                    , { field: '鐐规缁撴潫鏃ユ湡', title: '鐐规缁撴潫鏃ユ湡', width: 200 }
-                    , { field: '鎽樿', title: '鎽樿', width: 200 }
-                    , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 }
-                    , { field: '澶囨敞', title: '澶囨敞', width: 200 }
-                    , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
-                    , { field: '鐐规椤圭洰', title: '鐐规椤圭洰', width: 115, hide: true }
-                    , { field: '鐐规閮ㄤ綅', title: '鐐规閮ㄤ綅', width: 200 }
-                    , { field: '鍏蜂綋瑕佹眰', title: '鍏蜂綋瑕佹眰', width: 200 }
-                    , { field: 'HManagerID', title: 'HManagerID', width: 200, hide: true }
-                    , { field: '璐熻矗浜轰唬鐮�', title: '璐熻矗浜轰唬鐮�', width: 200 }
-                    , { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 200 }
-                    , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 }
-                    , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 115, hide: true }
-                    , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
-                    , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200, hide: true }
-                    , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115, hide: true }
-                    , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200 }
-                    , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
-                    , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, hide: true }
-                    , { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true }
-                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true }
-                    , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
-                    , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200 }
-                    , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200, hide: true }
-                    , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 115, hide: true }
-                    , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
-                    , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
-                    , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
-                    , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
-                    , { field: 'hbilltype', title: 'hbilltype', width: 200 }
-                ]]
-            };
-
-            var index = layer.load(0);
-
+            //鍏敤鍙橀噺
+            var option = [];
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            //鍔犺浇鏁版嵁鍒扮綉鏍�
+            get_Display(sWhere);
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
+                    //鏂板鎸夐挳
                     case 'btn-Add':
-                        //椤甸潰灞�-鑷畾涔�
-                        layer.open({
-                            type: 2,
-                            skin: 'layui-layer-rim', //鍔犱笂杈规
-                            title: '鏂板妯″叿淇濆吇璁板綍琛�',
-                            closeBtn: false,
-                            shift: 2,
-                            area: ['100%', '100%'],
-                            maxmin: true,
-                            content: '../妯℃不鍏风鐞�/Sc_Add_MouldDotCheckBillList.html',
-                            end: function () {
-                                //鍒锋柊椤甸潰,
-                                location.reload();
-                            },
-                            success: function (layero, index) {
-
-                            }
-                        });
+                        set_AddNew();
                         break;
                     case 'btn-Edit':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var hID = data[0].hmainid.toString();
-                            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                            layer.open({
-                                type: 2
-                                , area: ['100%', '100%']
-                                , title: '缂栬緫妯″叿淇濆吇璁板綍琛�'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: '../妯℃不鍏风鐞�/Sc_Add_MouldDotCheckBillList.html?hID=' + hID
-                                , resize: false,
-                                end: function () {
-                                    //鍒锋柊椤甸潰,
-                                    location.reload();
-                                }
-                                , cancel: function () {
-                                    //$(".layui-btn").removeClass("layui-btn-disabled");
-                                }
-                            })
-
-                        } else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                        }
-
+                        set_ShowBill();
                         break;
                     case 'btn-Delete':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var HInterID = data[0].hmainid.toString();
-
-                            //閫昏緫鍒犻櫎鏂规硶
-                            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                                $.ajax({
-                                    type: "GET",
-                                    url: GetWEBURL() + "/Sc_MouldDotCheckBill/DeltetSc_MouldDotCheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                    data: { "HInterID": HInterID },
-                                    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('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                        }
+                        set_DeleteBill();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit':
+                        set_CheckBill();
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_AbandonCheck();
+                        break;
+                    //棰勮鎸夐挳
+                    case 'btn-Print':
+                        get_PrintReport();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'btn-Close':
+                        parent.layui.admin.events.closeThisTabs();
                         break;
                 };
             });
-
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Sc_MouldDotCheckBill/GetMouldDotCheckBillList',
-                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 });
-                }
-            });
-
             //閲嶇疆鎸夐挳
-            //form.on('submit(btnReSearch)', function (data) {
-            //    $("#HBillType").val("");//鍗曟嵁绫诲瀷
-            //    $("#HBillNo").val("");//鍗曟嵁鍙�
-            //    $("#HSourceBillNo").val("");//婧愬崟鍙�
-            //    $("#HCreateBy").val("");//鍒跺崟浜�
-            //    $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-            //    $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            //    $("#btnSearch").click();
-            //});
-
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+            }
             //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
-                //var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
-                //var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
-                //var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜�
-                //var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
-                //var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿
-                //if (HBillNo) {
-                //    sWhere += " and HBillNo like '%" + HBillNo + "%'";
-                //}
-                //if (HCreateBy) {
-                //    sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
-                //}
-                //if (BenginHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
-                //}
-                //if (EndHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
-                //}
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(table, option);
+            });
+            //蹇�熻繃婊�
+            function get_FastQuery(table, option) {
                 var index = layer.load(0);
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
+                        , { field: '鐐规璁″垝缂栧彿', title: '鐐规璁″垝缂栧彿', width: 200 }
+                        , { field: '鐐规璁″垝鍐呯爜', title: '鐐规璁″垝鍐呯爜', width: 200, hide: true }
+                        , { field: 'HMouldID', title: 'HMouldID', width: 200, hide: true }
+                        , { field: '浜у搧妯″叿浠g爜', title: '浜у搧妯″叿浠g爜', width: 200 }
+                        , { field: '浜у搧妯″叿', title: '浜у搧妯″叿', width: 200 }
+                        , { field: '鐐规寮�濮嬫棩鏈�', title: '鐐规寮�濮嬫棩鏈�', width: 200 }
+                        , { field: '鐐规缁撴潫鏃ユ湡', title: '鐐规缁撴潫鏃ユ湡', width: 200 }
+                        , { field: '鎽樿', title: '鎽樿', width: 200 }
+                        , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 }
+                        , { field: '澶囨敞', title: '澶囨敞', width: 200 }
+                        , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
+                        , { field: '鐐规椤圭洰', title: '鐐规椤圭洰', width: 115, hide: true }
+                        , { field: '鐐规閮ㄤ綅', title: '鐐规閮ㄤ綅', width: 200 }
+                        , { field: '鍏蜂綋瑕佹眰', title: '鍏蜂綋瑕佹眰', width: 200 }
+                        , { field: 'HManagerID', title: 'HManagerID', width: 200, hide: true }
+                        , { field: '璐熻矗浜轰唬鐮�', title: '璐熻矗浜轰唬鐮�', width: 200 }
+                        , { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 200 }
+                        , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 }
+                        , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 115, hide: true }
+                        , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
+                        , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200, hide: true }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115, hide: true }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200 }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, hide: true }
+                        , { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true }
+                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200 }
+                        , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200, hide: true }
+                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 115, hide: true }
+                        , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
+                        , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
+                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
+                        , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
+                        , { field: 'hbilltype', title: 'hbilltype', width: 200 }
+                    ]]
+                }
+            };
+            var index = layer.load(0);
+            //鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板妯″叿淇濆吇璁板綍琛�',
+                    closeBtn: false,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../妯℃不鍏风鐞�/Sc_Add_MouldDotCheckBillList.html',
+                    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].hmainid.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫妯″叿淇濆吇璁板綍琛�'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../妯℃不鍏风鐞�/Sc_Add_MouldDotCheckBillList.html?hID=' + hID
+                        , 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 HInterID = data[0].hmainid.toString();
+
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/Sc_MouldDotCheckBill/DeltetSc_MouldDotCheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": HInterID },
+                            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('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            };
+            function get_Display(sWhere) {
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
                 $.ajax({
                     //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                    url: GetWEBURL1() + '/Sc_MouldDotCheckBill/GetMouldDotCheckBillList',
+                    url: GetWEBURL() + '/Sc_MouldDotCheckBill/GetMouldDotCheckBillList',
                     type: "GET",
-                    data: { "sWhere": sWhere},
+                    data: { "sWhere": sWhere },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
                             table.render(option);
                             layer.close(index);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
                             layer.close(index);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
                         layer.close(index);
-                        layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-                sWhere = "";
-                //$("#HBillType").val("");//鍗曟嵁绫诲瀷
-                //$("#HBillNo").val("");//鍗曟嵁鍙�
-                //$("#HSourceBillNo").val("");//婧愬崟鍙�
-                //$("#HCreateBy").val("");//鍒跺崟浜�
-                //$("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-                //$("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            });
-
-            //鐩戝惉琛屽弻鍑讳簨浠�
-            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\347\256\241\347\220\206/Sc_MouldDotCheckPlanBillList.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/Sc_MouldDotCheckPlanBillList.html"
index d552346..5b7dbc5 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/Sc_MouldDotCheckPlanBillList.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/Sc_MouldDotCheckPlanBillList.html"
@@ -1,8 +1,8 @@
 锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<title>妯″叿鐐规璁″垝琛ㄥ垪琛�</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>妯″叿鐐规璁″垝琛ㄥ垪琛�</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -117,252 +117,216 @@
                 , util = layui.util
             //鏌ヨ鏉′欢
             var sWhere = "";
-
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                , height: 'full-50'
-                , page: true
-                , cellMinWidth: 90
-                , cols: [[
-                    { type: 'checkbox', fixed: 'left' }
-                    ,{ field: 'hmainid', title: '鍗曟嵁ID', hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
-                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
-                    , { field: 'HMouldID', title: 'HMouldID', width: 200, hide: true }
-                    , { field: '浜у搧妯″叿浠g爜', title: '浜у搧妯″叿浠g爜', width: 200 }
-                    , { field: '浜у搧妯″叿', title: '浜у搧妯″叿', width: 200, hide: true }
-                    , { field: '鍛ㄦ湡鍗曚綅', title: '鍛ㄦ湡鍗曚綅', width: 200 }
-                    , { field: '淇濆吇鍛ㄦ湡', title: '淇濆吇鍛ㄦ湡', width: 200 }
-                    , { field: '璁″垝寮�濮嬫棩鏈�', title: '璁″垝寮�濮嬫棩鏈�', width: 200 }
-                    , { field: '璁″垝缁撴潫鏃ユ湡', title: '璁″垝缁撴潫鏃ユ湡', width: 200 }
-                    , { field: '鎽樿', title: '鎽樿', width: 200 }
-                    , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 }
-                    , { field: '澶囨敞', title: '澶囨敞', width: 200 }
-                    , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
-                    , { field: '鐐规椤圭洰', title: '鐐规椤圭洰', width: 115, hide: true }
-                    , { field: '鐐规閮ㄤ綅', title: '鐐规閮ㄤ綅', width: 200 }
-                    , { field: '鍏蜂綋瑕佹眰', title: '鍏蜂綋瑕佹眰', width: 200 }
-                    , { field: 'HManagerID', title: 'HManagerID', width: 200, hide: true }
-                    , { field: '璐熻矗浜轰唬鐮�', title: '璐熻矗浜轰唬鐮�', width: 200 }
-                    , { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 200 }
-                    , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 115 }
-                    , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 200 }
-                    , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200, hide: true }
-                    , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200, hide: true }
-                    , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115, hide: true }
-                    , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200 }
-                    , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
-                    , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, hide: true }
-                    , { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true }
-                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true }
-                    , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
-                    , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200 }
-                    , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200, hide: true }
-                    , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 115, hide: true }
-                    , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
-                    , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
-                    , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
-                    , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
-                    , { field: 'hbilltype', title: 'hbilltype', width: 200 }
-                ]]
-            };
-
-            var index = layer.load(0);
+            //鍏敤鍙橀噺
+            var option = [];
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            //鍔犺浇鏁版嵁鍒扮綉鏍�
+            get_Display(sWhere);
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
+                    //鏂板鎸夐挳
                     case 'btn-Add':
-                        //椤甸潰灞�-鑷畾涔�
-                        layer.open({
-                            type: 2,
-                            skin: 'layui-layer-rim', //鍔犱笂杈规
-                            title: '鏂板妯″叿鐐规璁″垝琛�',
-                            closeBtn: false,
-                            shift: 2,
-                            area: ['100%', '100%'],
-                            maxmin: true,
-                            content: '../妯℃不鍏风鐞�/Sc_Add_MouldDotCheckPlanBillList.html',
-                            end: function () {
-                                //鍒锋柊椤甸潰,
-                                location.reload();
-                            },
-                            success: function (layero, index) {
-
-                            }
-                        });
+                        set_AddNew();
                         break;
                     case 'btn-Edit':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var hID = data[0].hmainid.toString();
-                            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                            layer.open({
-                                type: 2
-                                , area: ['100%', '100%']
-                                , title: '缂栬緫妯″叿鐐规璁″垝琛�'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: '../妯℃不鍏风鐞�/Sc_Add_MouldDotCheckPlanBillList.html?hID=' + hID
-                                , resize: false,
-                                end: function () {
-                                    //鍒锋柊椤甸潰,
-                                    location.reload();
-                                }
-                                , cancel: function () {
-                                    //$(".layui-btn").removeClass("layui-btn-disabled");
-                                }
-                            })
-
-                        } else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                        }
-
+                        set_ShowBill();
                         break;
                     case 'btn-Delete':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var HInterID = data[0].hmainid.toString();
-
-                            //閫昏緫鍒犻櫎鏂规硶
-                            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                                $.ajax({
-                                    type: "GET",
-                                    url: GetWEBURL() + "/Sc_MouldDotCheckPlanBill/DeltetSc_MouldDotCheckPlanBillBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                    data: { "HInterID": HInterID },
-                                    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('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                        }
+                        set_DeleteBill();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit':
+                        set_CheckBill();
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_AbandonCheck();
+                        break;
+                    //棰勮鎸夐挳
+                    case 'btn-Print':
+                        get_PrintReport();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'btn-Close':
+                        parent.layui.admin.events.closeThisTabs();
                         break;
                 };
             });
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Sc_MouldDotCheckPlanBill/GetMouldDotCheckPlanBillList',
-                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 });
-                }
-            });
-
-            //閲嶇疆鎸夐挳
-            //form.on('submit(btnReSearch)', function (data) {
-            //    $("#HBillType").val("");//鍗曟嵁绫诲瀷
-            //    $("#HBillNo").val("");//鍗曟嵁鍙�
-            //    $("#HSourceBillNo").val("");//婧愬崟鍙�
-            //    $("#HCreateBy").val("");//鍒跺崟浜�
-            //    $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-            //    $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            //    $("#btnSearch").click();
-            //});
-
             //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
-                //var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
-                //var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
-                //var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜�
-                //var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
-                //var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿
-                //if (HBillNo) {
-                //    sWhere += " and HBillNo like '%" + HBillNo + "%'";
-                //}
-                //if (HCreateBy) {
-                //    sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
-                //}
-                //if (BenginHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
-                //}
-                //if (EndHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
-                //}
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(table, option);
+            });
+            //蹇�熻繃婊�
+            function get_FastQuery(table, option) {
                 var index = layer.load(0);
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
+                        , { field: 'HMouldID', title: 'HMouldID', width: 200, hide: true }
+                        , { field: '浜у搧妯″叿浠g爜', title: '浜у搧妯″叿浠g爜', width: 200 }
+                        , { field: '浜у搧妯″叿', title: '浜у搧妯″叿', width: 200, hide: true }
+                        , { field: '鍛ㄦ湡鍗曚綅', title: '鍛ㄦ湡鍗曚綅', width: 200 }
+                        , { field: '淇濆吇鍛ㄦ湡', title: '淇濆吇鍛ㄦ湡', width: 200 }
+                        , { field: '璁″垝寮�濮嬫棩鏈�', title: '璁″垝寮�濮嬫棩鏈�', width: 200 }
+                        , { field: '璁″垝缁撴潫鏃ユ湡', title: '璁″垝缁撴潫鏃ユ湡', width: 200 }
+                        , { field: '鎽樿', title: '鎽樿', width: 200 }
+                        , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 }
+                        , { field: '澶囨敞', title: '澶囨敞', width: 200 }
+                        , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
+                        , { field: '鐐规椤圭洰', title: '鐐规椤圭洰', width: 115, hide: true }
+                        , { field: '鐐规閮ㄤ綅', title: '鐐规閮ㄤ綅', width: 200 }
+                        , { field: '鍏蜂綋瑕佹眰', title: '鍏蜂綋瑕佹眰', width: 200 }
+                        , { field: 'HManagerID', title: 'HManagerID', width: 200, hide: true }
+                        , { field: '璐熻矗浜轰唬鐮�', title: '璐熻矗浜轰唬鐮�', width: 200 }
+                        , { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 200 }
+                        , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 115 }
+                        , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 200 }
+                        , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200, hide: true }
+                        , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200, hide: true }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115, hide: true }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200 }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, hide: true }
+                        , { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true }
+                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200 }
+                        , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200, hide: true }
+                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 115, hide: true }
+                        , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
+                        , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
+                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
+                        , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
+                        , { field: 'hbilltype', title: 'hbilltype', width: 200 }
+                    ]]
+                };
+            }
+            var index = layer.load(0);
+            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            function get_Display(sWhere) {
                 $.ajax({
-                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                    url: GetWEBURL1() + '/Sc_MouldDotCheckPlanBill/GetMouldDotCheckPlanBillList',
+                    url: GetWEBURL() + '/Sc_MouldDotCheckPlanBill/GetMouldDotCheckPlanBillList',
                     type: "GET",
-                    data: { "sWhere": sWhere},
+                    data: { "sWhere": sWhere },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
                             table.render(option);
                             layer.close(index);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
                             layer.close(index);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
                         layer.close(index);
-                        layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-                sWhere = "";
-                //$("#HBillType").val("");//鍗曟嵁绫诲瀷
-                //$("#HBillNo").val("");//鍗曟嵁鍙�
-                //$("#HSourceBillNo").val("");//婧愬崟鍙�
-                //$("#HCreateBy").val("");//鍒跺崟浜�
-                //$("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-                //$("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            });
+            }
+            //鏂板
+            function set_AddNew() {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板妯″叿鐐规璁″垝琛�',
+                    closeBtn: false,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../妯℃不鍏风鐞�/Sc_Add_MouldDotCheckPlanBillList.html',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
 
-            //鐩戝惉琛屽弻鍑讳簨浠�
-            table.on('rowDouble(mainTable)', function (obj) {
-                layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
-            });
+                    }
+                });
+            }
+            //缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].hmainid.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫妯″叿鐐规璁″垝琛�'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../妯℃不鍏风鐞�/Sc_Add_MouldDotCheckPlanBillList.html?hID=' + hID
+                        , 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 HInterID = data[0].hmainid.toString();
 
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/Sc_MouldDotCheckPlanBill/DeltetSc_MouldDotCheckPlanBillBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": HInterID },
+                            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();
+                                    });
 
-
-            //浠ヤ笂鏄痩ayui妯″潡
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
         });
-
-
-
-
     </script>
 
 </body>
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/Sc_MouldMaintainBillList.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/Sc_MouldMaintainBillList.html"
index c1df757..43c17e8 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/Sc_MouldMaintainBillList.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/Sc_MouldMaintainBillList.html"
@@ -28,7 +28,7 @@
                                         <span>鏇村</span>
                                     </div>
                                 </div>
-                                <!--<div class="layui-inline">
+                                <div class="layui-inline">
                                     <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
                                     <div class="layui-input-block">
                                         <select name="HBillType" id="HBillType">
@@ -49,12 +49,12 @@
                                     <div class="layui-input-block">
                                         <input type="text" class="layui-input" name="HCreateBy" id="HCreateBy">
                                     </div>
-                                </div>-->
+                                </div>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                 </button>
-                                <!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>-->
-                                <!--<div class="layui-colla-content">
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                                <div class="layui-colla-content">
                                     <div class="layui-inline">
                                         <div class="layui-inline">
                                             <span>鍏朵粬鏉′欢></span>
@@ -72,7 +72,7 @@
                                             <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
                                         </div>
                                     </div>
-                                </div>-->
+                                </div>
                             </div>
                         </div>
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -106,6 +106,7 @@
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            // #region 鍏ㄥ眬鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -117,253 +118,273 @@
                 , util = layui.util
             //鏌ヨ鏉′欢
             var sWhere = "";
+            var option = [];
+            //#endregion
 
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                , height: 'full-50'
-                , page: true
-                , cellMinWidth: 90
-                , cols: [[
-                    { type: 'checkbox', fixed: 'left' }
-                    ,{ field: 'hmainid', title: '鍗曟嵁ID', hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
-                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
-                    , { field: '淇濆吇璁″垝缂栧彿', title: '淇濆吇璁″垝缂栧彿', width: 200 }
-                    , { field: '淇濆吇璁″垝鍐呯爜', title: '淇濆吇璁″垝鍐呯爜', width: 200 }
-                    , { field: 'HMouldID', title: 'HMouldID', width: 200, hide: true }
-                    , { field: '浜у搧妯″叿浠g爜', title: '浜у搧妯″叿浠g爜', width: 200 }
-                    , { field: '浜у搧妯″叿', title: '浜у搧妯″叿', width: 200 }
-                    , { field: '淇濆吇寮�濮嬫棩鏈�', title: '淇濆吇寮�濮嬫棩鏈�', width: 200 }
-                    , { field: '淇濆吇缁撴潫鏃ユ湡', title: '淇濆吇缁撴潫鏃ユ湡', width: 200 }
-                    , { field: '鎽樿', title: '鎽樿', width: 200 }
-                    , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 }
-                    , { field: '澶囨敞', title: '澶囨敞', width: 200 }
-                    , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
-                    , { field: 'hmaterid', title: 'hmaterid', width: 115, hide: true }
-                    , { field: '閰嶄欢浠g爜', title: '閰嶄欢浠g爜', width: 200 }
-                    , { field: '閰嶄欢鍚嶇О', title: '閰嶄欢鍚嶇О', width: 200 }
-                    , { field: 'hunitid', title: 'hunitid', width: 200, hide: true }
-                    , { field: '鍗曚綅浠g爜', title: '鍗曚綅浠g爜', width: 200 }
-                    , { field: '鍗曚綅鍚嶇О', title: '鍗曚綅鍚嶇О', width: 200 }
-                    , { field: '瀹為檯鐢ㄩ噺', title: '瀹為檯鐢ㄩ噺', width: 115 }
-                    , { field: '鏍囧噯鐢ㄩ噺', title: '鏍囧噯鐢ㄩ噺', width: 200 }
-                    , { field: 'HManagerID', title: 'HManagerID', width: 200, hide: true }
-                    , { field: '璐熻矗浜轰唬鐮�', title: '璐熻矗浜轰唬鐮�', width: 200 }
-                    , { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 200 }
-                    , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 }
-                    , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 115, hide: true }
-                    , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
-                    , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200, hide: true }
-                    , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115, hide: true }
-                    , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200 }
-                    , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
-                    , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, hide: true }
-                    , { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true }
-                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true }
-                    , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
-                    , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200 }
-                    , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200, hide: true }
-                    , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 115, hide: true }
-                    , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
-                    , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
-                    , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
-                    , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
-                    , { field: 'hbilltype', title: 'hbilltype', width: 200 }
-                ]]
-            };
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+            //鍒濆鍖栫晫闈�
+             set_ClearBill();
+            //#endregion
 
-            var index = layer.load(0);
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
 
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
-                var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
-                    case 'btn-Add':
-                        //椤甸潰灞�-鑷畾涔�
-                        layer.open({
-                            type: 2,
-                            skin: 'layui-layer-rim', //鍔犱笂杈规
-                            title: '鏂板妯″叿淇濆吇璁板綍琛�',
-                            closeBtn: false,
-                            shift: 2,
-                            area: ['100%', '100%'],
-                            maxmin: true,
-                            content: '../妯℃不鍏风鐞�/Sc_Add_MouldMaintainBillList.html',
-                            end: function () {
-                                //鍒锋柊椤甸潰,
-                                location.reload();
-                            },
-                            success: function (layero, index) {
-
-                            }
-                        });
+                    //鏂板
+                    case 'set_AddNew': set_AddNew();
                         break;
-                    case 'btn-Edit':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var hID = data[0].hmainid.toString();
-                            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                            layer.open({
-                                type: 2
-                                , area: ['100%', '100%']
-                                , title: '缂栬緫妯″叿淇濆吇璁板綍琛�'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: '../妯℃不鍏风鐞�/Sc_Add_MouldMaintainBillList.html?hID=' + hID
-                                , resize: false,
-                                end: function () {
-                                    //鍒锋柊椤甸潰,
-                                    location.reload();
-                                }
-                                , cancel: function () {
-                                    //$(".layui-btn").removeClass("layui-btn-disabled");
-                                }
-                            })
-
-                        } else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                        }
-
+                    //缂栬緫
+                    case 'set_ShowBill': set_ShowBill();
                         break;
-                    case 'btn-Delete':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var HInterID = data[0].hmainid.toString();
-
-                            //閫昏緫鍒犻櫎鏂规硶
-                            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                                $.ajax({
-                                    type: "GET", 
-                                    url: GetWEBURL() + "/Sc_MouldMaintainBill/DeltetSc_MouldMaintainBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                    data: { "HInterID": HInterID },
-                                    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('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                        }
+                    //鍒犻櫎
+                    case 'set_DeleteBill': set_DeleteBill();
+                        break;
+                    //娴忚
+                    case 'get_PrintReport': get_PrintReport();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
                         break;
                 };
             });
 
-
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Sc_MouldMaintainBill/GetMouldMaintainBillList',
-                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 });
-                }
+            // 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
             });
 
-            //閲嶇疆鎸夐挳
-            //form.on('submit(btnReSearch)', function (data) {
-            //    $("#HBillType").val("");//鍗曟嵁绫诲瀷
-            //    $("#HBillNo").val("");//鍗曟嵁鍙�
-            //    $("#HSourceBillNo").val("");//婧愬崟鍙�
-            //    $("#HCreateBy").val("");//鍒跺崟浜�
-            //    $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-            //    $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            //    $("#btnSearch").click();
-            //});
+            // 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
 
-            //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
-                //var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
-                //var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
-                //var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜�
-                //var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
-                //var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿
-                //if (HBillNo) {
-                //    sWhere += " and HBillNo like '%" + HBillNo + "%'";
-                //}
-                //if (HCreateBy) {
-                //    sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
-                //}
-                //if (BenginHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
-                //}
-                //if (EndHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
-                //}
-                var index = layer.load(0);
+         //#endregion
+
+            //#region 褰撳墠椤甸潰鍔犺浇鎵�鏈夋柟娉�
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+
+            }
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                 option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
+                        , { field: '淇濆吇璁″垝缂栧彿', title: '淇濆吇璁″垝缂栧彿', width: 200 }
+                        , { field: '淇濆吇璁″垝鍐呯爜', title: '淇濆吇璁″垝鍐呯爜', width: 200 }
+                        , { field: 'HMouldID', title: 'HMouldID', width: 200, hide: true }
+                        , { field: '浜у搧妯″叿浠g爜', title: '浜у搧妯″叿浠g爜', width: 200 }
+                        , { field: '浜у搧妯″叿', title: '浜у搧妯″叿', width: 200 }
+                        , { field: '淇濆吇寮�濮嬫棩鏈�', title: '淇濆吇寮�濮嬫棩鏈�', width: 200 }
+                        , { field: '淇濆吇缁撴潫鏃ユ湡', title: '淇濆吇缁撴潫鏃ユ湡', width: 200 }
+                        , { field: '鎽樿', title: '鎽樿', width: 200 }
+                        , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 }
+                        , { field: '澶囨敞', title: '澶囨敞', width: 200 }
+                        , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
+                        , { field: 'hmaterid', title: 'hmaterid', width: 115, hide: true }
+                        , { field: '閰嶄欢浠g爜', title: '閰嶄欢浠g爜', width: 200 }
+                        , { field: '閰嶄欢鍚嶇О', title: '閰嶄欢鍚嶇О', width: 200 }
+                        , { field: 'hunitid', title: 'hunitid', width: 200, hide: true }
+                        , { field: '鍗曚綅浠g爜', title: '鍗曚綅浠g爜', width: 200 }
+                        , { field: '鍗曚綅鍚嶇О', title: '鍗曚綅鍚嶇О', width: 200 }
+                        , { field: '瀹為檯鐢ㄩ噺', title: '瀹為檯鐢ㄩ噺', width: 115 }
+                        , { field: '鏍囧噯鐢ㄩ噺', title: '鏍囧噯鐢ㄩ噺', width: 200 }
+                        , { field: 'HManagerID', title: 'HManagerID', width: 200, hide: true }
+                        , { field: '璐熻矗浜轰唬鐮�', title: '璐熻矗浜轰唬鐮�', width: 200 }
+                        , { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 200 }
+                        , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 }
+                        , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 115, hide: true }
+                        , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
+                        , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200, hide: true }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115, hide: true }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200 }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, hide: true }
+                        , { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true }
+                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200 }
+                        , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200, hide: true }
+                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 115, hide: true }
+                        , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
+                        , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
+                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
+                        , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
+                        , { field: 'hbilltype', title: 'hbilltype', width: 200 }
+                    ]]
+                };
+            }
+
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
                 $.ajax({
-                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                    url: GetWEBURL1() + '/Sc_MouldMaintainBill/GetMouldMaintainBillList',
+                    url: GetWEBURL() + '/Sc_MouldMaintainBill/GetMouldMaintainBillList',
                     type: "GET",
-                    data: { "sWhere": sWhere},
+                    data: { "sWhere": sWhere },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
                             table.render(option);
-                            layer.close(index);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                            layer.close(ajaxLoad);
                         } else {
-                            layer.close(index);
+                            layer.close(ajaxLoad);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
-                        layer.close(index);
-                        layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+
+            //蹇�熻繃婊�
+            function get_FastQuery() {
+                var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
+                var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+                var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜�
+                var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
+                var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿
+                if (HBillNo) {
+                    sWhere += " and HBillNo like '%" + HBillNo + "%'";
+                }
+                if (HCreateBy) {
+                    sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
+                }
+                if (BenginHCreateDate) {
+                    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
+                }
+                if (EndHCreateDate) {
+                    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+
+            //閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#HBillType").val("");//鍗曟嵁绫诲瀷
+                $("#HBillNo").val("");//鍗曟嵁鍙�
+                $("#HCreateBy").val("");//鍒跺崟浜�
+                $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
+                $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
+                $("#btnSearch").click();
                 sWhere = "";
-                //$("#HBillType").val("");//鍗曟嵁绫诲瀷
-                //$("#HBillNo").val("");//鍗曟嵁鍙�
-                //$("#HSourceBillNo").val("");//婧愬崟鍙�
-                //$("#HCreateBy").val("");//鍒跺崟浜�
-                //$("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-                //$("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            });
+            }
 
-            //鐩戝惉琛屽弻鍑讳簨浠�
-            table.on('rowDouble(mainTable)', function (obj) {
-                layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
-            });
+            //鏂板
+            function set_AddNew()
+            {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板妯″叿淇濆吇璁板綍琛�',
+                    closeBtn: false,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../妯℃不鍏风鐞�/Sc_Add_MouldMaintainBillList.html',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
 
+                    }
+                });
+            }
 
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
+            //缂栬緫
+            function set_ShowBill()
+            {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].hmainid.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫妯″叿淇濆吇璁板綍琛�'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../妯℃不鍏风鐞�/Sc_Add_MouldMaintainBillList.html?hID=' + hID
+                        , 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 HInterID = data[0].hmainid.toString();
+
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/Sc_MouldMaintainBill/DeltetSc_MouldMaintainBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": HInterID },
+                            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
 
             //浠ヤ笂鏄痩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\347\256\241\347\220\206/Sc_MouldMaintainPlanBillList.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/Sc_MouldMaintainPlanBillList.html"
index 6d7ce93..16ba120 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/Sc_MouldMaintainPlanBillList.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/Sc_MouldMaintainPlanBillList.html"
@@ -1,8 +1,8 @@
 锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<title>妯″叿淇濆吇璁″垝琛ㄥ垪琛�</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>妯″叿淇濆吇璁″垝琛ㄥ垪琛�</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -115,251 +115,246 @@
                 , laypage = layui.laypage
                 , laydate = layui.laydate
                 , util = layui.util
-            //鏌ヨ鏉′欢
             var sWhere = "";
+            //鍏敤鍙橀噺
+            var option = [];
 
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                , height: 'full-50'
-                , page: true
-                , cellMinWidth: 90
-                , cols: [[
-                    { type: 'checkbox', fixed: 'left' }
-                    ,{ field: 'hmainid', title: '鍗曟嵁ID', hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
-                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
-                    , { field: '鍛ㄦ湡鍗曚綅', title: '鍛ㄦ湡鍗曚綅', width: 200 }
-                    , { field: '淇濆吇鍛ㄦ湡', title: '淇濆吇鍛ㄦ湡', width: 200 }
-                    , { field: '璁″垝寮�濮嬫棩鏈�', title: '璁″垝寮�濮嬫棩鏈�', width: 200 }
-                    , { field: '璁″垝缁撴潫鏃ユ湡', title: '璁″垝缁撴潫鏃ユ湡', width: 200 }
-                    , { field: '鎽樿', title: '鎽樿', width: 200 }
-                    , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 }
-                    , { field: '澶囨敞', title: '澶囨敞', width: 200 }
-                    , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
-                    , { field: 'hmaterid', title: 'hmaterid', width: 115, hide: true }
-                    , { field: '閰嶄欢浠g爜', title: '閰嶄欢浠g爜', width: 200 }
-                    , { field: '閰嶄欢鍚嶇О', title: '閰嶄欢鍚嶇О', width: 200 }
-                    , { field: 'hunitid', title: 'hunitid', width: 200, hide: true }
-                    , { field: '鍗曚綅浠g爜', title: '鍗曚綅浠g爜', width: 200 }
-                    , { field: '鍗曚綅鍚嶇О', title: '鍗曚綅鍚嶇О', width: 200 }
-                    , { field: '鐢ㄩ噺', title: '鐢ㄩ噺', width: 200 }
-                    , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 }
-                    , { field: '鏍囧噯鐢ㄩ噺', title: '鏍囧噯鐢ㄩ噺', width: 115 }
-                    , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 115 }
-                    , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
-                    , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200, hide: true }
-                    , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115, hide: true }
-                    , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200 }
-                    , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
-                    , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, hide: true }
-                    , { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true }
-                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true }
-                    , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
-                    , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200 }
-                    , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200, hide: true }
-                    , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 115, hide: true }
-                    , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
-                    , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
-                    , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
-                    , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
-                    , { field: 'hbilltype', title: 'hbilltype', width: 200 }
-                ]]
-            };
-
-            var index = layer.load(0);
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            //鍔犺浇鏁版嵁鍒扮綉鏍�
+            get_Display(sWhere);
 
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
+                    //鏂板鎸夐挳
                     case 'btn-Add':
-                        //椤甸潰灞�-鑷畾涔�
-                        layer.open({
-                            type: 2,
-                            skin: 'layui-layer-rim', //鍔犱笂杈规
-                            title: '鏂板妯″叿淇濆吇璁″垝鍗�',
-                            closeBtn: false,
-                            shift: 2,
-                            area: ['100%', '100%'],
-                            maxmin: true,
-                            content: '../妯℃不鍏风鐞�/Sc_Add_MouldMaintainPlanBillList.html',
-                            end: function () {
-                                //鍒锋柊椤甸潰,
-                                location.reload();
-                            },
-                            success: function (layero, index) {
-
-                            }
-                        });
+                        set_AddNew();
                         break;
                     case 'btn-Edit':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var hID = data[0].hmainid.toString();
-                            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                            layer.open({
-                                type: 2
-                                , area: ['100%', '100%']
-                                , title: '缂栬緫妯″叿淇濆吇璁″垝鍗�'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: '../妯℃不鍏风鐞�/Sc_Add_MouldMaintainPlanBillList.html?hID=' + hID
-                                , resize: false,
-                                end: function () {
-                                    //鍒锋柊椤甸潰,
-                                    location.reload();
-                                }
-                                , cancel: function () {
-                                    //$(".layui-btn").removeClass("layui-btn-disabled");
-                                }
-                            })
-
-                        } else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                        }
-
+                        set_ShowBill();
                         break;
                     case 'btn-Delete':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var HInterID = data[0].hmainid.toString();
-                       
-                            //閫昏緫鍒犻櫎鏂规硶
-                            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                                $.ajax({
-                                    type: "GET",
-                                    url: GetWEBURL() + "/Sc_MouldMaintainPlanBill/DeltetMouldMaintainPlanBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                    data: { "HInterID": HInterID },
-                                    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('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                        }
+                        set_DeleteBill();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit':
+                        set_CheckBill();
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_AbandonCheck();
+                        break;
+                    //棰勮鎸夐挳
+                    case 'btn-Print':
+                        get_PrintReport();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'btn-Close':
+                        parent.layui.admin.events.closeThisTabs();
                         break;
                 };
             });
 
-
-
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Sc_MouldMaintainPlanBill/GetMouldMaintainPlanBillList',
-                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 });
-                }
-            });
-
             //閲嶇疆鎸夐挳
-            //form.on('submit(btnReSearch)', function (data) {
-            //    $("#HBillType").val("");//鍗曟嵁绫诲瀷
-            //    $("#HBillNo").val("");//鍗曟嵁鍙�
-            //    $("#HSourceBillNo").val("");//婧愬崟鍙�
-            //    $("#HCreateBy").val("");//鍒跺崟浜�
-            //    $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-            //    $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            //    $("#btnSearch").click();
-            //});
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+            }
 
             //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
-                //var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
-                //var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
-                //var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜�
-                //var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
-                //var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿
-                //if (HBillNo) {
-                //    sWhere += " and HBillNo like '%" + HBillNo + "%'";
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(table, option);
+            });
+
+            //蹇�熻繃婊�
+            function get_FastQuery(table, option) {
+                //var HNumber = $("#HNumber").val();
+                //var HName = $("#HName").val();
+                //if (HNumber) {
+                //    sWhere += " and 鑱屽憳浠g爜 like '%" + HNumber + "%'";
                 //}
-                //if (HCreateBy) {
-                //    sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
-                //}
-                //if (BenginHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
-                //}
-                //if (EndHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
+                //if (HName) {
+                //    sWhere += " and 鑱屽憳鍚嶇О like '%" + HName + "%'";
                 //}
                 var index = layer.load(0);
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
+                        , { field: '鍛ㄦ湡鍗曚綅', title: '鍛ㄦ湡鍗曚綅', width: 200 }
+                        , { field: '淇濆吇鍛ㄦ湡', title: '淇濆吇鍛ㄦ湡', width: 200 }
+                        , { field: '璁″垝寮�濮嬫棩鏈�', title: '璁″垝寮�濮嬫棩鏈�', width: 200 }
+                        , { field: '璁″垝缁撴潫鏃ユ湡', title: '璁″垝缁撴潫鏃ユ湡', width: 200 }
+                        , { field: '鎽樿', title: '鎽樿', width: 200 }
+                        , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 }
+                        , { field: '澶囨敞', title: '澶囨敞', width: 200 }
+                        , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
+                        , { field: 'hmaterid', title: 'hmaterid', width: 115, hide: true }
+                        , { field: '閰嶄欢浠g爜', title: '閰嶄欢浠g爜', width: 200 }
+                        , { field: '閰嶄欢鍚嶇О', title: '閰嶄欢鍚嶇О', width: 200 }
+                        , { field: 'hunitid', title: 'hunitid', width: 200, hide: true }
+                        , { field: '鍗曚綅浠g爜', title: '鍗曚綅浠g爜', width: 200 }
+                        , { field: '鍗曚綅鍚嶇О', title: '鍗曚綅鍚嶇О', width: 200 }
+                        , { field: '鐢ㄩ噺', title: '鐢ㄩ噺', width: 200 }
+                        , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 }
+                        , { field: '鏍囧噯鐢ㄩ噺', title: '鏍囧噯鐢ㄩ噺', width: 115 }
+                        , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 115 }
+                        , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
+                        , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200, hide: true }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115, hide: true }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200 }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, hide: true }
+                        , { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true }
+                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200 }
+                        , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200, hide: true }
+                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 115, hide: true }
+                        , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
+                        , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
+                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
+                        , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
+                        , { field: 'hbilltype', title: 'hbilltype', width: 200 }
+                    ]]
+                }
+            }
+
+            var index = layer.load(0);
+            //鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板妯″叿淇濆吇璁″垝鍗�',
+                    closeBtn: false,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../妯℃不鍏风鐞�/Sc_Add_MouldMaintainPlanBillList.html',
+                    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].hmainid.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫妯″叿淇濆吇璁″垝鍗�'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../妯℃不鍏风鐞�/Sc_Add_MouldMaintainPlanBillList.html?hID=' + hID
+                        , 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 HInterID = data[0].hmainid.toString();
+
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/Sc_MouldMaintainPlanBill/DeltetMouldMaintainPlanBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": HInterID },
+                            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('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            };
+             //鍔犺浇缃戞牸
+            function get_Display(sWhere) {
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
                 $.ajax({
                     //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                    url: GetWEBURL1() + '/Sc_MouldMaintainPlanBill/GetMouldMaintainPlanBillList',
+                    url: GetWEBURL() + '/Sc_MouldMaintainPlanBill/GetMouldMaintainPlanBillList',
                     type: "GET",
-                    data: { "sWhere": sWhere},
+                    data: { "sWhere": sWhere },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
                             table.render(option);
                             layer.close(index);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
                             layer.close(index);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
                         layer.close(index);
-                        layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-                sWhere = "";
-                //$("#HBillType").val("");//鍗曟嵁绫诲瀷
-                //$("#HBillNo").val("");//鍗曟嵁鍙�
-                //$("#HSourceBillNo").val("");//婧愬崟鍙�
-                //$("#HCreateBy").val("");//鍒跺崟浜�
-                //$("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-                //$("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            });
-
-            //鐩戝惉琛屽弻鍑讳簨浠�
-            table.on('rowDouble(mainTable)', function (obj) {
-                layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
-            });
-
-
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
-
-
+            }
+            //瀹℃牳
+            function set_CheckBill() {
+            }
+            //鍙嶅鏍�
+            function set_AbandonCheck() {
+            }
             //浠ヤ笂鏄痩ayui妯″潡
         });
 
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html"
index 631d1e7..ef47151 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html"
@@ -14,6 +14,7 @@
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <style type="text/css">
         .layui-form-label {
@@ -108,7 +109,7 @@
                                                         <div class="layui-input-inline">
                                                             <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled autocomplete="off">
                                                             <input id="HInterID" name="HInterID" type="hidden" />
-                                                            
+
                                                         </div>
                                                     </div>
                                                     <div class="layui-inline">
@@ -333,20 +334,15 @@
         var HSourceEntryID = "";  //婧愬崟瀛愬唴鐮�
         var HSourceBillNo = "";   //婧愬崟鍗曞彿
         var HSourceBillType = "";  //婧愬崟绫诲瀷
-        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;
+        //鑾峰彇椤甸潰璺宠浆鍙傛暟  //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
+        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 HSBillType = params[params[2]];//婧愬崟绫诲瀷
         }
-
-        var params = getUrlVars();
-        var hID = params[params[0]];//缂栬緫鏌ョ湅
-        var Type = params[params[1]];//鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
 
         var edit = function (data) {
             HBillType = data[0].HBillType;
@@ -363,6 +359,7 @@
         }).extend({
             index: 'lib/index' //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            //#region 鍏敤鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -370,72 +367,78 @@
                 , form = layui.form
                 , laydate = layui.laydate
                 , element = layui.element;
+            //#endregion
 
-            //鏃ユ湡鏃堕棿閫夋嫨鍣�
-            laydate.render({
-                elem: '#HWorkBeginDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HWorkReportDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HMakeDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HUpDateDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HCheckDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HCloseDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HDeleteDate'
-                , type: 'datetime'
-            });
+            //鍒濆鍖栬〃鍗曟彃浠�
+            set_InitFrom();
 
-            //鍒濆鍩烘湰淇℃伅璧嬪��
-            $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
-            $("#HWorkReportDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //鎶ュ伐鏃ユ湡
-            $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒跺崟鏃ユ湡
-            $("#HMaker").val(sessionStorage["HUserName"]);     //鍒跺崟浜�
 
-            //鍒ゆ柇鏄惁鏂板
-            if (hID == null || hID == 0) {
-                //鑾峰彇鏈�澶у崟鎹彿 new
-                $("#HInterID").val("0");
-                $("#HBillNo").val("");
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetMAXNum",
-                    type: "GET",
-                    data: { "HBillType": '3724' },
-                    success: function (d) {
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                        $("#HInterID").val(0);
-                    }
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
+            }
+            else if (OperationType == 2) {//鏈夋簮鍗�
+                set_AddNew();
+            }
+            else if (OperationType == 3) {//缂栬緫
+                var HICMOInID = params[params[3]];//鐢熶骇璁㈠崟涓讳富ID
+                var HICMOEnID = params[params[4]];//鐢熶骇璁㈠崟瀛怚D
+                set_EditFromGrid(linterid, HICMOInID, HICMOEnID);
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+
+            //鍒濆鍖栨彃浠�
+            function set_InitFrom() {
+                //鏃ユ湡鏃堕棿閫夋嫨鍣�
+                laydate.render({
+                    elem: '#HWorkBeginDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HWorkReportDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HMakeDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HUpDateDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HCheckDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HCloseDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HDeleteDate'
+                    , type: 'datetime'
                 });
             }
-            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
-                $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
-                RoadBillMain(hID);
-                /* RoadBillSub(linterid);*/
+
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew()
+            {
+
             }
 
-
             //鏈夋簮鍗曟柊澧�
-            if (Type == 2)
-            {
+            function set_AddNew() {
+                //鍒濆鍩烘湰淇℃伅璧嬪��
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
+                $("#HWorkReportDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //鎶ュ伐鏃ユ湡
+                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒跺崟鏃ユ湡
+                $("#HMaker").val(sessionStorage["HUserName"]);     //鍒跺崟浜�
 
                 //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
                 $('#HICMOBillNo').attr("disabled", true);
@@ -445,13 +448,13 @@
                 $('#HMaterCode').attr("disabled", true);
                 $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
                 $('#HMaterName').attr("disabled", true);
-                $('#HMaterSpec').attr("disabled", true); 
-                $('#HPlanQty').attr("disabled", true); 
+                $('#HMaterSpec').attr("disabled", true);
+                $('#HPlanQty').attr("disabled", true);
                 $('#HSourceName').attr("disabled", true);
                 $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
                 $('#HWorkBeginDate').attr("disabled", true);
                 $('#HWorkReportDate').attr("disabled", true);
-             
+
                 $.ajax(
                     {
                         type: "GET",
@@ -480,14 +483,14 @@
                                 $("#HSourceInterID").val(LoadData[0].HSourceInterID); //婧愬崟涓诲唴鐮�(鍙栧�糎InterID)
                                 $("#HSourceEntryID").val(LoadData[0].HSourceEntryID); //婧愬崟瀛愬唴鐮�(婧愬崟琛屽彿)
                                 $("#HSourceBillType").val(HSourceBillType); //婧愬崟绫诲瀷
-                                $("#HDeptID").val(LoadData[0].HDeptID); //杞﹂棿ID
-                                $("#HDeptName").val(LoadData[0].HDeptName); //杞﹂棿
+                                $("#HGroupID").val(LoadData[0].HDeptID); //鐝粍ID
+                                $("#HGroupName").val(LoadData[0].HDeptName); //鐝粍
                                 $("#HICMOInterID").val(LoadData[0].HICMOInterID); //鐢熶骇璁㈠崟ID
                                 $("#HICMOEntryID").val(LoadData[0].HICMOEntryID); //鐢熶骇璁㈠崟瀛怚D
                                 $("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //鐢熶骇璁㈠崟
                                 $("#HWorkBeginDate").val(LoadData[0].HBeginDate); //寮�宸ユ椂闂�
                                 $("#HPlanQty").val(LoadData[0].HDatePlanQty); //璁″垝鏁伴噺
-                             
+
                             }
                             else {
                                 layer.alert(data.Message, { icon: 5 });
@@ -500,21 +503,144 @@
                     });
             }
 
-            //淇濆瓨鎻愪氦
-            form.on('submit(Saver)', function (data)
+            //缂栬緫
+            function set_EditFromGrid(linterid, HICMOInID, HICMOEnID)
             {
+                //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
+                $('#HICMOBillNo').attr("disabled", true);
+                $('#HSourceBillNo').attr("disabled", true);
+                $('#HProcExchBillNo').attr("disabled", true);
+                $('#HProcName').attr("disabled", true);
+                $('#HMaterCode').attr("disabled", true);
+                $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#HMaterName').attr("disabled", true);
+                $('#HMaterSpec').attr("disabled", true);
+                $('#HPlanQty').attr("disabled", true);
+                $('#HSourceName').attr("disabled", true);
+                $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#HWorkBeginDate').attr("disabled", true);
+                $('#HWorkReportDate').attr("disabled", true);
+               
+                $.ajax(
+                    {
+                        type: "GET",
+                        url: GetWEBURL() + "/Sc_MESProductReportBill/Get_Sc_MESProductReportEditBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: {
+                            "linterid": linterid,
+                            "HICMOInID": HICMOInID,
+                            "HICMOEnID": HICMOEnID,
+                        },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            {
+                                var LoadData = data.data.h_v_IF_ICMOBillWorkQtyStatus_Tmp;
+                                $("#HInterID").val(LoadData[0].HInterID); //鍗曟嵁ID
+                                $("#HBillNo").val(LoadData[0].鍗曟嵁鍙�); //鍗曟嵁鍙�
+                                $("#HDate").val(formatDate(LoadData[0].鏃ユ湡)); //鏃ユ湡
+                                $("#HProcID").val(""); //褰撳墠宸ュ簭ID
+                                $("#HProcName").val(""); //褰撳墠宸ュ簭
+                                $("#HMaterID").val(LoadData[0].HMaterID); //浜у搧ID
+                                $("#HMaterCode").val(LoadData[0].浜у搧浠g爜); //浜у搧浠g爜
+                                $("#HMaterName").val(LoadData[0].浜у搧鍚嶇О); //浜у搧鍚嶇О
+                                $("#HMaterSpec").val(LoadData[0].浜у搧瑙勬牸); //浜у搧瑙勬牸
+                                $("#HSourceID").val(LoadData[0].HSourceID); //鐢熶骇璧勬簮ID
+                                $("#HSourceName").val(LoadData[0].鐢熶骇璧勬簮); //鐢熶骇璧勬簮
+                                $("#HSourceBillNo").val(LoadData[0].婧愬崟鍗曞彿); //婧愬崟鍗曞彿锛堟殏鏃跺彇鍊艰鍗曠紪鍙凤級
+                                $("#HSourceInterID").val(LoadData[0].HSourceInterID); //婧愬崟涓诲唴鐮�(鍙栧�糎InterID)
+                                $("#HSourceEntryID").val(LoadData[0].HSourceEntryID); //婧愬崟瀛愬唴鐮�(婧愬崟琛屽彿)
+                                $("#HSourceBillType").val(LoadData[0].婧愬崟绫诲瀷); //婧愬崟绫诲瀷
+                                $("#HGroupID").val(LoadData[0].HDeptID); //鐝粍ID
+                                $("#HGroupName").val(LoadData[0].鐢熶骇鐝粍); //鐝粍
+                                $("#HWorkManID").val(LoadData[0].HWorkManID); //鎿嶄綔鍛業D
+                                $("#HWorkManName").val(LoadData[0].鎿嶄綔鍛�); //鎿嶄綔鍛�
+                                $("#HICMOInterID").val(LoadData[0].HICMOInterID); //鐢熶骇璁㈠崟ID
+                                $("#HICMOEntryID").val(LoadData[0].HICMOEntryID); //鐢熶骇璁㈠崟瀛怚D
+                                $("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //鐢熶骇璁㈠崟
+                                $("#HWorkBeginDate").val(formatDate(LoadData[0].寮�宸ユ椂闂�)); //寮�宸ユ椂闂�
+                                $("#HWorkReportDate").val(formatDate(LoadData[0].鎶ュ伐鏃堕棿)); //鎶ュ伐鏃堕棿
+                                $("#HPlanQty").val(LoadData[0].HDatePlanQty); //璁″垝鏁伴噺
+                                $("#HQty").val(LoadData[0].姹囨姤鏁伴噺); //鎶ュ伐鏁伴噺
+                                $("#HBadQty").val(LoadData[0].涓嶈壇鏁伴噺); //涓嶈壇鏁伴噺
+                                $("#HWasterQty").val(LoadData[0].鎶ュ簾鏁伴噺); //鎶ュ簾鏁伴噺
+                                $("#HMaker").val(LoadData[0].鍒跺崟浜�); //鍒跺崟浜�
+                                $("#HMakeDate").val(formatDate(LoadData[0].鍒跺崟鏃ユ湡)); //鍒跺崟鏃ユ湡
+                                $("#HUpDater").val(sessionStorage["HUserName"]); //淇敼浜�
+                                $("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //淇敼鏃ユ湡
+                                $("#HChecker").val(LoadData[0].瀹℃牳浜�); //瀹℃牳浜�
+                                $("#HCheckDate").val(formatDate(LoadData[0].瀹℃牳鏃ユ湡)); //瀹℃牳鏃ユ湡
+                                $("#HCloseMan").val(LoadData[0].鍏抽棴浜�); //鍏抽棴浜�
+                                $("#HCloseDate").val(formatDate(LoadData[0].鍏抽棴鏃ユ湡)); //鍏抽棴鏃ユ湡
+                                $("#HDeleteMan").val(LoadData[0].浣滃簾浜�); //浣滃簾浜�
+                                $("#HDeleteDate").val(formatDate(LoadData[0].浣滃簾鏃ユ湡)); //浣滃簾鏃ユ湡
+
+                            }
+                            else {
+                                layer.alert(data.Message, { icon: 5 });
+
+                            }
+                        },
+                        error: function (err) {
+                            layer.alert(err, { icon: 5 });
+                        }
+                    });
+            }
+
+
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == 0) {
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("0");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '3724' },
+                    success: function (d) {
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HInterID").val(0);
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+            }
+
+            //缂栬緫鑾峰彇琛ㄤ綋鏃舵椂闂存牸寮忕煫姝f柟寮�
+            function formatDate(date) {
+                var d = new Date(date),
+                    month = '' + (d.getMonth() + 1).toString(),
+                    day = '' + d.getDate().toString(),
+                    year = d.getFullYear().toString(),
+                    h = d.getHours().toString(),
+                    mm = d.getMinutes().toString(),
+                    s = d.getSeconds().toString();
+
+                if (month.length < 2) month = '0' + month;
+                if (day.length < 2) day = '0' + day;
+                if (h.length < 2) h = '0' + h;
+                if (mm.length < 2) mm = '0' + mm;
+                if (s.length < 2) s = '0' + s;
+
+                return [year, month, day].join('-') + " " + [h, mm, s].join(':');
+            }
+
+
+
+            //淇濆瓨鎻愪氦
+            form.on('submit(Saver)', function (data) {
                 if (!AllowLoadData())//鏁版嵁楠岃瘉
                 {
                     return false;
                 }
                 OverStepQty(data);
-              
+
             });
 
             //閫�鍑�
             form.on('submit(Exit)', function (data) {
-                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+                Pub_Close(1);
             });
 
 
@@ -678,6 +804,13 @@
             //楠岃瘉姹囨姤鏁伴噺鏄惁瓒呰繃璁″垝鏁伴噺
             function OverStepQty(data) {
                 var sWhere = "";
+                if (OperationType == 3) //缂栬緫
+                {
+                    HSourceInterID = $("#HSourceInterID").val();
+                    HSourceEntryID = $("#HSourceEntryID").val();
+                    HSourceBillNo = $("#HSourceBillNo").val();
+                    HSourceBillType = $("#HSourceBillType").val();
+                }
                 sWhere = " where  HSourceID='" + $("#HSourceID").val() + "' and  HSourceInterID='" + HSourceInterID + "' and HSourceEntryID='" + HSourceEntryID + "' and HSourceBillNo='" + HSourceBillNo + "' and HSourceBillType='" + HSourceBillType + "' ";
                 $.ajax({
                     url: GetWEBURL() + "/Sc_MESBeginWorkBill/GetMESOverStepQty",
@@ -714,8 +847,7 @@
             }
 
             //鎻愪氦璇锋眰ajax
-            function Submit(data)
-            {
+            function Submit(data) {
                 if (data.field.HBadQty == "" || data.field.HBadQty == null) {
                     data.field.HBadQty = 0;
                 }
@@ -723,7 +855,7 @@
                     data.field.HWasterQty = 0;
                 }
                 var sMainStr = JSON.stringify(data.field);
-            
+
 
                 $.ajax({
                     type: "POST",
@@ -750,8 +882,8 @@
             //浠ヤ笂涓簂ayui妯″潡
         });
 
-         //闈炵┖楠岃瘉
-        function AllowLoadData() { 
+        //闈炵┖楠岃瘉
+        function AllowLoadData() {
             var Result = true;
             if ($("#HBillNo").val() == '' || $("#HBillNo").val() == null) {
                 layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -788,7 +920,7 @@
             if ($("#HGroupID").val() == '' || $("#HGroupID").val() == null) {
                 layer.msg("鐝粍涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return Result = false;
-            }          
+            }
             if ($("#HICMOInterID").val() == '' || $("#HICMOInterID").val() == null) {
                 layer.msg("鐢熶骇璁㈠崟涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return Result = false;
@@ -796,9 +928,9 @@
             return Result;
         }
 
-       
 
-      
+
+
     </script>
 </body>
 </html>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_ProductReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_ProductReportBillList.html"
index cdb9be5..feefcd4 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_ProductReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_ProductReportBillList.html"
@@ -13,7 +13,12 @@
             padding-right: 15px;
             cursor: pointer;
         }
-      
+        #top-title 
+        {
+            margin: 0 30%;
+            font-size: 24px;
+            font-weight: bold;
+        }
     </style>
     <script src="../../../layuiadmin/layui/layui.js"></script>
 
@@ -24,10 +29,10 @@
             <div class="layui-card" style="padding: 1px">
                 <form class="layui-form" action="" lay-filter="component-form-group">
                     <div class="layui-card-header">
-                        <button type="button" class="layui-btn" lay-submit="" lay-filter="Delete"><i class="layui-icon layui-icon-add"></i>鍒犻櫎</button>
+                        <button type="button" class="layui-btn" lay-submit="" lay-filter="Delete" id="Delete"><i class="layui-icon layui-icon-add"></i>鍒犻櫎</button>
                         <button type="button" class="layui-btn" lay-submit="" lay-filter="AskReport" id="AskReport"><i class="layui-icon layui-icon-add"></i>鐢宠妫�楠�</button>
-                        <button type="button" class="layui-btn" lay-submit="" lay-filter="Exit"><i class="layui-icon layui-icon-add"></i>閫�鍑�</button>
-                        <span style="margin:0 30%;font-size:24px;font-weight:bold;">浜ч噺姹囨姤</span>
+                        <button type="button" class="layui-btn" lay-submit="" lay-filter="Exit" id="Exit"><i class="layui-icon layui-icon-add"></i>閫�鍑�</button>
+                        <span  id="top-title">浜ч噺姹囨姤</span>
                     </div>
                     <div class="layui-card-body" style="padding: 1px;">
 
@@ -113,6 +118,7 @@
     <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 workcode = "";  //宸ュ崟鍙�
@@ -121,21 +127,6 @@
         var HICMOEntryID = ""; //鐢熶骇璁㈠崟瀛怚D
         var HSourceBillType = ""; //婧愬崟绫诲瀷
         var SchWhere = ""; //鎸夐挳鏌ヨ鍙傛暟
-        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 Type = params[params[1]];//鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
-
         var edit = function (data) {
             workcode = data[0].workcode;
             HSourceID = data[0].HSourceID;
@@ -146,12 +137,24 @@
             Czybm = data[0].Czybm;
             HSourceBillType = data[0].HSourceBillType;
         }
+        //鑾峰彇椤甸潰璺宠浆鍙傛暟  //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
+        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', 'table', 'element', 'laypage','laydate'], function () {
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+            //#region 鍏敤鍙橀噺
             var $ = layui.$
             , admin = layui.admin
             , layer = layui.layer
@@ -162,49 +165,73 @@
                 , laydate = layui.laydate
 
             var sWhere = "";
+            var option = [];
+            //#endregion
 
-            var option = {
-                elem: '#mainTable'
-                ,height: 'full-50'
-                , page: true
-                ,cellMinWidth: 90
-                , cols: [[
-                     { type: 'checkbox', fixed: 'left' }
-                    , { field: 'HInterID', title: 'HInterID', sort: true, hide: true, width: 200}
-                    , { field: 'HDate', title: '鏃ユ湡', width: 200, templet: "<div>{{d.HDate ==null ?'':layui.util.toDateString(d.HDate, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 200}
-                    , { field: 'HBillType', title: '鍗曟嵁绫诲瀷', width: 200 }
-                    , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', width: 200 }
-                    , { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟涓籌D', width: 200, hide: true}
-                    , { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛怚D', width: 200, hide: true}
-                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 200 }
-                    , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true}
-                    , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true}
-                    , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 200 }
-                    , { field: 'HMaterID', title: '浜у搧ID', width: 200, hide: true}
-                    , { field: 'HMaterCode', title: '浜у搧浠g爜', width: 200 }
-                    , { field: 'HMaterName', title: '浜у搧鍚嶇О', width: 200 }
-                    , { field: 'HMaterSpec', title: '浜у搧瑙勬牸', width: 200 }
-                    , { field: 'HQty', title: '姹囨姤鏁伴噺', width: 200 }
-                    , { field: 'HSourceID', title: '鐢熶骇璧勬簮ID', width: 200, hide: true}
-                    , { field: 'HSourceCode', title: '鐢熶骇璧勬簮浠g爜', width: 200 }
-                    , { field: 'HSourceName', title: '鐢熶骇璧勬簮', width: 200 }
-                    , { field: 'HGroupID', title: '鐢熶骇鐝粍ID', width: 200, hide: true}
-                    , { field: 'HGroupCode', title: '鐢熶骇鐝粍浠g爜', width: 200 }
-                    , { field: 'HGroupName', title: '鐢熶骇鐝粍鍚嶇О', width: 200 }
-                    , { field: 'HWorkManID', title: '鎿嶄綔鍛業D', width: 200, hide: true}
-                    , { field: 'HWorkManName', title: '鎿嶄綔鍛�', width: 200 }
-                    , { field: 'HMaker', title: '鍒跺崟浜�', width: 200 }
-                    , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 160, templet: "<div>{{d.HMakeDate ==null ?'':layui.util.toDateString(d.HMakeDate, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: 'HReportType', title: '姹囨姤绫诲瀷', width: 200 }
-                ]]
-            };
-           
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
 
-            //鏈夋簮鍗曟柊澧�
-            if (Type == 2)
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+           if (OperationType == 2) {//鏈夋簮鍗�
+
+                //鎶ュ伐骞冲彴鎶ユ鐢宠鏌ョ湅鍒楄〃
+                set_AddNew();
+            }
+
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+
+            //#endregion
+
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid()
             {
-                sWhere = " where a.HSourceID='" + HSourceID + "' and a.HICMOBillNo='" + workcode + "' and HICMOInterID='" + (HICMOInterID == "null" ? 0 : HICMOInterID) + "' and HICMOEntryID='" + (HICMOEntryID == "null"?0: HICMOEntryID) + "' and HMaker='" + HMaker + "' ";
+                 option = {
+                    elem: '#mainTable'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'HInterID', title: 'HInterID', sort: true, hide: true, width: 200 }
+                        , { field: 'HDate', title: '鏃ユ湡', width: 200, templet: "<div>{{d.HDate ==null ?'':layui.util.toDateString(d.HDate, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 200 }
+                        , { field: 'HBillType', title: '鍗曟嵁绫诲瀷', width: 200 }
+                        , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', width: 200 }
+                        , { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟涓籌D', width: 200, hide: true }
+                        , { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛怚D', width: 200, hide: true }
+                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 200 }
+                        , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
+                        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
+                        , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 200 }
+                        , { field: 'HMaterID', title: '浜у搧ID', width: 200, hide: true }
+                        , { field: 'HMaterCode', title: '浜у搧浠g爜', width: 200 }
+                        , { field: 'HMaterName', title: '浜у搧鍚嶇О', width: 200 }
+                        , { field: 'HMaterSpec', title: '浜у搧瑙勬牸', width: 200 }
+                        , { field: 'HQty', title: '姹囨姤鏁伴噺', width: 200 }
+                        , { field: 'HSourceID', title: '鐢熶骇璧勬簮ID', width: 200, hide: true }
+                        , { field: 'HSourceCode', title: '鐢熶骇璧勬簮浠g爜', width: 200 }
+                        , { field: 'HSourceName', title: '鐢熶骇璧勬簮', width: 200 }
+                        , { field: 'HGroupID', title: '鐢熶骇鐝粍ID', width: 200, hide: true }
+                        , { field: 'HGroupCode', title: '鐢熶骇鐝粍浠g爜', width: 200 }
+                        , { field: 'HGroupName', title: '鐢熶骇鐝粍鍚嶇О', width: 200 }
+                        , { field: 'HWorkManID', title: '鎿嶄綔鍛業D', width: 200, hide: true }
+                        , { field: 'HWorkManName', title: '鎿嶄綔鍛�', width: 200 }
+                        , { field: 'HMaker', title: '鍒跺崟浜�', width: 200 }
+                        , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 160, templet: "<div>{{d.HMakeDate ==null ?'':layui.util.toDateString(d.HMakeDate, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: 'HReportType', title: '姹囨姤绫诲瀷', width: 200 }
+                    ]]
+                };
+            }
+
+            //鎶ュ伐骞冲彴杩涘叆(鏈夋簮鍗�)
+            function set_AddNew()
+            {
+                sWhere = " where a.HSourceID='" + HSourceID + "' and a.HICMOBillNo='" + workcode + "' and HICMOInterID='" + (HICMOInterID == "null" ? 0 : HICMOInterID) + "' and HICMOEntryID='" + (HICMOEntryID == "null" ? 0 : HICMOEntryID) + "' and HMaker='" + HMaker + "' ";
                 SchWhere = sWhere;
                 console.log(sWhere);
                 //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
@@ -216,19 +243,18 @@
                         if (data1.count == 1) {
                             option.data = data1.data;
                             table.render(option);
-                            
+
                         } else {
                             layer.close(index);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                         sWhere = "";
                     }, error: function () {
-                        
+
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
             }
-           
 
             //鍒犻櫎鎸夐挳
             form.on('submit(Delete)', function (data)
@@ -237,12 +263,14 @@
                     , data = checkStatus.data;
                 if (checkStatus.data.length === 1) {
                     var InterID = data[0].HInterID.toString();
+                    var HICMOInID = data[0].HICMOInterID.toString();
+                    var HICMOEnID = data[0].HICMOEntryID.toString();
                     //閫昏緫鍒犻櫎鏂规硶
                     layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
                         $.ajax({
                             type: "GET",
                             url: GetWEBURL() + "Sc_MESBeginWorkBill/DeltetMESProductReportBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            data: { "HInterID": InterID, "HICMOInterID": HICMOInterID, "HICMOEntryID": HICMOEntryID },
+                            data: { "HInterID": InterID, "HICMOInterID": HICMOInID, "HICMOEntryID": HICMOEnID },
                             success: function (result) {
                                 if (result.count == 1) {
                                     layer.msg(result.Message, { time: 1 * 2000, icon: 1 });
@@ -271,7 +299,7 @@
 
             //鐢宠妫�楠�
             form.on('submit(AskReport)', function (data)
-            {               
+            {
                 var TabData = table.cache['mainTable'];
                 if (TabData == undefined)
                 {
@@ -281,11 +309,12 @@
                 if (TabData.length <= 0) {
                     return layer.alert("鏃犱骇閲忔眹鎶ユ暟鎹紒", { icon: 5 })
                 }
+               
                 $.ajax(
                     {
-                        type: "GET",
+                        type: "Get",
                         url: GetWEBURL() + "/Sc_MESBeginWorkBill/SaveGetMESProductReportBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        async: false,
+                        async: true,
                         data: { "ScMaxWork": ScMaxWork(), "HSourceBillType": HSourceBillType, "workcode": workcode, "HSourceID": HSourceID, "HICMOInterID": (HICMOInterID == "null" ? 0 : HICMOInterID), "HICMOEntryID": (HICMOEntryID == "null" ? 0 : HICMOEntryID), "HMaker": HMaker, "Czybm": Czybm },
                         dataType: "json",
                         beforeSend: function () {
@@ -293,26 +322,28 @@
                         },
                         success: function (data) {
                             if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $('#AskReport').removeClass("layui-btn-disabled").attr("disabled", false);
                                 layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
                                     layer.close(layer.index);
                                     window.parent.location.reload();
                                 });
                             }
                             else {
-                               layer.alert(data.Message, { icon: 5 })
+                                layer.alert(data.Message, { icon: 5 })
+                                $('#AskReport').removeClass("layui-btn-disabled").attr("disabled", false);
                             }
                         },
                         error: function (err) {
                             layer.alert(data.Message, { icon: 5 })
+                            $('#AskReport').removeClass("layui-btn-disabled").attr("disabled", false);
                         }
                     });
             })
 
             //閫�鍑�
-            //鍒犻櫎鎸夐挳
-            form.on('submit(Exit)', function (data) {
-                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+            form.on('submit(Exit)', function (data)
+            {
+               Pub_Close(1);  //鍏抽棴寮圭獥
             })
 
 
@@ -326,15 +357,13 @@
             });
 
             //鏌ヨ鎸夐挳
-            if (Type == 2) {
-                form.on('submit(btnSearch)', function (data) {
+            form.on('submit(btnSearch)', function (data) {
                     var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
                     var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
                     var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
                     var Part = $("#Part").val();       //鐗╂枡淇℃伅
                     var Source = $("#Source").val();  //璧勬簮
                     sWhere += SchWhere;
-                    
                     if (HDate) {
                         sWhere += " and CONVERT(varchar(100),a.HDate, 23) >= '" + HDate + "'";
                     }
@@ -359,7 +388,7 @@
                             if (data1.count == 1) {
                                 option.data = data1.data;
                                 table.render(option);
-                                layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+
                             } else {
                                 layer.alert(data1.code + data1.Message, { icon: 5 });
                             }
@@ -369,7 +398,8 @@
                     });
                     sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
                 });
-            }
+
+           // #endregion
             //浠ヤ笂鏄痩ayui妯″潡
         });
 
@@ -386,7 +416,6 @@
                     ScMaxWork = d.data[0].HBillNo;
                 }
             });
-            console.log(ScMaxWork);
             return ScMaxWork;
         }
     </script>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_ProductReportBillList_Web.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_ProductReportBillList_Web.html"
new file mode 100644
index 0000000..8853067
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_ProductReportBillList_Web.html"
@@ -0,0 +1,437 @@
+锘�<!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">
+    <style>
+        .layui-form-select .layui-input {
+            padding-right: 15px;
+            cursor: pointer;
+        }
+
+        #top-title {
+            margin: 0 30%;
+            font-size: 24px;
+            font-weight: bold;
+        }
+    </style>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-card-header">
+                        <span id="top-title">浜ч噺姹囨姤鍗�</span>
+                    </div>
+                    <div class="layui-card-body" style="padding: 1px;">
+
+
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" id="HDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" id="HDate1" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鐗╂枡淇℃伅</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="Part" id="Part" style="width:190px;">
+                                    </div>
+                                </div>
+
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                                <div class="layui-colla-content">
+                                    <div class="layui-inline">
+                                        <div class="layui-inline">
+                                            <span>鍏朵粬鏉′欢></span>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鐢熶骇璧勬簮</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="Source" id="Source" style="width:190px;">
+                                        </div>
+                                    </div>
+
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Add" id="btn-Add" disabled><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" style="display:none;"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" style="display:none;"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload" style="display:none;"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm" style="display:none;"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back" style="display:none;"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details" style="display:none;"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate" style="display:none;"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit" style="display:none;"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+
+
+                            </div>
+                        </script>
+                    </div>
+                </form>
+            </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 workcode = "";  //宸ュ崟鍙�
+        var HSourceID = ""; //璧勬簮ID
+        var HICMOInterID = ""; //鐢熶骇璁㈠崟涓籌D
+        var HICMOEntryID = ""; //鐢熶骇璁㈠崟瀛怚D
+        var HSourceBillType = ""; //婧愬崟绫诲瀷
+        var SchWhere = ""; //鎸夐挳鏌ヨ鍙傛暟
+
+        //鑾峰彇椤甸潰璺宠浆鍙傛暟  //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        } 
+
+        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 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+           if (OperationType == 1) {//鏃犳簮鍗�
+                //鎶ュ伐骞冲彴鎶ユ鐢宠鏌ョ湅鍒楄〃
+               set_ClearBill();
+            }
+
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //鏂板鎸夐挳
+                    case 'btn-Add': //set_AddNew();
+                        break;
+                    //缂栬緫鎸夐挳
+                    case 'btn-Edit': set_ShowBill();
+                        break;
+                    //鍒犻櫎鎸夐挳
+                    case 'btn-Delete': set_DeleteBill();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(1);
+                        break;
+                };
+            });
+
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                $("#HDate").val("");//寮�濮嬫棩鏈�
+                $("#HDate1").val("");//缁撴潫鏃ユ湡
+                $("#HBillNo").val("");
+                $("#Part").val("");
+                $("#Source").val("");
+            });
+        //#endregion
+
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+
+            }
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid()
+            {
+               
+                 
+                $("#top-title").css({ margin: "0 46%"});
+                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+                 option = {
+                     elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'HInterID', title: 'HInterID', sort: true, hide: true, width: 200 }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200 }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 200, templet: "<div>{{d.HDate ==null ?'':layui.util.toDateString(d.HDate, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 200 }
+                        , { field: 'HMaterID', title: '浜у搧ID', width: 200, hide: true }
+                        , { field: '浜у搧浠g爜', title: '浜у搧浠g爜', width: 200 }
+                        , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 200 }
+                        , { field: '浜у搧瑙勬牸', title: '浜у搧瑙勬牸', width: 200 }
+                        , { field: '姹囨姤鏁伴噺', title: '姹囨姤鏁伴噺', width: 200 }
+                        , { field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width: 200 }
+                        , { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟涓籌D', width: 200, hide: true }
+                        , { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛怚D', width: 200, hide: true }
+                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
+                        , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
+                        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
+                        , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
+                        , { field: 'HSourceID', title: '鐢熶骇璧勬簮ID', width: 200, hide: true }
+                        , { field: '鐢熶骇璧勬簮浠g爜', title: '鐢熶骇璧勬簮浠g爜', width: 200 }
+                        , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 200 }
+                        , { field: 'HGroupID', title: '鐢熶骇鐝粍ID', width: 200, hide: true }
+                        , { field: '鐢熶骇鐝粍浠g爜', title: '鐢熶骇鐝粍浠g爜', width: 200 }
+                        , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍', width: 200 }
+                        , { field: 'HWorkManID', title: '鎿嶄綔鍛業D', width: 200, hide: true }
+                        , { field: '鎿嶄綔鍛�', title: '鎿嶄綔鍛�', width: 200 }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '淇敼浜�', title: '淇敼浜�', width: 200 }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 }
+                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: 'HReportType', title: '姹囨姤绫诲瀷', width: 200 }
+                        , { field: 'HRelationInterID', title: '鏄惁鎶ユ鐢宠', width: 200, hide: true }
+                    ]]
+                };
+            }
+
+            //鏌ヨ鏁版嵁
+            function get_Display(sWhere)
+            {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+                    url: GetWEBURL() + '/Sc_MESProductReportBill/Get_Sc_MESProductReportBillList',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    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 });
+                    }
+                });
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+
+            // 蹇�熻繃婊�
+            function get_FastQuery() {
+                var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
+                var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
+                var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+                var Part = $("#Part").val();       //鐗╂枡淇℃伅
+                var Source = $("#Source").val();  //璧勬簮
+                sWhere += SchWhere;
+                if (HDate) {
+                    sWhere += " and CONVERT(varchar(100),a.HDate, 23) >= '" + HDate + "'";
+                }
+                if (HDate1) {
+                    sWhere += " and CONVERT(varchar(100),a.HDate, 23) <= '" + HDate1 + "'";
+                }
+                if (HBillNo) {
+                    sWhere += " and a.HBillNo like '%" + HBillNo + "%'";
+                }
+                if (Part) {
+                    sWhere += " and concat(m.HNumber,m.HName,m.HModel) like '%" + Part + "%'";
+                }
+                if (Source) {
+                    sWhere += " and s.HName like '%" + Dept + "%'";
+                }
+
+                get_Display(sWhere);
+                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+                sWhere = "";
+            }
+
+            //鏂板
+            function set_AddNew()
+            {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    area: ['100%', '100%'],
+                    title: '浜ч噺姹囨姤-鏂板',
+                    shift: 0,
+                    content: '../浜ч噺姹囨姤鍗�/Sc_Add_ProductReportBillList.html?OperationType=1&linterid=&HSouceBillType=',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    }
+                });
+            }
+
+            //缂栬緫
+            function set_ShowBill()
+            {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    console.log(data[0]);
+                    var HInterID = data[0].HInterID;
+                    var HICMOInID = data[0].HICMOInterID;
+                    var HICMOEnID = data[0].HICMOEntryID;
+                    var HRelationInterID = data[0].HRelationInterID;
+                    if (HRelationInterID == 1) {
+                        layer.msg('鍗曟嵁宸叉姤妫�瀹℃牳鏃犳硶淇敼锛�');
+                        return false;
+                    }
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫浜ч噺姹囨姤'
+                        , closeBtn: 1
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../浜ч噺姹囨姤鍗�/Sc_Add_ProductReportBillList.html?OperationType=3&linterid=' + HInterID + '&HSouceBillType=&HICMOInID=' + HICMOInID + '&HICMOEnID=' + HICMOEnID + '&HRelationInterID=' + HRelationInterID+''
+                        , 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 InterID = data[0].HInterID.toString();
+                    var HICMOInID = data[0].HICMOInterID.toString();
+                    var HICMOEnID = data[0].HICMOEntryID.toString();
+                    var HRelationInterID = data[0].HRelationInterID.toString();
+                    if (HRelationInterID == 1) {
+                        layer.msg('鍗曟嵁宸叉姤妫�瀹℃牳鏃犳硶鍒犻櫎锛�');
+                        return false;
+                    }
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "Sc_MESBeginWorkBill/DeltetMESProductReportBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": InterID, "HICMOInterID": HICMOInID, "HICMOEntryID": HICMOEnID },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 2000, icon: 1 });
+                                    table.reload('mainTable', {
+                                        page: {
+                                            curr: 1 //閲嶆柊浠庣涓�椤靛紑濮�
+                                        }
+                                    })
+                                    return false;
+
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                    return false;
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                return false;
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+          
+
+
+           // #endregion
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+
+       
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 7b5486f..75fc162 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -66,13 +66,13 @@
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
-
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_pushDown" id="set_pushDown"><i class="layui-icon layui-icon-form"></i>涓嬫帹</button>
                             </div>
                         </script>
                     </form>
@@ -103,13 +103,14 @@
 
             var option = {
                 elem: '#mainTable'
-                //, toolbar: '#toolbarDemo'
+                , toolbar: '#toolbarDemo'
                 ,height: 'full-50' 
                 , page: true
                 ,cellMinWidth: 90
                 , cols: [[
+                    { type: 'checkbox', fixed: 'left' }
                     //{ field: 'hmainid', title: 'hmainid', sort: true, width: 165 }
-                    { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 120 }
+                    , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 120 }
                     , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
                     , { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�', width: 105 }
                     //, { field: 'HDeptID', title: 'HDeptID' }
@@ -238,7 +239,32 @@
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             });
 
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //涓嬫帹
+                    case 'set_pushDown': set_pushDown();
+                        break;
+                };
+            });
 
+            //涓嬫帹鍗曟嵁
+            function set_pushDown() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (data.length === 1) {
+                    var linterid = data[0].hmainid.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '宸ュ簭娴佽浆鍗�-缂栬緫'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html?OperationType=2&linterid=' + linterid + '&HSouceBillType=3772'
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
             //laydate.render({
             //    elem: '#HDate'
             //    , type: 'datetime'
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
index 0a49c22..647e73c 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
@@ -14,6 +14,7 @@
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <style type="text/css">
         .layui-form-label {
@@ -87,6 +88,7 @@
                             <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" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="VerIfySaver">瀹℃牳</button>
                                 <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
                             </div>
 
@@ -335,20 +337,15 @@
         var HSourceEntryID = "";  //婧愬崟瀛愬唴鐮�
         var HSourceBillNo = "";   //婧愬崟鍗曞彿
         var HSourceBillType = "";  //婧愬崟绫诲瀷
-        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;
+        //鑾峰彇椤甸潰璺宠浆鍙傛暟  //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
+        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 HSBillType = params[params[2]];//婧愬崟绫诲瀷
         }
-
-        var params = getUrlVars();
-        var hID = params[params[0]];//缂栬緫鏌ョ湅
-        var Type = params[params[1]];//鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
 
         var edit = function (data) {
             HBillType = data[0].HBillType;
@@ -365,6 +362,7 @@
         }).extend({
             index: 'lib/index' //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            //#region 鍏敤鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -372,72 +370,81 @@
                 , form = layui.form
                 , laydate = layui.laydate
                 , element = layui.element;
+            //#endregion
 
-            //鏃ユ湡鏃堕棿閫夋嫨鍣�
-            laydate.render({
-                elem: '#HStopBeginWorkTime'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HStopEndWorkTime'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HMakeDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HUpDateDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HCheckDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HCloseDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HDeleteDate'
-                , type: 'datetime'
-            });
+            // #region 椤甸潰鍒濆鍖�
+            //鍒濆鍖栬〃鍗曟彃浠�
+            set_InitFrom();
 
-            //鍒濆鍩烘湰淇℃伅璧嬪��
-            $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
-            $("#HStopBeginWorkTime").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //寮�濮嬫椂闂�
-            $("#HStopEndWorkTime").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //鏈夐璁$粨鏉熸椂闂�
-            $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒跺崟鏃ユ湡
-            $("#HMaker").val(sessionStorage["HUserName"]);     //鍒跺崟浜�
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
+            }
+            else if (OperationType == 2) {//鏈夋簮鍗�
+                set_AddNew();
+            }
+            else if (OperationType == 3) {//缂栬緫
 
-            //鍒ゆ柇鏄惁鏂板
-            if (hID == null || hID == 0) {
-                //鑾峰彇鏈�澶у崟鎹彿 new
-                $("#HInterID").val("0");
-                $("#HBillNo").val("");
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetMAXNum",
-                    type: "GET",
-                    data: { "HBillType": '3702' },
-                    success: function (d) {
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                        $("#HInterID").val(0);
-                    }
+                set_EditFromGrid();
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
+
+            // #region 椤甸潰鍔犺浇鎵�鏈夋柟娉� 
+            //鍒濆鍖栨彃浠�
+            function set_InitFrom() {
+                //鏃ユ湡鏃堕棿閫夋嫨鍣�
+                laydate.render({
+                    elem: '#HStopBeginWorkTime'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HStopEndWorkTime'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HMakeDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HUpDateDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HCheckDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HCloseDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HDeleteDate'
+                    , type: 'datetime'
                 });
             }
-            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
-                $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
-                RoadBillMain(hID);
-                /* RoadBillSub(linterid);*/
+
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
+                
             }
 
-
             //鏈夋簮鍗曟柊澧�
-            if (Type == 2) {
+            function set_AddNew() {
+                //鍒濆鍩烘湰淇℃伅璧嬪��
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
+                $("#HStopBeginWorkTime").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //寮�濮嬫椂闂�
+                $("#HStopEndWorkTime").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //鏈夐璁$粨鏉熸椂闂�
+                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒跺崟鏃ユ湡
+                $("#HMaker").val(sessionStorage["HUserName"]);     //鍒跺崟浜�
+
 
                 //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
                 $('#HProcName').attr("disabled", true);
@@ -470,7 +477,7 @@
                             if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
                             {
                                 var LoadData = data.data.h_p_JIT_GetInfoByICMOStatusInterID;
-                          
+
                                 $("#HProcID").val(LoadData[0].HProcID); //褰撳墠宸ュ簭ID
                                 $("#HProcName").val(LoadData[0].HProcName); //褰撳墠宸ュ簭
                                 $("#HMaterID").val(LoadData[0].HMaterID); //浜у搧ID
@@ -500,6 +507,103 @@
                     });
             }
 
+            //缂栬緫
+            function set_EditFromGrid() {
+                //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
+                $('#HProcName').attr("disabled", true);
+                $('#HMaterCode').attr("disabled", true);
+                $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#HMaterName').attr("disabled", true);
+                $('#HMaterSpec').attr("disabled", true);
+                $('#HStopBeginWorkTime').attr("disabled", true);
+                $('#HSourceName').attr("disabled", true);
+                $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#HMainSourceBillNo').attr("disabled", true);
+                $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#HICMOBillNo').attr("disabled", true);
+                $('#HDeptName').attr("disabled", true);
+                $('#HDeptList').addClass("layui-btn-disabled").attr("disabled", true);
+
+                $.ajax({
+                    url: GetWEBURL() + "Sc_MESStopWorkBill/Sc_MESStopWorkBillListCheckDetai",
+                    type: "GET",
+                    data: {
+                        "HID": linterid
+                    },
+                    success: function (result) {
+
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data.h_v_Sc_MESStopWorkBillList_NEW[0];
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HInterID": data.hmainid
+                                , "HBillNo": data.鍗曟嵁鍙�
+                                , "HDate": formatDate(data.鏃ユ湡)
+                                , "HProcID": data.HProcID
+                                , "HProcName": data.宸ュ簭鍚嶇О
+                                , "HMaterID": data.HMaterID
+                                , "HMaterCode": data.浜у搧浠g爜
+                                , "HMaterName": data.浜у搧鍚嶇О
+                                , "HMaterSpec": data.瑙勬牸鍨嬪彿
+                                , "HStopBeginWorkTime": data.寮�濮嬪仠宸ユ椂闂�
+                                , "HStopEndWorkTime": data.缁撴潫鍋滃伐鏃堕棿
+                                , "HSourceID": data.HSourceID              //璧勬簮ID
+                                , "HSourceName": data.璧勬簮鍚嶇О             //璧勬簮鍚嶇О
+                                , "HEmpID": data.HEmpID                   //鎿嶄綔鍛業D
+                                , "HEmpName": data.鐢宠寮�宸ヤ汉鍛�           //鎿嶄綔鍛�
+                                , "HMainSourceInterID": data.HMainSourceInterID                 //婧愬崟ID
+                                , "HMainSourceEntryID": data.HMainSourceEntryID                 //婧愬崟瀛怚D(琛屽彿)
+                                , "HMainSourceBillNo": data.HMainSourceBillNo                 //婧愬崟鍗曞彿
+                                , "HMainSourceBillType": data.HMainSourceBillType               //婧愬崟绫诲瀷
+                                , "HGroupID": data.HGroupID                //鐝粍ID
+                                , "HGroupName": data.鐝粍鍚嶇О              //鐝粍鍚嶇О
+                                , "HDeptID": data.HDeptID                  //閮ㄩ棬ID
+                                , "HDeptName": data.閮ㄩ棬鍚嶇О               //閮ㄩ棬鍚嶇О
+                                , "HICMOInterID": data.HICMOInterID                       //鐢熶骇璁㈠崟涓籌D
+                                , "HICMOEntryID": data.HICMOEntryID                        //鐢熶骇璁㈠崟瀛怚D
+                                , "HICMOBillNo": data.HICMOBillNo                        //鐢熶骇璁㈠崟
+                                , "HStopReason": data.鍋滃伐鍘熷洜                         //鍋滃伐鍘熷洜
+                                , "HRemark": data.澶囨敞                            //澶囨敞
+                                , "HMaker": data.鍒跺崟浜�                            //鍒跺崟浜�
+                                , "HMakeDate": data.鍒跺崟鏃ユ湡                          //鍒跺崟鏃ユ湡
+                                , "HUpDater": sessionStorage["HUserName"]             //淇敼浜�
+                                , "HUpDateDate": Format(new Date(), "yyyy-MM-dd hh:mm:ss")//淇敼鏃ユ湡
+                                , "HChecker": data.瀹℃牳浜�             //瀹℃牳浜�
+                                , "HCheckDate": data.瀹℃牳鏃ユ湡   //瀹℃牳鏃ユ湡
+                                , "HCloseMan": data.鍏抽棴浜�                //鍏抽棴浜�
+                                , "HCloseDate": data.鍏抽棴鏃ユ湡             //鍏抽棴鏃ユ湡
+                                , "HDeleteMan": data.浣滃簾浜�               //浣滃簾浜�
+                                , "HDeleteDate": data.浣滃簾鏃ユ湡       //浣滃簾鏃ユ湡
+                            });
+
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+
+          
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == 0) {
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("0");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '3702' },
+                    success: function (d) {
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HInterID").val(0);
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+            }
+
 
             //淇濆瓨鎻愪氦
             form.on('submit(Saver)', function (data) {
@@ -516,9 +620,14 @@
                     dataType: "json",
                     success: function (data) {
                         if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
-                                layer.close(layer.index);
-                                window.parent.location.reload();
+                            $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+                            layer.confirm(data.Message, {
+                                btn: ['纭']
+                            }, function (index) {
+                                if (data.Verify == "Y") //鑷姩瀹℃牳
+                                {
+                                    SaveVerify(); //瀹℃牳
+                                }
                             });
                         }
                         else {
@@ -531,10 +640,45 @@
                 })
             });
 
+            //瀹℃牳鎸夐挳鎻愪氦
+            form.on('submit(VerIfySaver)', function (data) {
+                SaveVerify();
+            });
+
+            //瀹℃牳鎻愪氦
+            function SaveVerify() {
+                var InterID = $("#HInterID").val();
+                if (!AllowLoadData())//鏁版嵁楠岃瘉
+                {
+                    return false;
+                }
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Sc_MESStopWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: true,
+                    data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
+                                //layer.close(layer.index);
+                                //window.parent.location.reload();
+                            });
+                        }
+                        else {
+                            layer.alert(data.Message, { icon: 5 })
+                        }
+                    },
+                    error: function (err) {
+                        layer.alert(err, { icon: 5 })
+                    }
+                })
+            }
+
             //閫�鍑�
             form.on('submit(Exit)', function (data) {
-                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+                Pub_Close(1);
+                window.parent.location.reload();
             });
 
 
@@ -731,11 +875,23 @@
                 });
             });
 
-
+            //#endregion
 
             //浠ヤ笂涓簂ayui妯″潡
         });
 
+        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('-');
+        }
+
         function AllowLoadData() {  //闈炵┖楠岃瘉
             var Result = true;
             if ($("#HBillNo").val() == '' || $("#HBillNo").val() == null) {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_MESStopWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_MESStopWorkBillList.html"
index 234154c..44b4011 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_MESStopWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_MESStopWorkBillList.html"
@@ -36,11 +36,23 @@
                                         <input type="date" class="layui-input" id="HDate1">
                                     </div>
                                 </div>
-                                <!--<div class="layui-inline">
-                                    <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鍗曟嵁鍙�</label>
                                     <div class="layui-input-block">
-                                        <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
                                     </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鐢熶骇璧勬簮</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HSource" id="HSource">
+                                    </div>
+                                </div>
+                                <!--<div class="layui-inline">
+                                      <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+                                      <div class="layui-input-block">
+                                          <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
+                                      </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>
@@ -53,23 +65,20 @@
                                             <span>鍏朵粬鏉′欢></span>
                                         </div>
                                     </div>
-                                    <div class="layui-inline">
-                                        <label class="layui-form-label">鍗曟嵁鍙�</label>
-                                        <div class="layui-input-block">
-                                            <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
-                                        </div>
-                                    </div>
+                               
                                 </div>
                             </div>
                         </div>
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Print"><i class="layui-icon layui-icon-print"></i>棰勮</button>
+                                <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-edit"></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="btn-Audit"><i class="layui-icon layui-icon-radio"></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>
@@ -81,12 +90,20 @@
     <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>
+        //鑾峰彇椤甸潰璺宠浆鍙傛暟  //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        }
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
-        }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+             //#region 鍙傛暟
             var $ = layui.$
             , admin = layui.admin
             , layer = layui.layer
@@ -97,192 +114,52 @@
             , laydate = layui.laydate
             //var sWhere = " 浜у搧浠g爜 = 'BX0002'";
             var sWhere = "";
+            var option = [];
+            //#endregion
 
-            var option = {
-                elem: '#mainTable'
-                ,toolbar: '#toolbarDemo'
-                ,height: 'full-50' 
-                , page: true
-                ,cellMinWidth: 90
-                , cols: [[
-                    { type: 'checkbox', fixed: 'left' }
-                    ,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
-                    , { field: 'HBillType', title: 'HBillType', hide: true }
-                    , { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿' }
-                    , { field: '宸ュ簭璁″垝鍗曞彿', title: '宸ュ簭璁″垝鍗曞彿' }
-                    , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿' }
-                    , { field: 'HMaterID', title: 'HMaterID', hide: true }
-                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜' }
-                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
-                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
-                    , { field: 'HProcID', title: 'HProcID', hide: true }
-                    , { field: '宸ュ簭浠g爜', title: '宸ュ簭浠g爜' }
-                    , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
-                    , { field: '浠诲姟鍗曟暟閲�', title: '浠诲姟鍗曟暟閲�' }
-                    , { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
-                    , { field: '寮�濮嬪仠宸ユ椂闂�', title: '寮�濮嬪仠宸ユ椂闂�', templet: "<div>{{d.寮�濮嬪仠宸ユ椂闂� ==null ?'':layui.util.toDateString(d.寮�濮嬪仠宸ユ椂闂�, 'yyyy-MM-dd HH:mm:ss')}}</div>"  }
-                    , { field: '缁撴潫鍋滃伐鏃堕棿', title: '缁撴潫鍋滃伐鏃堕棿', templet: "<div>{{d.缁撴潫鍋滃伐鏃堕棿 ==null ?'':layui.util.toDateString(d.缁撴潫鍋滃伐鏃堕棿, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: 'HSourceID', title: 'HSourceID', hide: true }
-                    , { field: '鐢熶骇璧勬簮浠g爜', title: '鐢熶骇璧勬簮浠g爜' }
-                    , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮' }
-                    , { field: 'HGroupID', title: 'HGroupID', hide: true }
-                    , { field: '鐢熶骇鐝粍浠g爜', title: '鐢熶骇鐝粍浠g爜' }
-                    , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍' }
-                    , { field: 'HDeptID', title: 'HDeptID', hide: true }
-                    , { field: '鐢熶骇杞﹂棿浠g爜', title: '鐢熶骇杞﹂棿浠g爜' }
-                    , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿' }
-                    , { field: 'HEmpID', title: 'HEmpID', hide: true }
-                    , { field: '鐢宠鍋滃伐浜哄憳浠g爜', title: '鐢宠鍋滃伐浜哄憳浠g爜' }
-                    , { field: '鐢宠鍋滃伐浜哄憳', title: '鐢宠鍋滃伐浜哄憳' }
-                    , { field: '鍋滃伐鍘熷洜', title: '鍋滃伐鍘熷洜' }
-                    , { field: '鍋滃伐姹囨姤绫诲瀷', title: '鍋滃伐姹囨姤绫诲瀷' }
-                    , { field: '鏉″舰鐮�', title: '鏉″舰鐮�' }
-                    , { field: '鏈哄櫒鍦板潃', title: '鏈哄櫒鍦板潃' }
-                    , { field: '鎵弿浜�', title: '鎵弿浜�' }
-                    , { field: '鎵弿鏃ユ湡', title: '鎵弿鏃ユ湡', templet: "<div>{{d.鎵弿鏃ユ湡 ==null ?'':layui.util.toDateString(d.鎵弿鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: '澶囨敞', title: '澶囨敞' }
-                    , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
-                    , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
-                    , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: '淇敼浜�', title: '淇敼浜�', width: 200 }
-                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
-                    , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 }
-                    , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                ]]
-            };
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
 
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                //鎶ュ伐骞冲彴鎶ユ鐢宠鏌ョ湅鍒楄〃
+                set_ClearBill();
+            }
+
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
+
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
-                    case 'btn-Add':
-                        //椤甸潰灞�-鑷畾涔�
-                        layer.open({
-                            type: 2,
-                            skin: 'layui-layer-rim', //鍔犱笂杈规
-                            title: '鏂板鍋滃伐鍗�',
-                            closeBtn: 1,
-                            shift: 2,
-                            area: ['100%', '100%'],
-                            maxmin: true,
-                            content: '../鐢熶骇鍋滃伐鍗�/Sc_Add_MESStopWorkBillList.html',
-                            end: function () {
-                                //鍒锋柊椤甸潰,
-                                location.reload();
-                            },
-                            success: function (layero, index) {
-
-                            }
-                        });
+                    case 'btn-Add': //set_AddNew();
                         break;
-                    case 'btn-Edit':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var hID = data[0].hmainid.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: '../鐢熶骇鍋滃伐鍗�/Sc_Add_MESStopWorkBillList.html?hID=' + hID
-                                , resize: false,
-                                end: function () {
-                                    //鍒锋柊椤甸潰,
-                                    location.reload();
-                                }
-                                , cancel: function () {
-                                    //$(".layui-btn").removeClass("layui-btn-disabled");
-                                }
-                            })
-
-                        } else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                        }
-
+                    case 'btn-Edit': set_ShowBill();
                         break;
-                    case 'btn-Delete':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var InterID = data[0].hmainid.toString();
-                            //閫昏緫鍒犻櫎鏂规硶
-                            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                                $.ajax({
-                                    type: "GET",
-                                    url: GetWEBURL() + "Sc_MESStopWorkBill/DeltetMESStopWorkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                    data: { "HInterID": InterID },
-                                    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('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                        }
+                    case 'btn-Delete': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': set_Refresh();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit': set_CheckBill();
+                        break;
+                    //閫�鍑�
+                    case 'get_Exit': Pub_Close(2);
                         break;
                 };
             });
-
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            var index0 = layer.load(0, { shade: false });
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Sc_MESStopWorkBill/list',
-                type: "GET",
-                data: { "sWhere": sWhere },
-                success: function (data1) {
-                    if (data1.count == 1) {
-                        option.data = data1.data;
-                        table.render(option);
-                        layer.close(index0);
-                    } else {
-                        layer.close(index0);
-                        layer.alert(data1.code + data1.Message, { icon: 5 });
-                    }
-                }, error: function () {
-                    layer.close(index0);
-                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                }
-            }); 
-
-            //閲嶇疆鎸夐挳
-            form.on('submit(btnReSearch)', function (data) {
-                $("#HDate").val("");//寮�濮嬫棩鏈�
-                $("#HDate1").val("");//缁撴潫鏃ユ湡
-                $("#WorkCenter").val("");//鍗曟嵁鍙�
-                $("#btnSearch").click();
-            });
-
             //鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+                var ajaxLoad = layer.load();
                 var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
                 var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
                 var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+                var HSource = $("#HSource").val();//鐢熶骇璧勬簮
                 if (HDate) {
                     sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
                 }
@@ -292,7 +169,9 @@
                 if (HBillNo) {
                     sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
                 }
-                var index = layer.load(0, { shade: false });
+                if (HSource) {
+                    sWhere += " and 璧勬簮浠g爜 like '%" + HSource + "%' or 璧勬簮鍚嶇О like '%" + HSource + "%'";
+                }
                 $.ajax({
                     url: GetWEBURL() + '/Sc_MESStopWorkBill/list',
                     type: "GET",
@@ -301,33 +180,311 @@
                         if (data1.count == 1) {
                             option.data = data1.data;
                             table.render(option);
-                            layer.close(index);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                            layer.close(ajaxLoad);
                         } else {
-                            layer.close(index);
+                            layer.close(ajaxLoad);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
-                        layer.close(index);
+                        layer.close(ajaxLoad);
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             });
 
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HBillNo").val("");//鍗曟嵁鍙�
+                $("#HSource").val("");//鐢熶骇璧勬簮
+                $("#btnSearch").click();
+            });
+            //#endregion
 
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
 
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+
+            }
+
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+                 option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', hide: true }
+                        , { field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 160 }
+                        , { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿' }
+                        , { field: '宸ュ簭璁″垝鍗曞彿', title: '宸ュ簭璁″垝鍗曞彿' }
+                        , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿' }
+                        , { field: 'HMaterID', title: 'HMaterID', hide: true }
+                        , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜' }
+                        , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
+                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+                        , { field: 'HProcID', title: 'HProcID', hide: true }
+                        , { field: '宸ュ簭浠g爜', title: '宸ュ簭浠g爜' }
+                        , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
+                        , { field: '浠诲姟鍗曟暟閲�', title: '浠诲姟鍗曟暟閲�' }
+                        , { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
+                        , { field: '寮�濮嬪仠宸ユ椂闂�', title: '寮�濮嬪仠宸ユ椂闂�', templet: "<div>{{d.寮�濮嬪仠宸ユ椂闂� ==null ?'':layui.util.toDateString(d.寮�濮嬪仠宸ユ椂闂�, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '缁撴潫鍋滃伐鏃堕棿', title: '缁撴潫鍋滃伐鏃堕棿', templet: "<div>{{d.缁撴潫鍋滃伐鏃堕棿 ==null ?'':layui.util.toDateString(d.缁撴潫鍋滃伐鏃堕棿, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: 'HSourceID', title: 'HSourceID', hide: true }
+                        , { field: '鐢熶骇璧勬簮浠g爜', title: '鐢熶骇璧勬簮浠g爜' }
+                        , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮' }
+                        , { field: 'HGroupID', title: 'HGroupID', hide: true }
+                        , { field: '鐢熶骇鐝粍浠g爜', title: '鐢熶骇鐝粍浠g爜' }
+                        , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍' }
+                        , { field: 'HDeptID', title: 'HDeptID', hide: true }
+                        , { field: '鐢熶骇杞﹂棿浠g爜', title: '鐢熶骇杞﹂棿浠g爜' }
+                        , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿' }
+                        , { field: 'HEmpID', title: 'HEmpID', hide: true }
+                        , { field: '鐢宠鍋滃伐浜哄憳浠g爜', title: '鐢宠鍋滃伐浜哄憳浠g爜' }
+                        , { field: '鐢宠鍋滃伐浜哄憳', title: '鐢宠鍋滃伐浜哄憳' }
+                        , { field: '鍋滃伐鍘熷洜', title: '鍋滃伐鍘熷洜' }
+                        , { field: '鍋滃伐姹囨姤绫诲瀷', title: '鍋滃伐姹囨姤绫诲瀷' }
+                        , { field: '鏉″舰鐮�', title: '鏉″舰鐮�' }
+                        , { field: '鏈哄櫒鍦板潃', title: '鏈哄櫒鍦板潃' }
+                        , { field: '鎵弿浜�', title: '鎵弿浜�' }
+                        , { field: '鎵弿鏃ユ湡', title: '鎵弿鏃ユ湡', templet: "<div>{{d.鎵弿鏃ユ湡 ==null ?'':layui.util.toDateString(d.鎵弿鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '澶囨敞', title: '澶囨敞' }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '淇敼浜�', title: '淇敼浜�', width: 200 }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 }
+                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                    ]]
+                };
+            }
+
+            //鏌ヨ
+            function get_Display() {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_MESStopWorkBill/list',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板鍋滃伐鍗�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../鐢熶骇鍋滃伐鍗�/Sc_Add_MESStopWorkBillList.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 linterid = data[0].hmainid.toString();
+                    var HBillStatus = data[0].HBillStatus.toString();
+                    if (HBillStatus != "1") {
+                        layer.msg('鍗曟嵁鐘舵�佷笉涓烘湭瀹℃牳鐘舵��,涓嶅厑璁哥紪杈戯紒');
+                        return false;
+                    }
+                    //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: '../鐢熶骇鍋滃伐鍗�/Sc_Add_MESStopWorkBillList.html?OperationType=3&linterid=' + linterid + '&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 InterID = data[0].hmainid.toString();
+                    var HBillStatus = data[0].HBillStatus.toString();
+                    if (HBillStatus != "1") {
+                        layer.msg('鍗曟嵁鐘舵�佷笉涓烘湭瀹℃牳鐘舵��,涓嶅厑璁稿垹闄わ紒');
+                        return false;
+                    }
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "Sc_MESStopWorkBill/DeltetMESStopWorkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": InterID },
+                            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('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+
+            //鍒锋柊
+            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();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sc_MESStopWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "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_AbandonCheck() {
+                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_MESStopWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "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('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�');
+                }
+
+            }
+
+
+            //#endregion
 
             //浠ヤ笂鏄痩ayui妯″潡
         });
 
-        
+
 
 
     </script>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html"
index 211819d..79084a1 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html"
@@ -14,6 +14,7 @@
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <style type="text/css">
         .layui-form-label {
@@ -87,6 +88,7 @@
                             <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" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="VerIfySaver">瀹℃牳</button>
                                 <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
                             </div>
 
@@ -315,20 +317,15 @@
         var HSourceEntryID = "";  //婧愬崟瀛愬唴鐮�
         var HSourceBillNo = "";   //婧愬崟鍗曞彿
         var HSourceBillType = "";  //婧愬崟绫诲瀷
-        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;
+        //鑾峰彇椤甸潰璺宠浆鍙傛暟  //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
+        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 HSBillType = params[params[2]];//婧愬崟绫诲瀷
         }
-
-        var params = getUrlVars();
-        var hID = params[params[0]];//缂栬緫鏌ョ湅
-        var Type = params[params[1]];//鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
 
         var edit = function (data) {
             HBillType = data[0].HBillType;
@@ -345,6 +342,7 @@
         }).extend({
             index: 'lib/index' //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            //#region 鍏敤鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -352,67 +350,77 @@
                 , form = layui.form
                 , laydate = layui.laydate
                 , element = layui.element;
+            //#endregion
 
-            //鏃ユ湡鏃堕棿閫夋嫨鍣�
-            laydate.render({
-                elem: '#HEndWorkTime'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HMakeDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HUpDateDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HCheckDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HCloseDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HDeleteDate'
-                , type: 'datetime'
-            });
+            // #region 椤甸潰鍒濆鍖�
+            //鍒濆鍖栬〃鍗曟彃浠�
+            set_InitFrom();
 
-            //鍒濆鍩烘湰淇℃伅璧嬪��
-            $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
-            $("#HEndWorkTime").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //瀹屽伐鏃ユ湡
-            $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒跺崟鏃ユ湡
-            $("#HMaker").val(sessionStorage["HUserName"]);     //鍒跺崟浜�
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
+            }
+            else if (OperationType == 2) {//鏈夋簮鍗�
+                set_AddNew();
+            }
+            else if (OperationType == 3) {//缂栬緫
 
-            //鍒ゆ柇鏄惁鏂板
-            if (hID == null || hID == 0) {
-                //鑾峰彇鏈�澶у崟鎹彿 new
-                $("#HInterID").val("0");
-                $("#HBillNo").val("");
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetMAXNum",
-                    type: "GET",
-                    data: { "HBillType": '3788' },
-                    success: function (d) {
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                        $("#HInterID").val(0);
-                    }
+                set_EditFromGrid();
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
+
+
+            // #region 椤甸潰鍔犺浇鎵�鏈夋柟娉� 
+            //鍒濆鍖栨彃浠�
+            function set_InitFrom() {
+                //鏃ユ湡鏃堕棿閫夋嫨鍣�
+                laydate.render({
+                    elem: '#HEndWorkTime'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HMakeDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HUpDateDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HCheckDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HCloseDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HDeleteDate'
+                    , type: 'datetime'
                 });
             }
-            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
-                $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
-                RoadBillMain(hID);
-                /* RoadBillSub(linterid);*/
+
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
+
             }
 
-
             //鏈夋簮鍗曟柊澧�
-            if (Type == 2) {
+            function set_AddNew() {
+                //鍒濆鍩烘湰淇℃伅璧嬪��
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
+                $("#HEndWorkTime").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //瀹屽伐鏃ユ湡
+                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒跺崟鏃ユ湡
+                $("#HMaker").val(sessionStorage["HUserName"]);     //鍒跺崟浜�
+
 
                 //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
                 $('#HProcName').attr("disabled", true);
@@ -474,43 +482,99 @@
                     });
             }
 
+            //缂栬緫
+            function set_EditFromGrid() {
+                //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
+                $('#HProcName').attr("disabled", true);
+                $('#HMaterCode').attr("disabled", true);
+                $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#HMaterName').attr("disabled", true);
+                $('#HMaterSpec').attr("disabled", true);
+                $('#HEndWorkTime').attr("disabled", true);
+                $('#HSourceName').attr("disabled", true);
+                $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#HMainSourceBillNo').attr("disabled", true);
+                $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#HICMOBillNo').attr("disabled", true);
+                $('#HDeptName').attr("disabled", true);
+                $('#HDeptList').addClass("layui-btn-disabled").attr("disabled", true);
 
-            //淇濆瓨鎻愪氦
-            form.on('submit(Saver)', function (data) {
-                var sMainStr = JSON.stringify(data.field);
-                if (!AllowLoadData())//鏁版嵁楠岃瘉
-                {
-                    return false;
-                }
                 $.ajax({
-                    type: "POST",
-                    url: GetWEBURL() + "/Sc_MESEndWorkBill/SaveGetMESEndFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                    async: true,
-                    data: { "msg": sMainStr },
-                    dataType: "json",
-                    success: function (data) {
-                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
-                                layer.close(layer.index);
-                                window.parent.location.reload();
-                            });
-                        }
-                        else {
-                            layer.alert(data.Message, { icon: 5 })
-                        }
+                    url: GetWEBURL() + "Sc_MESEndWorkBill/Sc_MESEndWorkBillListCheckDetai",
+                    type: "GET",
+                    data: {
+                        "HID": linterid
                     },
-                    error: function (err) {
-                        layer.alert(err, { icon: 5 })
+                    success: function (result) {
+
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data.h_v_Sc_MESEndWorkBillList_NEW[0];
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HInterID": data.hmainid
+                                , "HBillNo": data.鍗曟嵁鍙�
+                                , "HDate": formatDate(data.鏃ユ湡)
+                                , "HProcID": data.HProcID
+                                , "HProcName": data.宸ュ簭鍚嶇О
+                                , "HMaterID": data.HMaterID
+                                , "HMaterCode": data.浜у搧浠g爜
+                                , "HMaterName": data.浜у搧鍚嶇О
+                                , "HMaterSpec": data.瑙勬牸鍨嬪彿
+                                , "HEndWorkTime": data.瀹屽伐鏃堕棿
+                                , "HSourceID": data.HSourceID              //璧勬簮ID
+                                , "HSourceName": data.璧勬簮鍚嶇О             //璧勬簮鍚嶇О
+                                , "HEmpID": data.HEmpID                   //鎿嶄綔鍛業D
+                                , "HEmpName": data.鎿嶄綔鍛�           //鎿嶄綔鍛�
+                                , "HMainSourceInterID": data.HMainSourceInterID                 //婧愬崟ID
+                                , "HMainSourceEntryID": data.HMainSourceEntryID                 //婧愬崟瀛怚D(琛屽彿)
+                                , "HMainSourceBillNo": data.HMainSourceBillNo                 //婧愬崟鍗曞彿
+                                , "HMainSourceBillType": data.HMainSourceBillType               //婧愬崟绫诲瀷
+                                , "HGroupID": data.HGroupID                //鐝粍ID
+                                , "HGroupName": data.鐝粍鍚嶇О              //鐝粍鍚嶇О
+                                , "HDeptID": data.HDeptID                  //閮ㄩ棬ID
+                                , "HDeptName": data.閮ㄩ棬鍚嶇О               //閮ㄩ棬鍚嶇О
+                                , "HICMOInterID": data.HICMOInterID                       //鐢熶骇璁㈠崟涓籌D
+                                , "HICMOEntryID": data.HICMOEntryID                        //鐢熶骇璁㈠崟瀛怚D
+                                , "HICMOBillNo": data.HICMOBillNo                        //鐢熶骇璁㈠崟
+                                , "HRemark": data.澶囨敞                    //澶囨敞
+                                , "HMaker": data.鍒跺崟浜�                            //鍒跺崟浜�
+                                , "HMakeDate": data.鍒跺崟鏃ユ湡                          //鍒跺崟鏃ユ湡
+                                , "HUpDater": sessionStorage["HUserName"]             //淇敼浜�
+                                , "HUpDateDate": Format(new Date(), "yyyy-MM-dd hh:mm:ss")//淇敼鏃ユ湡
+                                , "HChecker": data.瀹℃牳浜�             //瀹℃牳浜�
+                                , "HCheckDate": data.瀹℃牳鏃ユ湡   //瀹℃牳鏃ユ湡
+                                , "HCloseMan": data.鍏抽棴浜�                //鍏抽棴浜�
+                                , "HCloseDate": data.鍏抽棴鏃ユ湡             //鍏抽棴鏃ユ湡
+                                , "HDeleteMan": data.浣滃簾浜�               //浣滃簾浜�
+                                , "HDeleteDate": data.浣滃簾鏃ユ湡       //浣滃簾鏃ユ湡
+                            });
+
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
                     }
-                })
-            });
+                });
+            }
 
-            //閫�鍑�
-            form.on('submit(Exit)', function (data) {
-                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
-            });
-
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == 0) {
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("0");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '3788' },
+                    success: function (d) {
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HInterID").val(0);
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+            }
 
             //琛ㄥご淇℃伅浜у搧寮圭獥
             form.on('submit(HMaterList)', function () {
@@ -707,6 +771,86 @@
 
 
 
+
+
+            //淇濆瓨鎻愪氦
+            form.on('submit(Saver)', function (data) {
+                var sMainStr = JSON.stringify(data.field);
+                if (!AllowLoadData())//鏁版嵁楠岃瘉
+                {
+                    return false;
+                }
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Sc_MESEndWorkBill/SaveGetMESEndFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: true,
+                    data: { "msg": sMainStr },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+                            layer.confirm(data.Message, {
+                                btn: ['纭']
+                            }, function (index) {
+                                if (data.Verify == "Y") //鑷姩瀹℃牳
+                                {
+                                    SaveVerify(); //瀹℃牳
+                                }
+                            });
+                        }
+                        else {
+                            layer.alert(data.Message, { icon: 5 })
+                        }
+                    },
+                    error: function (err) {
+                        layer.alert(err, { icon: 5 })
+                    }
+                })
+            });
+
+            //瀹℃牳鎸夐挳鎻愪氦
+            form.on('submit(VerIfySaver)', function (data) {
+                SaveVerify();
+            });
+
+            //瀹℃牳鎻愪氦
+            function SaveVerify() {
+                var InterID = $("#HInterID").val();
+                if (!AllowLoadData())//鏁版嵁楠岃瘉
+                {
+                    return false;
+                }
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Sc_MESEndWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: true,
+                    data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
+                                //layer.close(layer.index);
+                                //window.parent.location.reload();
+                            });
+                        }
+                        else {
+                            layer.alert(data.Message, { icon: 5 })
+                        }
+                    },
+                    error: function (err) {
+                        layer.alert(err, { icon: 5 })
+                    }
+                })
+            }
+
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {
+                Pub_Close(1);
+                window.parent.location.reload();
+            });
+
+            //#endregion
+
             //浠ヤ笂涓簂ayui妯″潡
         });
 
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_MESEndWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_MESEndWorkBillList.html"
index 9193f41..1a21793 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_MESEndWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_MESEndWorkBillList.html"
@@ -40,6 +40,18 @@
                                         <input type="date" class="layui-input" id="HDate1">
                                     </div>
                                 </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鐢熶骇璧勬簮</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HSource" id="HSource">
+                                    </div>
+                                </div>
                                 <!--<div class="layui-inline">
                                     <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
                                     <div class="layui-input-block">
@@ -72,23 +84,20 @@
                                             <span>鍏朵粬鏉′欢></span>
                                         </div>
                                     </div>
-                                    <div class="layui-inline">
-                                        <label class="layui-form-label">鍗曟嵁鍙�</label>
-                                        <div class="layui-input-block">
-                                            <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
-                                        </div>
-                                    </div>
+                                  
                                 </div>
                             </div>
                         </div>
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Print"><i class="layui-icon layui-icon-print"></i>棰勮</button>
+                                <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-edit"></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="btn-Audit"><i class="layui-icon layui-icon-radio"></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>
@@ -101,12 +110,20 @@
     <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>
+        //鑾峰彇椤甸潰璺宠浆鍙傛暟  //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        }
         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
@@ -118,71 +135,201 @@
                 , util = layui.util
             //鏌ヨ鏉′欢
             var sWhere = "";
+            var option = [];
+            //#endregion
 
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                , height: 'full-50'
-                , page: true
-                , cellMinWidth: 90
-                , cols: [[
-                    { type: 'checkbox', fixed: 'left' }
-                    , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
-                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160 }
-                    , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 115 }
-                    , { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О', width: 200 }
-                    , { field: '鐝粍浠g爜', title: '鐝粍浠g爜', width: 115 }
-                    , { field: '鐝粍鍚嶇О', title: '鐝粍鍚嶇О', width: 200 }
-                    , { field: '璧勬簮浠g爜', title: '璧勬簮浠g爜', width: 115 }
-                    , { field: '璧勬簮鍚嶇О', title: '璧勬簮鍚嶇О', width: 200 }
-                    , { field: '瀹屽伐鏃堕棿', title: '瀹屽伐鏃堕棿', width: 200, templet: "<div>{{d.瀹屽伐鏃堕棿 ==null ?'':layui.util.toDateString(d.瀹屽伐鏃堕棿, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: '澶囨敞', title: '澶囨敞', width: 200 }
-                    , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
-                    , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
-                    , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: '淇敼浜�', title: '淇敼浜�', width: 200 }
-                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
-                    , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 }
-                    , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                ]]
-            };
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
 
-            var index = layer.load(0);
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                //鎶ュ伐骞冲彴瀹屽伐鍗曟煡鐪嬪垪琛�
+                set_ClearBill();
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
 
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
-                    case 'btn-Add':
-                        //椤甸潰灞�-鑷畾涔�
-                        layer.open({
-                            type: 2,
-                            skin: 'layui-layer-rim', //鍔犱笂杈规
-                            title: '鏂板瀹屽伐鍗�',
-                            closeBtn: 1,
-                            shift: 2,
-                            area: ['100%', '100%'],
-                            maxmin: true,
-                            content: '../鐢熶骇瀹屽伐鍗�/Sc_Add_MESEndWorkBillList.html',
-                            end: function () {
-                                //鍒锋柊椤甸潰,
-                                location.reload();
-                            },
-                            success: function (layero, index) {
-
-                            }
-                        });
+                    case 'btn-Add': //set_AddNew();
                         break;
-                    case 'btn-Edit':
-                        var checkStatus = table.checkStatus('mainTable')
+                    case 'btn-Edit': set_ShowBill();
+                        break;
+                    case 'btn-Delete': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': set_Refresh();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit': set_CheckBill();
+                        break;
+                    //閫�鍑�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                };
+            });
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                var ajaxLoad = layer.load();
+                var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
+                var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
+                var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+                var HSource = $("#HSource").val();//鐢熶骇璧勬簮
+                if (HDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+                }
+                if (HDate1) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+                }
+                if (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
+                if (HSource) {
+                    sWhere += " and 璧勬簮浠g爜 like '%" + HSource + "%' or 璧勬簮鍚嶇О like '%" + HSource + "%'";
+                }
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_MESEndWorkBill/GetMESEndWorkBill',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    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 });
+                    }
+                });
+                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+                sWhere = "";
+            });
+
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HBillNo").val("");//鍗曟嵁鍙�
+                $("#HSource").val("");//鐢熶骇璧勬簮
+                $("#btnSearch").click();
+            });
+
+            //#endregion
+
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鏂规硶
+
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+
+            }
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+                 option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160 }
+                        , { field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 160 }
+                        , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 115 }
+                        , { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О', width: 200 }
+                        , { field: '鐝粍浠g爜', title: '鐝粍浠g爜', width: 115 }
+                        , { field: '鐝粍鍚嶇О', title: '鐝粍鍚嶇О', width: 200 }
+                        , { field: '璧勬簮浠g爜', title: '璧勬簮浠g爜', width: 115 }
+                        , { field: '璧勬簮鍚嶇О', title: '璧勬簮鍚嶇О', width: 200 }
+                        , { field: '瀹屽伐鏃堕棿', title: '瀹屽伐鏃堕棿', width: 200, templet: "<div>{{d.瀹屽伐鏃堕棿 ==null ?'':layui.util.toDateString(d.瀹屽伐鏃堕棿, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '澶囨敞', title: '澶囨敞', width: 200 }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '淇敼浜�', title: '淇敼浜�', width: 200 }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 }
+                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                    ]]
+                };
+            }
+
+            //鏌ヨ
+            function get_Display() {
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_MESEndWorkBill/GetMESEndWorkBill',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板瀹屽伐鍗�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../鐢熶骇瀹屽伐鍗�/Sc_Add_MESEndWorkBillList.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].hmainid.toString();
+                            var linterid = data[0].hmainid.toString();
+                            var HBillStatus = data[0].HBillStatus.toString();
+                            if (HBillStatus != "1") {
+                                layer.msg('鍗曟嵁鐘舵�佷笉涓烘湭瀹℃牳鐘舵��,涓嶅厑璁哥紪杈戯紒');
+                                return false;
+                            }
                             //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
                             layer.open({
                                 type: 2
@@ -192,7 +339,7 @@
                                 , shade: 0.6 //閬僵閫忔槑搴�
                                 , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                                 , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: '../鐢熶骇瀹屽伐鍗�/Sc_Add_MESEndWorkBillList.html?hID=' + hID
+                                , content: '../鐢熶骇瀹屽伐鍗�/Sc_Add_MESEndWorkBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                                 , resize: false,
                                 end: function () {
                                     //鍒锋柊椤甸潰,
@@ -206,133 +353,129 @@
                         } else {
                             layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
                         }
+            }
 
-                        break;
-                    case 'btn-Delete':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var InterID = data[0].hmainid.toString();
-                            //閫昏緫鍒犻櫎鏂规硶
-                            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                                $.ajax({
-                                    type: "GET",
-                                    url: GetWEBURL() + "Sc_MESEndWorkBill/DeltetMESEndWorkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                    data: { "HInterID": InterID },
-                                    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('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                        }
-                        break;
-                };
-            });
-
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Sc_MESEndWorkBill/GetMESEndWorkBill',
-                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 });
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    var HBillStatus = data[0].HBillStatus.toString();
+                    if (HBillStatus != "1") {
+                        layer.msg('鍗曟嵁鐘舵�佷笉涓烘湭瀹℃牳鐘舵��,涓嶅厑璁哥紪杈戯紒');
+                        return false;
                     }
-                }, error: function () {
-                    layer.close(index);
-                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                }
-            });
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "Sc_MESEndWorkBill/DeltetMESEndWorkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": InterID },
+                            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();
+                                    });
 
-            //閲嶇疆鎸夐挳
-            form.on('submit(btnReSearch)', function (data) {
-                $("#HDate").val("");//寮�濮嬫棩鏈�
-                $("#HDate1").val("");//缁撴潫鏃ユ湡
-                $("#HBillNo").val("");//鍗曟嵁鍙�
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+
+            //鍒锋柊
+            function set_Refresh() {
                 $("#btnSearch").click();
-            });
+            }
 
-            //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
-                var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
-                var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
-                var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
-                if (HDate) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
-                }
-                if (HDate1) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
-                }
-                if (HBillNo) {
-                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
-                }
-                var index = layer.load(0);
-                $.ajax({
-                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                    url: GetWEBURL() + '/Sc_MESEndWorkBill/GetMESEndWorkBill',
-                    type: "GET",
-                    data: { "sWhere": sWhere},
-                    success: function (data1) {
-                        if (data1.count == 1) {
-                            option.data = data1.data;
-                            table.render(option);
-                            layer.close(index);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
-                        } else {
-                            layer.close(index);
-                            layer.alert(data1.code + data1.Message, { icon: 5 });
+            //瀹℃牳
+            function set_CheckBill() {
+                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_MESStopWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "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 });
                         }
-                    }, error: function () {
-                        layer.close(index);
-                        layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
-                    }
-                });
-                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-                sWhere = "";
-                //$("#HBillType").val("");//鍗曟嵁绫诲瀷
-                //$("#HBillNo").val("");//鍗曟嵁鍙�
-                //$("#HSourceBillNo").val("");//婧愬崟鍙�
-                //$("#HCreateBy").val("");//鍒跺崟浜�
-                //$("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-                //$("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            });
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
 
-            //鐩戝惉琛屽弻鍑讳簨浠�
-            table.on('rowDouble(mainTable)', function (obj) {
-                layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
-            });
+            //鍙嶅鏍�
+            function set_AbandonCheck() {
+                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_MESStopWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "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('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�');
+                }
+
+            }
 
 
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
-
+            //#endregion
 
             //浠ヤ笂鏄痩ayui妯″潡
         });
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
index cf042c3..d4c0bab 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
@@ -14,6 +14,7 @@
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <style type="text/css">
         .layui-form-label {
@@ -85,8 +86,8 @@
                     <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="Saver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="VerIfySaver">瀹℃牳</button>
                                 <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
                             </div>
 
@@ -323,20 +324,15 @@
         var HSourceEntryID = "";  //婧愬崟瀛愬唴鐮�
         var HSourceBillNo = "";   //婧愬崟鍗曞彿
         var HSourceBillType = "";  //婧愬崟绫诲瀷
-        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;
+        //鑾峰彇椤甸潰璺宠浆鍙傛暟  //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
+        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 HSBillType = params[params[2]];//婧愬崟绫诲瀷
         }
-
-        var params = getUrlVars();
-        var hID = params[params[0]];//缂栬緫鏌ョ湅
-        var Type = params[params[1]];//鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
 
         var edit = function (data) {
             HBillType = data[0].HBillType;
@@ -353,6 +349,7 @@
         }).extend({
             index: 'lib/index' //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+             //#region 鍏敤鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -360,123 +357,77 @@
                 , form = layui.form
                 , laydate = layui.laydate
                 , element = layui.element;
+            //#endregion
 
-            //鏃ユ湡鏃堕棿閫夋嫨鍣�
-            laydate.render({
-                elem: '#HBeginDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HEndDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HMakeDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HUpDateDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HCheckDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HCloseDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HDeleteDate'
-                , type: 'datetime'
-            });
+            //鍒濆鍖栬〃鍗曟彃浠�
+            set_InitFrom();
 
-            //鍒濆鍩烘湰淇℃伅璧嬪��
-            $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
-            $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //寮�宸ユ棩鏈�
-            $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒跺崟鏃ユ湡
-            $("#HMaker").val(sessionStorage["HUserName"]);     //鍒跺崟浜�
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
+            }
+            else if (OperationType == 2) {//鏈夋簮鍗�
+                set_AddNew();
+            }
+            else if (OperationType == 3) {//缂栬緫
+          
+                set_EditFromGrid();
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
 
-            //鍒ゆ柇鏄惁鏂板
-            if (hID == null || hID == 0) {
-                //鑾峰彇鏈�澶у崟鎹彿 new
-                $("#HInterID").val("0");
-                $("#HBillNo").val("");
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetMAXNum",
-                    type: "GET",
-                    data: { "HBillType": '3787' },
-                    success: function (d) {
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                        $("#HInterID").val(0);
-                    }
+            //鍒濆鍖栨彃浠�
+            function set_InitFrom() {
+                //鏃ユ湡鏃堕棿閫夋嫨鍣�
+                laydate.render({
+                    elem: '#HBeginDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HEndDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HMakeDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HUpDateDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HCheckDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HCloseDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HDeleteDate'
+                    , type: 'datetime'
                 });
             }
-            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
-                $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
-                RoadBillMain(hID);
-                /* RoadBillSub(linterid);*/
-            }
-
-              //鑾峰彇涓嬫媺閫変腑鍊�
-            form.on('select(SourceType)', function (data) {
-                Sctag = data.value;
-                form.render('select');
-                if (Sctag != "2")  //鏃犳簮鍗�
-                {
-                    $("#HMainSourceInterID").val("");
-                    $("#HMainSourceEntryID").val("");
-                    $("#HMainSourceBillNo").val("");
-                    $("#HMainSourceBillType").val("");
-                    $('#HMainSourceBillNo').attr("disabled", false);
-                    $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
-                    Type = 1;
-                }
-                else {
-                    $('#HMainSourceBillNo').attr("disabled", true);
-                    $('#XDHList').removeClass("layui-btn-disabled").attr("disabled", false);
-                    Type = 2;
-                }
-            });
 
             //鏃犳簮鍗曟柊澧�
-            if (Type == 1)
+            function set_AddFNew()
             {
-               
                 //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
-                $('#HMaterCode').attr("disabled", true);
-                $('#HMaterList').removeClass("layui-btn-disabled").attr("disabled", false);
-                $('#HMaterName').attr("disabled", true);
-                $('#HMaterSpec').attr("disabled", true);
-                $('#HBeginDate').attr("disabled", true);
-                $('#HEmpName').attr("disabled", true);
-                $('#HEmpList').removeClass("layui-btn-disabled").attr("disabled", false);
-                $('#HSourceName').attr("disabled", true);
-                $('#HSourceList').removeClass("layui-btn-disabled").attr("disabled", false);
-                $('#HMainSourceBillNo').attr("disabled", true);
-                $('#XDHList').removeClass("layui-btn-disabled").attr("disabled", false);
-                $('#HGroupName').attr("disabled", true);
-                $('#HGroupList').removeClass("layui-btn-disabled").attr("disabled", false);
-                $('#HDeptName').attr("disabled", true);
-                $('#HDeptList').removeClass("layui-btn-disabled").attr("disabled", false);
-                form.render('select');
-                $('#HICMOBillNo').attr("disabled", false);
-                //$('#HICMOBillNo').val("0");
-                $("#HProcID").val("0");            //宸ュ簭ID
-                $("#HMainSourceInterID").val("0"); //婧愬崟涓籌D
-                $("#HMainSourceEntryID").val("0"); //婧愬崟瀛愬唴鐮�
-                $("#HICMOInterID").val("0"); //鐢熶骇璁㈠崟ID
-                $("#HICMOEntryID").val("0"); //鐢熶骇璁㈠崟瀛怚D
 
             }
 
             //鏈夋簮鍗曟柊澧�
-            if (Type == 2)
-            {
+            function set_AddNew() {
+                //鍒濆鍩烘湰淇℃伅璧嬪��
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
+                $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //寮�宸ユ棩鏈�
+                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒跺崟鏃ユ湡
+                $("#HMaker").val(sessionStorage["HUserName"]);     //鍒跺崟浜�
 
                 //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
 
@@ -539,20 +490,132 @@
                         }
                     });
             }
-
+           
             //缂栬緫
-            if (Type == 3)
+            function set_EditFromGrid()
             {
+                $('#HMaterCode').attr("disabled", true);
+                $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#HMaterName').attr("disabled", true);
+                $('#HMaterSpec').attr("disabled", true);
+                $('#HBeginDate').attr("disabled", true);
+                $('#HSourceName').attr("disabled", true);
+                $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#HMainSourceBillNo').attr("disabled", true);
+                $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#HDeptName').attr("disabled", true);
+                $('#HDeptList').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#SourceType').attr("disabled", true);
+                form.render('select');
+                $('#HICMOBillNo').attr("disabled", true);
 
+                $.ajax({
+                    url: GetWEBURL() + "Sc_MESBeginWorkBill/Sc_MESBeginWorkBillListCheckDetai",
+                    type: "GET",
+                    data: {
+                        "HID": linterid
+                    },
+                    success: function (result) {
+
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data.h_v_Sc_MESBeginWorkBillList_NEW[0];
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HInterID": data.hmainid
+                                , "HBillNo": data.鍗曟嵁鍙�
+                                , "HDate": formatDate(data.鏃ユ湡)
+                                , "HProcID": data.HProcID
+                                , "HProcName": data.宸ュ簭鍚嶇О
+                                , "HMaterID": data.HMaterID
+                                , "HMaterCode": data.浜у搧浠g爜
+                                , "HMaterName": data.浜у搧鍚嶇О
+                                , "HMaterSpec": data.瑙勬牸鍨嬪彿
+                                , "HBeginDate": data.寮�宸ユ椂闂�
+                                , "HSourceID": data.HSourceID              //璧勬簮ID
+                                , "HSourceName": data.璧勬簮鍚嶇О             //璧勬簮鍚嶇О
+                                , "HEmpID": data.HEmpID                   //鎿嶄綔鍛業D
+                                , "HEmpName": data.鐢宠寮�宸ヤ汉鍛�           //鎿嶄綔鍛�
+                                , "HMainSourceInterID": data.HMainSourceInterID                 //婧愬崟ID
+                                , "HMainSourceEntryID": data.HMainSourceEntryID                 //婧愬崟瀛怚D
+                                , "HMainSourceBillNo": data.HMainSourceBillNo                 //婧愬崟鍗曞彿
+                                , "HMainSourceBillType": data.HMainSourceBillType               //婧愬崟绫诲瀷
+                                , "HGroupID": data.HGroupID                //鐝粍ID
+                                , "HGroupName": data.鐝粍鍚嶇О              //鐝粍鍚嶇О
+                                , "HDeptID": data.HDeptID                  //閮ㄩ棬ID
+                                , "HDeptName": data.閮ㄩ棬鍚嶇О               //閮ㄩ棬鍚嶇О
+                                , "HICMOInterID": data.HICMOInterID                       //鐢熶骇璁㈠崟涓籌D
+                                , "HICMOEntryID": data.HICMOEntryID                        //鐢熶骇璁㈠崟瀛怚D
+                                , "HICMOBillNo": data.HICMOBillNo                        //鐢熶骇璁㈠崟
+                                , "HRemark": data.澶囨敞                    //澶囨敞
+                                , "HMaker": data.鍒跺崟浜�                            //鍒跺崟浜�
+                                , "HMakeDate": data.鍒跺崟鏃ユ湡                          //鍒跺崟鏃ユ湡
+                                , "HUpDater": sessionStorage["HUserName"]             //淇敼浜�
+                                , "HUpDateDate": Format(new Date(), "yyyy-MM-dd hh:mm:ss")//淇敼鏃ユ湡
+                                , "HChecker": data.瀹℃牳浜�             //瀹℃牳浜�
+                                , "HCheckDate": data.瀹℃牳鏃ユ湡   //瀹℃牳鏃ユ湡
+                                , "HCloseMan": data.鍏抽棴浜�                //鍏抽棴浜�
+                                , "HCloseDate": data.鍏抽棴鏃ユ湡             //鍏抽棴鏃ユ湡
+                                , "HDeleteMan": data.浣滃簾浜�               //浣滃簾浜�
+                                , "HDeleteDate": data.浣滃簾鏃ユ湡       //浣滃簾鏃ユ湡
+
+                            });
+
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
             }
+       
+
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == 0) {
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("0");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '3787' },
+                    success: function (d) {
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HInterID").val(0);
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+            }
+
+              //鑾峰彇涓嬫媺閫変腑鍊�
+            form.on('select(SourceType)', function (data) {
+                Sctag = data.value;
+                form.render('select');
+                if (Sctag != "2")  //鏃犳簮鍗�
+                {
+                    $("#HMainSourceInterID").val("");
+                    $("#HMainSourceEntryID").val("");
+                    $("#HMainSourceBillNo").val("");
+                    $("#HMainSourceBillType").val("");
+                    $('#HMainSourceBillNo').attr("disabled", false);
+                    $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
+                    OperationType = 1;
+                }
+                else {
+                    $('#HMainSourceBillNo').attr("disabled", true);
+                    $('#XDHList').removeClass("layui-btn-disabled").attr("disabled", false);
+                    OperationType = 2;
+                }
+            });
+
+
           
 
 
             //淇濆瓨鎻愪氦
-            form.on('submit(Saver)', function (data) {
-         
+            form.on('submit(Saver)', function (data) {        
                 var sMainStr = JSON.stringify(data.field);
-                console.log(sMainStr);
                 if (!AllowLoadData())//鏁版嵁楠岃瘉
                 {
                     return false;
@@ -565,9 +628,14 @@
                     dataType: "json",
                     success: function (data) {
                         if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
-                                layer.close(layer.index);
-                                window.parent.location.reload();
+                            $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+                            layer.confirm(data.Message, {
+                                btn: ['纭']
+                            }, function (index) {
+                                 if (data.Verify == "Y") //鑷姩瀹℃牳
+                                 {
+                                     SaveVerify(); //瀹℃牳
+                                 }
                             });
                         }
                         else {
@@ -580,10 +648,47 @@
                 })
             });
 
+            //瀹℃牳鎸夐挳鎻愪氦
+            form.on('submit(VerIfySaver)', function (data) {
+                SaveVerify();
+            });
+
+            //瀹℃牳鎻愪氦
+            function SaveVerify()
+            {
+                var InterID = $("#HInterID").val();
+                if (!AllowLoadData())//鏁版嵁楠岃瘉
+                {
+                    return false;
+                }
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Sc_MESBeginWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: true,
+                    data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
+                                //layer.close(layer.index);
+                                //window.parent.location.reload();
+                            });
+                        }
+                        else {
+                            layer.alert(data.Message, { icon: 5 })
+                        }
+                    },
+                    error: function (err) {
+                        layer.alert(err, { icon: 5 })
+                    }
+                })
+            }
+           
+
             //閫�鍑�
             form.on('submit(Exit)', function (data) {
-                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+                Pub_Close(1);
+                window.parent.location.reload();
             });
 
 
@@ -819,69 +924,13 @@
                 layer.msg("杞﹂棿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return Result = false;
             }
-            if (Type == "2") {
+            if (OperationType == "2") {
                 if ($("#HICMOInterID").val() == '' || $("#HICMOInterID").val() == null) {
                     layer.msg("鐢熶骇璁㈠崟涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return Result = false;
                 }
             }
             return Result;
-        }
-
-        function RoadBillMain(hID)//鍔犺浇琛ㄥご
-        {
-            //alert(hID);
-            //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
-            $.ajax({
-                url: GetWEBURL() + "Sc_MESBeginWorkBill/Sc_MESBeginWorkBillListCheckDetai",
-                type: "GET",
-                data: {
-                    "HID": hID
-                },
-                success: function (result) {
-
-                    if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                        var data = result.data.h_v_Sc_MESBeginWorkBillList_NEW[0];
-                        form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                            "HInterID": data.hmainid
-                            ,"HBillNo": data.鍗曟嵁鍙�
-                            , "HDate": formatDate(data.鏃ユ湡)
-                            , "HProcID": data.HProcID
-                            , "HProcName": data.宸ュ簭鍚嶇О
-                            , "HMaterID": data.HMaterID
-                            , "HMaterCode": data.浜у搧浠g爜
-                            , "HMaterName": data.浜у搧鍚嶇О
-                            , "HMaterSpec": data.瑙勬牸鍨嬪彿
-                            , "HBeginDate": data.寮�宸ユ椂闂�
-                            , "HSourceID": data.HSourceID              //璧勬簮ID
-                            , "HSourceName": data.璧勬簮鍚嶇О             //璧勬簮鍚嶇О
-                            , "HEmpID": data.HEmpID                   //鎿嶄綔鍛業D
-                            , "HEmpName": data.鐢宠寮�宸ヤ汉鍛�           //鎿嶄綔鍛�
-                            , "HMainSourceInterID": data.HMainSourceInterID                 //婧愬崟ID
-                            , "HMainSourceEntryID": data.HMainSourceEntryID                 //婧愬崟瀛怚D
-                            , "HMainSourceBillNo": data.HMainSourceBillNo                 //婧愬崟鍗曞彿
-                            , "HMainSourceBillType": data.HMainSourceBillType               //婧愬崟绫诲瀷
-                            , "HGroupID": data.HGroupID                //鐝粍ID
-                            , "HGroupName": data.鐝粍鍚嶇О              //鐝粍鍚嶇О
-                            , "HDeptID": data.HDeptID                  //閮ㄩ棬ID
-                            , "HDeptName": data.閮ㄩ棬鍚嶇О               //閮ㄩ棬鍚嶇О
-                            , "HICMOInterID": data.HICMOInterID                       //鐢熶骇璁㈠崟涓籌D
-                            , "HICMOEntryID": data.HICMOEntryID                        //鐢熶骇璁㈠崟瀛怚D
-                            , "HICMOBillNo": data.HICMOBillNo                        //鐢熶骇璁㈠崟
-                            , "HRemark": data.澶囨敞                    //澶囨敞
-                            , "HMaker": data.鍒跺崟浜�                            //鍒跺崟浜�
-                            , "HMakeDate": data.鍒跺崟鏃ユ湡                          //鍒跺崟鏃ユ湡
-                            , "HUpDater": data.淇敼浜�                           //淇敼浜�
-                            , "HUpDateDate": data.淇敼鏃ユ湡                        //淇敼鏃ユ湡
-                        });
-
-                    } else {
-                        layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
-                    }
-                }, error: function () {
-                    layer.alert("鍙戠敓閿欒!", { icon: 5 });
-                }
-            });
         }
 
         function formatDate(date) {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_MESBeginWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_MESBeginWorkBillList.html"
index 5293144..3dfe6bb 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_MESBeginWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_MESBeginWorkBillList.html"
@@ -40,6 +40,18 @@
                                         <input type="date" class="layui-input" id="HDate1">
                                     </div>
                                 </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鐢熶骇璧勬簮</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HSource" id="HSource">
+                                    </div>
+                                </div>
                                 <!--<div class="layui-inline">
                                     <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
                                     <div class="layui-input-block">
@@ -72,23 +84,20 @@
                                             <span>鍏朵粬鏉′欢></span>
                                         </div>
                                     </div>
-                                    <div class="layui-inline">
-                                        <label class="layui-form-label">鍗曟嵁鍙�</label>
-                                        <div class="layui-input-block">
-                                            <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
-                                        </div>
-                                    </div>
+
                                 </div>
                             </div>
                         </div>
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Print"><i class="layui-icon layui-icon-print"></i>棰勮</button>
+                                <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-edit"></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="btn-Audit"><i class="layui-icon layui-icon-radio"></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>
@@ -101,12 +110,20 @@
     <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>
+        //鑾峰彇椤甸潰璺宠浆鍙傛暟  //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        }
         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
@@ -118,168 +135,52 @@
                 , util = layui.util
             //鏌ヨ鏉′欢
             var sWhere = "";
+            var option = [];
+            //#endregion
 
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                , height: 'full-50'
-                , page: true
-                , cellMinWidth: 90
-                , cols: [[
-                    { type: 'checkbox', fixed: 'left' }
-                    , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
-                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160 }
-                    , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 115 }
-                    , { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О', width: 200 }
-                    , { field: '鐝粍浠g爜', title: '鐝粍浠g爜', width: 115 }
-                    , { field: '鐝粍鍚嶇О', title: '鐝粍鍚嶇О', width: 200 }
-                    , { field: '璧勬簮浠g爜', title: '璧勬簮浠g爜', width: 115 }
-                    , { field: '璧勬簮鍚嶇О', title: '璧勬簮鍚嶇О', width: 200 }
-                    , { field: '寮�宸ユ椂闂�', title: '寮�宸ユ椂闂�', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: '澶囨敞', title: '澶囨敞', width: 200 }
-                    , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
-                    , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
-                    , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: '淇敼浜�', title: '淇敼浜�', width: 200 }
-                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
-                    , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 }
-                    , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                ]]
-            };
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                //鎶ュ伐骞冲彴鎶ユ鐢宠鏌ョ湅鍒楄〃
+                set_ClearBill();
+            }
 
-            var index = layer.load(0);
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
 
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
-                    case 'btn-Add':
-                        //椤甸潰灞�-鑷畾涔�
-                        layer.open({
-                            type: 2,
-                            skin: 'layui-layer-rim', //鍔犱笂杈规
-                            title: '鏂板寮�宸ュ崟',
-                            closeBtn: 1,
-                            shift: 2,
-                            area: ['100%', '100%'],
-                            maxmin: true,
-                            content: '../鐢熶骇寮�宸ュ崟/Sc_Add_MESBeginWorkBillList.html?hID=&Type=1',
-                            end: function () {
-                                //鍒锋柊椤甸潰,
-                                location.reload();
-                            },
-                            success: function (layero, index) {
-
-                            }
-                        });
+                    case 'btn-Add': //set_AddNew();
                         break;
-                    case 'btn-Edit':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var hID = data[0].hmainid.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: '../鐢熶骇寮�宸ュ崟/Sc_Add_MESBeginWorkBillList.html?hID=' + hID +'&Type=3'
-                                , resize: false,
-                                end: function () {
-                                    //鍒锋柊椤甸潰,
-                                    location.reload();
-                                }
-                                , cancel: function () {
-                                    //$(".layui-btn").removeClass("layui-btn-disabled");
-                                }
-                            })
-
-                        } else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                        }
-
+                    case 'btn-Edit': set_ShowBill();
                         break;
-                    case 'btn-Delete':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var InterID = data[0].hmainid.toString();
-                            //閫昏緫鍒犻櫎鏂规硶
-                            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                                $.ajax({
-                                    type: "GET",
-                                    url: GetWEBURL() + "Sc_MESBeginWorkBill/DeltetMESBeginWorkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                    data: { "HInterID": InterID },
-                                    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('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                        }
+                    case 'btn-Delete': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': set_Refresh();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit': set_CheckBill();
+                        break;
+                    //閫�鍑�
+                    case 'get_Exit': Pub_Close(2);
                         break;
                 };
             });
 
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Sc_MESBeginWorkBill/GetMESBeginWorkBill',
-                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 });
-                }
-            });
-
-            //閲嶇疆鎸夐挳
-            form.on('submit(btnReSearch)', function (data) {
-                $("#HDate").val("");//寮�濮嬫棩鏈�
-                $("#HDate1").val("");//缁撴潫鏃ユ湡
-                $("#HBillNo").val("");//鍗曟嵁鍙�
-                $("#btnSearch").click();
-            });
-
             //鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+                var ajaxLoad = layer.load();
                 var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
                 var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
                 var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+                var HSource = $("#HSource").val();//鐢熶骇璧勬簮
                 if (HDate) {
                     sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
                 }
@@ -289,24 +190,24 @@
                 if (HBillNo) {
                     sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
                 }
-                var index = layer.load(0);
+                if (HSource) {
+                    sWhere += " and 璧勬簮浠g爜 like '%" + HSource + "%' or 璧勬簮鍚嶇О like '%" + HSource + "%'";
+                }
                 $.ajax({
-                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                     url: GetWEBURL() + '/Sc_MESBeginWorkBill/GetMESBeginWorkBill',
                     type: "GET",
-                    data: { "sWhere": sWhere},
+                    data: { "sWhere": sWhere },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
                             table.render(option);
-                            layer.close(index);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                            layer.close(ajaxLoad);
                         } else {
-                            layer.close(index);
+                            layer.close(ajaxLoad);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
-                        layer.close(index);
+                        layer.close(ajaxLoad);
                         layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
                     }
                 });
@@ -320,19 +221,277 @@
                 //$("#BeginHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
             });
 
-            //鐩戝惉琛屽弻鍑讳簨浠�
-            table.on('rowDouble(mainTable)', function (obj) {
-                layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HBillNo").val("");//鍗曟嵁鍙�
+                $("#HSource").val("");//鐢熶骇璧勬簮
+                $("#btnSearch").click();
             });
+            //#endregion
 
 
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
 
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display();
+
+            }
+
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+                 option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160 }
+                        , { field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 160 }
+                        , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 115 }
+                        , { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О', width: 200 }
+                        , { field: '鐝粍浠g爜', title: '鐝粍浠g爜', width: 115 }
+                        , { field: '鐝粍鍚嶇О', title: '鐝粍鍚嶇О', width: 200 }
+                        , { field: '璧勬簮浠g爜', title: '璧勬簮浠g爜', width: 115 }
+                        , { field: '璧勬簮鍚嶇О', title: '璧勬簮鍚嶇О', width: 200 }
+                        , { field: '寮�宸ユ椂闂�', title: '寮�宸ユ椂闂�', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '澶囨敞', title: '澶囨敞', width: 200 }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '淇敼浜�', title: '淇敼浜�', width: 200 }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 }
+                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                    ]]
+                };
+            }
+
+            //鏌ヨ
+            function get_Display()
+            {
+                var ajaxLoad = layer.load();
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_MESBeginWorkBill/GetMESBeginWorkBill',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //鏂板
+            function set_AddNew()
+            {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板寮�宸ュ崟',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../鐢熶骇寮�宸ュ崟/Sc_Add_MESBeginWorkBillList.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 linterid = data[0].hmainid.toString();
+                    var HBillStatus = data[0].HBillStatus.toString();
+                    if (HBillStatus != "1")
+                    {
+                        layer.msg('鍗曟嵁鐘舵�佷笉涓烘湭瀹℃牳鐘舵��,涓嶅厑璁哥紪杈戯紒');
+                        return false;
+                    }
+                    //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: '../鐢熶骇寮�宸ュ崟/Sc_Add_MESBeginWorkBillList.html?OperationType=3&linterid=' + linterid+'&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 InterID = data[0].hmainid.toString();
+                    var HBillStatus = data[0].HBillStatus.toString();
+                    if (HBillStatus != "1") {
+                        layer.msg('鍗曟嵁鐘舵�佷笉涓烘湭瀹℃牳鐘舵��,涓嶅厑璁稿垹闄わ紒');
+                        return false;
+                    }
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "Sc_MESBeginWorkBill/DeltetMESBeginWorkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": InterID },
+                            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('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+
+            //鍒锋柊
+            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();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sc_MESBeginWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "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_AbandonCheck() {
+                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_MESBeginWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "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('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�');
+                }
+
+            }
+
+
+            //#endregion
 
             //浠ヤ笂鏄痩ayui妯″潡
         });
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html"
index 72c7984..7d3a809 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html"
@@ -1,8 +1,8 @@
 锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<title>璁惧鐐规璁″垝鍗曞垪琛�</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>璁惧鐐规璁″垝鍗曞垪琛�</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -115,256 +115,238 @@
                 , laypage = layui.laypage
                 , laydate = layui.laydate
                 , util = layui.util
-            //鏌ヨ鏉′欢
             var sWhere = "";
+            //鍏敤鍙橀噺
+            var option = [];
 
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                , height: 'full-50'
-                , page: true
-                , cellMinWidth: 90
-                , cols: [[
-                    { type: 'checkbox', fixed: 'left' }
-                    , { field: 'hmainid', title: 'hmainid', hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
-                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
-                    , { field: '璁惧浠g爜', title: '璁惧浠g爜', width: 200 }
-                    , { field: '璁惧鍚嶇О', title: '璁惧鍚嶇О', width: 200, hide: true }
-                    , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 200, hide: true }
-                    , { field: '寮�濮嬫棩鏈�', title: '寮�濮嬫棩鏈�', width: 200 }
-                    , { field: '缁撴潫鏃ユ湡', title: '缁撴潫鏃ユ湡', width: 200 }
-                    , { field: '鍛ㄦ湡鍗曚綅', title: '鍛ㄦ湡鍗曚綅', width: 200 }
-                    , { field: '鐐规鍛ㄦ湡', title: '鐐规鍛ㄦ湡', width: 200 }
-                    , { field: '鎽樿', title: '鎽樿', width: 200 }
-                    , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 }
-                    , { field: '鐐规椤圭洰', title: '鐐规椤圭洰', width: 115, hide: true }
-                    , { field: '鐐规閮ㄤ綅', title: '鐐规閮ㄤ綅', width: 200 }
-                    , { field: '鍏蜂綋瑕佹眰', title: '鍏蜂綋瑕佹眰', width: 200 }
-                    , { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 200 }
-                    , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
-                    , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 }
-                    , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 }
-                    , { field: '鍏宠仈閲戦', title: '鍏宠仈閲戦', width: 200 }
-                    , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 115, hide: true }
-                    , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
-                    , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200, hide: true }
-                    , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115, hide: true }
-                    , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200 }
-                    , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
-                    , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, hide: true }
-                    , { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true }
-                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true }
-                    , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
-                    , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200 }
-                    , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200, hide: true }
-                    , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 115, hide: true }
-                    , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
-                    , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
-                    , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
-                    , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
-                    , { field: 'hbilltype', title: 'hbilltype', width: 200 }
-                ]]
-            };
-
-            var index = layer.load(0);
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            //鍔犺浇鏁版嵁鍒扮綉鏍�
+            get_Display(sWhere);
 
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
+                    //鏂板鎸夐挳
                     case 'btn-Add':
-                        //椤甸潰灞�-鑷畾涔�
-                        layer.open({
-                            type: 2,
-                            skin: 'layui-layer-rim', //鍔犱笂杈规
-                            title: '鏂板璁惧鐐规璁″垝鍗� ',
-                            closeBtn: false,
-                            shift: 2,
-                            area: ['100%', '100%'],
-                            maxmin: true,
-                            content: '../璁惧绠$悊/Sb_EquipDotCheckPlanBillEdit.html',
-                            end: function () {
-                                //鍒锋柊椤甸潰,
-                                location.reload();
-                            },
-                            success: function (layero, index) {
-
-                            }
-                        });
+                        set_AddNew();
                         break;
                     case 'btn-Edit':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var hID = data[0].hmainid.toString();
-                            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                            layer.open({
-                                type: 2
-                                , area: ['100%', '100%']
-                                , title: '缂栬緫璁惧鐐规璁″垝鍗� '
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: '../璁惧绠$悊/Sb_EquipDotCheckPlanBillEdit.html?hID=' + hID
-                                , resize: false,
-                                end: function () {
-                                    //鍒锋柊椤甸潰,
-                                    location.reload();
-                                }
-                                , cancel: function () {
-                                    //$(".layui-btn").removeClass("layui-btn-disabled");
-                                }
-                            })
-
-                        } else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                        }
-
+                        set_ShowBill();
                         break;
                     case 'btn-Delete':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var HInterID = data[0].hmainid.toString();
-
-                            //閫昏緫鍒犻櫎鏂规硶
-                            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                                $.ajax({
-                                    type: "GET",
-                                    url: GetWEBURL() + "/Sb_EquipDotCheckPlanBill/DeltetEquipDotCheckPlanBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                    data: { "HInterID": HInterID },
-                                    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('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                        }
+                        set_DeleteBill();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit':
+                        set_CheckBill();
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_AbandonCheck();
+                        break;
+                    //棰勮鎸夐挳
+                    case 'btn-Print':
+                        get_PrintReport();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'btn-Close':
+                        parent.layui.admin.events.closeThisTabs();
                         break;
                 };
             });
 
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Sb_EquipDotCheckPlanBill/GetEquipDotCheckPlanBillList',
-                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 });
-                }
-            });
-
             //閲嶇疆鎸夐挳
-            //form.on('submit(btnReSearch)', function (data) {
-            //    $("#HBillType").val("");//鍗曟嵁绫诲瀷
-            //    $("#HBillNo").val("");//鍗曟嵁鍙�
-            //    $("#HSourceBillNo").val("");//婧愬崟鍙�
-            //    $("#HCreateBy").val("");//鍒跺崟浜�
-            //    $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-            //    $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            //    $("#btnSearch").click();
-            //});
-
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+            }
             //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
-                //var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
-                //var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
-                //var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜�
-                //var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
-                //var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿
-                //if (HBillNo) {
-                //    sWhere += " and HBillNo like '%" + HBillNo + "%'";
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(table, option);
+            });
+            //蹇�熻繃婊�
+            function get_FastQuery(table, option) {
+                //var HNumber = $("#HNumber").val();
+                //var HName = $("#HName").val();
+                //if (HNumber) {
+                //    sWhere += " and 鑱屽憳浠g爜 like '%" + HNumber + "%'";
                 //}
-                //if (HCreateBy) {
-                //    sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
-                //}
-                //if (BenginHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
-                //}
-                //if (EndHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
+                //if (HName) {
+                //    sWhere += " and 鑱屽憳鍚嶇О like '%" + HName + "%'";
                 //}
                 var index = layer.load(0);
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: 'hmainid', hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
+                        , { field: '璁惧浠g爜', title: '璁惧浠g爜', width: 200 }
+                        , { field: '璁惧鍚嶇О', title: '璁惧鍚嶇О', width: 200, hide: true }
+                        , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 200, hide: true }
+                        , { field: '寮�濮嬫棩鏈�', title: '寮�濮嬫棩鏈�', width: 200 }
+                        , { field: '缁撴潫鏃ユ湡', title: '缁撴潫鏃ユ湡', width: 200 }
+                        , { field: '鍛ㄦ湡鍗曚綅', title: '鍛ㄦ湡鍗曚綅', width: 200 }
+                        , { field: '鐐规鍛ㄦ湡', title: '鐐规鍛ㄦ湡', width: 200 }
+                        , { field: '鎽樿', title: '鎽樿', width: 200 }
+                        , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 }
+                        , { field: '鐐规椤圭洰', title: '鐐规椤圭洰', width: 115, hide: true }
+                        , { field: '鐐规閮ㄤ綅', title: '鐐规閮ㄤ綅', width: 200 }
+                        , { field: '鍏蜂綋瑕佹眰', title: '鍏蜂綋瑕佹眰', width: 200 }
+                        , { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 200 }
+                        , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
+                        , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 }
+                        , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 }
+                        , { field: '鍏宠仈閲戦', title: '鍏宠仈閲戦', width: 200 }
+                        , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 115, hide: true }
+                        , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
+                        , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200, hide: true }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115, hide: true }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200 }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, hide: true }
+                        , { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true }
+                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200 }
+                        , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200, hide: true }
+                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 115, hide: true }
+                        , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
+                        , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
+                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
+                        , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
+                        , { field: 'hbilltype', title: 'hbilltype', width: 200 }
+                    ]]
+                };
+            }
+            var index = layer.load(0);
+
+            //鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板璁惧鐐规璁″垝鍗� ',
+                    closeBtn: false,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../璁惧绠$悊/Sb_EquipDotCheckPlanBillEdit.html',
+                    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].hmainid.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫璁惧鐐规璁″垝鍗� '
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../璁惧绠$悊/Sb_EquipDotCheckPlanBillEdit.html?hID=' + hID
+                        , 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 HInterID = data[0].hmainid.toString();
+
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/Sb_EquipDotCheckPlanBill/DeltetEquipDotCheckPlanBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": HInterID },
+                            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('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+            //鍔犺浇缃戞牸
+            function get_Display(sWhere) {
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
                 $.ajax({
                     //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                     url: GetWEBURL() + '/Sb_EquipDotCheckPlanBill/GetEquipDotCheckPlanBillList',
                     type: "GET",
-                    data: { "sWhere": sWhere},
+                    data: { "sWhere": sWhere },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
                             table.render(option);
                             layer.close(index);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
                             layer.close(index);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
                         layer.close(index);
-                        layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
-                });
-                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-                sWhere = "";
-                //$("#HBillType").val("");//鍗曟嵁绫诲瀷
-                //$("#HBillNo").val("");//鍗曟嵁鍙�
-                //$("#HSourceBillNo").val("");//婧愬崟鍙�
-                //$("#HCreateBy").val("");//鍒跺崟浜�
-                //$("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-                //$("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            });
-
-            //鐩戝惉琛屽弻鍑讳簨浠�
-            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妯″潡
+                })
+            }
         });
-
-
-
-
     </script>
-
 </body>
 </html>
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
index 52c8b68..9ab5f9e 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
@@ -1,8 +1,8 @@
 锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<title>璁惧淇濆吇璁板綍鍗曞垪琛�</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>璁惧淇濆吇璁板綍鍗曞垪琛�</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -115,251 +115,246 @@
                 , laypage = layui.laypage
                 , laydate = layui.laydate
                 , util = layui.util
-            //鏌ヨ鏉′欢
             var sWhere = "";
+            //鍏敤鍙橀噺
+            var option = [];
 
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                , height: 'full-50'
-                , page: true
-                , cellMinWidth: 90
-                , cols: [[
-                    { type: 'checkbox', fixed: 'left' }
-                    , { field: 'hmainid', title: 'hmainid', hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
-                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
-                    , { field: '璁惧浠g爜', title: '璁惧浠g爜', width: 200 }
-                    , { field: '璁惧鍚嶇О', title: '璁惧鍚嶇О', width: 200, hide: true }
-                    , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 200, hide: true }
-                    , { field: '寮�濮嬫棩鏈�', title: '寮�濮嬫棩鏈�', width: 200 }
-                    , { field: '缁撴潫鏃ユ湡', title: '缁撴潫鏃ユ湡', width: 200 }
-                    , { field: '淇濆吇璁″垝缂栧彿', title: '淇濆吇璁″垝缂栧彿', width: 200 }
-                    , { field: '鎽樿', title: '鎽樿', width: 200 }
-                    , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 }
-                    , { field: '閰嶄欢浠g爜', title: '閰嶄欢浠g爜', width: 115, hide: true }
-                    , { field: '閰嶄欢鍚嶇О', title: '閰嶄欢鍚嶇О', width: 200 }
-                    , { field: '鍗曚綅', title: '鍗曚綅', width: 200 }
-                    , { field: '瀹為檯鐢ㄩ噺', title: '瀹為檯鐢ㄩ噺', width: 200 }
-                    , { field: '鏍囧噯鐢ㄩ噺', title: '鏍囧噯鐢ㄩ噺', width: 200 }
-                    , { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 200 }
-                    , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
-                    , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 }
-                    , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 }
-                    , { field: '鍏宠仈閲戦', title: '鍏宠仈閲戦', width: 200 }
-                    , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 115, hide: true }
-                    , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
-                    , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200, hide: true }
-                    , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115, hide: true }
-                    , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200 }
-                    , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
-                    , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, hide: true }
-                    , { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true }
-                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true }
-                    , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
-                    , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200 }
-                    , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200, hide: true }
-                    , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 115, hide: true }
-                    , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
-                    , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
-                    , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
-                    , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
-                    , { field: 'hbilltype', title: 'hbilltype', width: 200 }
-                ]]
-            };
-
-            var index = layer.load(0);
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            //鍔犺浇鏁版嵁鍒扮綉鏍�
+            get_Display(sWhere);
 
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
+                    //鏂板鎸夐挳
                     case 'btn-Add':
-                        //椤甸潰灞�-鑷畾涔�
-                        layer.open({
-                            type: 2,
-                            skin: 'layui-layer-rim', //鍔犱笂杈规
-                            title: '鏂板璁惧淇濆吇璁板綍鍗� ',
-                            closeBtn: false,
-                            shift: 2,
-                            area: ['100%', '100%'],
-                            maxmin: true,
-                            content: '../璁惧绠$悊/Sb_EquipMaintainBillEdit.html',
-                            end: function () {
-                                //鍒锋柊椤甸潰,
-                                location.reload();
-                            },
-                            success: function (layero, index) {
-
-                            }
-                        });
+                        set_AddNew();
                         break;
                     case 'btn-Edit':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var hID = data[0].hmainid.toString();
-                            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                            layer.open({
-                                type: 2
-                                , area: ['100%', '100%']
-                                , title: '缂栬緫璁惧淇濆吇璁板綍鍗� '
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: '../璁惧绠$悊/Sb_EquipMaintainBillEdit.html?hID=' + hID
-                                , resize: false,
-                                end: function () {
-                                    //鍒锋柊椤甸潰,
-                                    location.reload();
-                                }
-                                , cancel: function () {
-                                    //$(".layui-btn").removeClass("layui-btn-disabled");
-                                }
-                            })
-
-                        } else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                        }
-
+                        set_ShowBill();
                         break;
                     case 'btn-Delete':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var HInterID = data[0].hmainid.toString();
-
-                            //閫昏緫鍒犻櫎鏂规硶
-                            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                                $.ajax({
-                                    type: "GET",
-                                    url: GetWEBURL() + "/Sb_EquipMaintainBill/DeltetEquipMaintainBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                    data: { "HInterID": HInterID },
-                                    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('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                        }
+                        set_DeleteBill();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit':
+                        set_CheckBill();
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_AbandonCheck();
+                        break;
+                    //棰勮鎸夐挳
+                    case 'btn-Print':
+                        get_PrintReport();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'btn-Close':
+                        parent.layui.admin.events.closeThisTabs();
                         break;
                 };
             });
 
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Sb_EquipMaintainBill/GetEquipMaintainBillList',
-                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 });
-                }
-            });
-
             //閲嶇疆鎸夐挳
-            //form.on('submit(btnReSearch)', function (data) {
-            //    $("#HBillType").val("");//鍗曟嵁绫诲瀷
-            //    $("#HBillNo").val("");//鍗曟嵁鍙�
-            //    $("#HSourceBillNo").val("");//婧愬崟鍙�
-            //    $("#HCreateBy").val("");//鍒跺崟浜�
-            //    $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-            //    $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            //    $("#btnSearch").click();
-            //});
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+            }
 
             //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
-                //var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
-                //var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
-                //var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜�
-                //var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
-                //var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿
-                //if (HBillNo) {
-                //    sWhere += " and HBillNo like '%" + HBillNo + "%'";
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(table, option);
+            });
+
+            //蹇�熻繃婊�
+            function get_FastQuery(table, option) {
+                //var HNumber = $("#HNumber").val();
+                //var HName = $("#HName").val();
+                //if (HNumber) {
+                //    sWhere += " and 鑱屽憳浠g爜 like '%" + HNumber + "%'";
                 //}
-                //if (HCreateBy) {
-                //    sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
-                //}
-                //if (BenginHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
-                //}
-                //if (EndHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
+                //if (HName) {
+                //    sWhere += " and 鑱屽憳鍚嶇О like '%" + HName + "%'";
                 //}
                 var index = layer.load(0);
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: 'hmainid', hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
+                        , { field: '璁惧浠g爜', title: '璁惧浠g爜', width: 200 }
+                        , { field: '璁惧鍚嶇О', title: '璁惧鍚嶇О', width: 200, hide: true }
+                        , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 200, hide: true }
+                        , { field: '寮�濮嬫棩鏈�', title: '寮�濮嬫棩鏈�', width: 200 }
+                        , { field: '缁撴潫鏃ユ湡', title: '缁撴潫鏃ユ湡', width: 200 }
+                        , { field: '淇濆吇璁″垝缂栧彿', title: '淇濆吇璁″垝缂栧彿', width: 200 }
+                        , { field: '鎽樿', title: '鎽樿', width: 200 }
+                        , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 }
+                        , { field: '閰嶄欢浠g爜', title: '閰嶄欢浠g爜', width: 115, hide: true }
+                        , { field: '閰嶄欢鍚嶇О', title: '閰嶄欢鍚嶇О', width: 200 }
+                        , { field: '鍗曚綅', title: '鍗曚綅', width: 200 }
+                        , { field: '瀹為檯鐢ㄩ噺', title: '瀹為檯鐢ㄩ噺', width: 200 }
+                        , { field: '鏍囧噯鐢ㄩ噺', title: '鏍囧噯鐢ㄩ噺', width: 200 }
+                        , { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 200 }
+                        , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
+                        , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 }
+                        , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 }
+                        , { field: '鍏宠仈閲戦', title: '鍏宠仈閲戦', width: 200 }
+                        , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 115, hide: true }
+                        , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
+                        , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200, hide: true }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115, hide: true }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200 }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, hide: true }
+                        , { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true }
+                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200 }
+                        , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200, hide: true }
+                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 115, hide: true }
+                        , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
+                        , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
+                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
+                        , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
+                        , { field: 'hbilltype', title: 'hbilltype', width: 200 }
+                    ]]
+                }
+            }
+            var index = layer.load(0);
+            //鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板璁惧淇濆吇璁板綍鍗� ',
+                    closeBtn: false,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../璁惧绠$悊/Sb_EquipMaintainBillEdit.html',
+                    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].hmainid.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫璁惧淇濆吇璁板綍鍗� '
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../璁惧绠$悊/Sb_EquipMaintainBillEdit.html?hID=' + hID
+                        , 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 HInterID = data[0].hmainid.toString();
+
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/Sb_EquipMaintainBill/DeltetEquipMaintainBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": HInterID },
+                            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('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+            //瀹℃牳
+            function set_CheckBill() {
+            }
+            //鍙嶅鏍�
+            function set_AbandonCheck() {
+            }
+
+            //鍔犺浇缃戞牸
+            function get_Display(sWhere) {
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
                 $.ajax({
                     //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                     url: GetWEBURL() + '/Sb_EquipMaintainBill/GetEquipMaintainBillList',
                     type: "GET",
-                    data: { "sWhere": sWhere},
+                    data: { "sWhere": sWhere },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
                             table.render(option);
                             layer.close(index);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
                             layer.close(index);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
                         layer.close(index);
-                        layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
-                });
-                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-                sWhere = "";
-                //$("#HBillType").val("");//鍗曟嵁绫诲瀷
-                //$("#HBillNo").val("");//鍗曟嵁鍙�
-                //$("#HSourceBillNo").val("");//婧愬崟鍙�
-                //$("#HCreateBy").val("");//鍒跺崟浜�
-                //$("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-                //$("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            });
-
-            //鐩戝惉琛屽弻鍑讳簨浠�
-            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/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html"
index 591bd0d..7721132 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html"
@@ -1,8 +1,8 @@
 锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<title>璁惧淇濆吇璁″垝鍗曞垪琛�</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>璁惧淇濆吇璁″垝鍗曞垪琛�</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -115,251 +115,249 @@
                 , laypage = layui.laypage
                 , laydate = layui.laydate
                 , util = layui.util
-            //鏌ヨ鏉′欢
             var sWhere = "";
+            //鍏敤鍙橀噺
+            var option = [];
 
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                , height: 'full-50'
-                , page: true
-                , cellMinWidth: 90
-                , cols: [[
-                    { type: 'checkbox', fixed: 'left' }
-                    , { field: 'hmainid', title: 'hmainid', hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
-                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
-                    , { field: '璁惧浠g爜', title: '璁惧浠g爜', width: 200 }
-                    , { field: '璁惧鍚嶇О', title: '璁惧鍚嶇О', width: 200, hide: true }
-                    , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 200, hide: true }
-                    , { field: '寮�濮嬫棩鏈�', title: '寮�濮嬫棩鏈�', width: 200 }
-                    , { field: '缁撴潫鏃ユ湡', title: '缁撴潫鏃ユ湡', width: 200 }
-                    , { field: '鍛ㄦ湡鍗曚綅', title: '鍛ㄦ湡鍗曚綅', width: 200 }
-                    , { field: '淇濆吇鍛ㄦ湡', title: '淇濆吇鍛ㄦ湡', width: 200 }
-                    , { field: '鎽樿', title: '鎽樿', width: 200 }
-                    , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 }
-                    , { field: '閰嶄欢浠g爜', title: '閰嶄欢浠g爜', width: 115, hide: true }
-                    , { field: '閰嶄欢鍚嶇О', title: '閰嶄欢鍚嶇О', width: 200 }
-                    , { field: '鍗曚綅', title: '鍗曚綅', width: 200 }
-                    , { field: '鐢ㄩ噺', title: '鐢ㄩ噺', width: 200 }
-                    , { field: '鏍囧噯鐢ㄩ噺', title: '鏍囧噯鐢ㄩ噺', width: 200 }
-                    , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
-                    , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 }
-                    , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 }
-                    , { field: '鍏宠仈閲戦', title: '鍏宠仈閲戦', width: 200 }
-                    , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 115, hide: true }
-                    , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
-                    , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200, hide: true }
-                    , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115, hide: true }
-                    , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200 }
-                    , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
-                    , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, hide: true }
-                    , { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true }
-                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true }
-                    , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
-                    , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200 }
-                    , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200, hide: true }
-                    , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 115, hide: true }
-                    , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
-                    , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
-                    , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
-                    , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
-                    , { field: 'hbilltype', title: 'hbilltype', width: 200 }
-                ]]
-            };
-
-            var index = layer.load(0);
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            //鍔犺浇鏁版嵁鍒扮綉鏍�
+            get_Display(sWhere);
 
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
+                    //鏂板鎸夐挳
                     case 'btn-Add':
-                        //椤甸潰灞�-鑷畾涔�
-                        layer.open({
-                            type: 2,
-                            skin: 'layui-layer-rim', //鍔犱笂杈规
-                            title: '鏂板璁惧淇濆吇璁″垝鍗� ',
-                            closeBtn: false,
-                            shift: 2,
-                            area: ['100%', '100%'],
-                            maxmin: true,
-                            content: '../璁惧绠$悊/Sb_EquipMaintainPlanBillEdit.html',
-                            end: function () {
-                                //鍒锋柊椤甸潰,
-                                location.reload();
-                            },
-                            success: function (layero, index) {
-
-                            }
-                        });
+                        set_AddNew();
                         break;
                     case 'btn-Edit':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var hID = data[0].hmainid.toString();
-                            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                            layer.open({
-                                type: 2
-                                , area: ['100%', '100%']
-                                , title: '缂栬緫璁惧淇濆吇璁″垝鍗� '
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: '../璁惧绠$悊/Sb_EquipMaintainPlanBillEdit.html?hID=' + hID
-                                , resize: false,
-                                end: function () {
-                                    //鍒锋柊椤甸潰,
-                                    location.reload();
-                                }
-                                , cancel: function () {
-                                    //$(".layui-btn").removeClass("layui-btn-disabled");
-                                }
-                            })
-
-                        } else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                        }
-
+                        set_ShowBill();
                         break;
                     case 'btn-Delete':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var HInterID = data[0].hmainid.toString();
-
-                            //閫昏緫鍒犻櫎鏂规硶
-                            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                                $.ajax({
-                                    type: "GET",
-                                    url: GetWEBURL() + "/Sb_EquipMaintainPlanBill/DeltetEquipMaintainPlanBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                    data: { "HInterID": HInterID },
-                                    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('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                        }
+                        set_DeleteBill();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit':
+                        set_CheckBill();
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_AbandonCheck();
+                        break;
+                    //棰勮鎸夐挳
+                    case 'btn-Print':
+                        get_PrintReport();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'btn-Close':
+                        parent.layui.admin.events.closeThisTabs();
                         break;
                 };
             });
 
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Sb_EquipMaintainPlanBill/GetEquipMaintainPlanBillList',
-                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 });
-                }
-            });
-
             //閲嶇疆鎸夐挳
-            //form.on('submit(btnReSearch)', function (data) {
-            //    $("#HBillType").val("");//鍗曟嵁绫诲瀷
-            //    $("#HBillNo").val("");//鍗曟嵁鍙�
-            //    $("#HSourceBillNo").val("");//婧愬崟鍙�
-            //    $("#HCreateBy").val("");//鍒跺崟浜�
-            //    $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-            //    $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            //    $("#btnSearch").click();
-            //});
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+            }
 
             //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
-                //var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
-                //var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
-                //var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜�
-                //var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
-                //var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿
-                //if (HBillNo) {
-                //    sWhere += " and HBillNo like '%" + HBillNo + "%'";
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(table, option);
+            });
+
+            //蹇�熻繃婊�
+            function get_FastQuery(table, option) {
+                //var HNumber = $("#HNumber").val();
+                //var HName = $("#HName").val();
+                //if (HNumber) {
+                //    sWhere += " and 鑱屽憳浠g爜 like '%" + HNumber + "%'";
                 //}
-                //if (HCreateBy) {
-                //    sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
-                //}
-                //if (BenginHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
-                //}
-                //if (EndHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
+                //if (HName) {
+                //    sWhere += " and 鑱屽憳鍚嶇О like '%" + HName + "%'";
                 //}
                 var index = layer.load(0);
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: 'hmainid', hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
+                        , { field: '璁惧浠g爜', title: '璁惧浠g爜', width: 200 }
+                        , { field: '璁惧鍚嶇О', title: '璁惧鍚嶇О', width: 200, hide: true }
+                        , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 200, hide: true }
+                        , { field: '寮�濮嬫棩鏈�', title: '寮�濮嬫棩鏈�', width: 200 }
+                        , { field: '缁撴潫鏃ユ湡', title: '缁撴潫鏃ユ湡', width: 200 }
+                        , { field: '鍛ㄦ湡鍗曚綅', title: '鍛ㄦ湡鍗曚綅', width: 200 }
+                        , { field: '淇濆吇鍛ㄦ湡', title: '淇濆吇鍛ㄦ湡', width: 200 }
+                        , { field: '鎽樿', title: '鎽樿', width: 200 }
+                        , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 }
+                        , { field: '閰嶄欢浠g爜', title: '閰嶄欢浠g爜', width: 115, hide: true }
+                        , { field: '閰嶄欢鍚嶇О', title: '閰嶄欢鍚嶇О', width: 200 }
+                        , { field: '鍗曚綅', title: '鍗曚綅', width: 200 }
+                        , { field: '鐢ㄩ噺', title: '鐢ㄩ噺', width: 200 }
+                        , { field: '鏍囧噯鐢ㄩ噺', title: '鏍囧噯鐢ㄩ噺', width: 200 }
+                        , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
+                        , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 }
+                        , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 }
+                        , { field: '鍏宠仈閲戦', title: '鍏宠仈閲戦', width: 200 }
+                        , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 115, hide: true }
+                        , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
+                        , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200, hide: true }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115, hide: true }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200 }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, hide: true }
+                        , { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true }
+                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200 }
+                        , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200, hide: true }
+                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 115, hide: true }
+                        , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
+                        , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
+                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
+                        , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
+                        , { field: 'hbilltype', title: 'hbilltype', width: 200 }
+                    ]]
+                }
+            }
+            var index = layer.load(0);
+            //鏂板
+            function set_AddNew() {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板璁惧淇濆吇璁″垝鍗� ',
+                    closeBtn: false,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../璁惧绠$悊/Sb_EquipMaintainPlanBillEdit.html',
+                    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].hmainid.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫璁惧淇濆吇璁″垝鍗� '
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../璁惧绠$悊/Sb_EquipMaintainPlanBillEdit.html?hID=' + hID
+                        , 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 HInterID = data[0].hmainid.toString();
+
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/Sb_EquipMaintainPlanBill/DeltetEquipMaintainPlanBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": HInterID },
+                            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('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+
+            function get_Display(sWhere) {
                 $.ajax({
                     //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                     url: GetWEBURL() + '/Sb_EquipMaintainPlanBill/GetEquipMaintainPlanBillList',
                     type: "GET",
-                    data: { "sWhere": sWhere},
+                    data: { "sWhere": sWhere },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
                             table.render(option);
                             layer.close(index);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
                             layer.close(index);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
                         layer.close(index);
-                        layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-                sWhere = "";
-                //$("#HBillType").val("");//鍗曟嵁绫诲瀷
-                //$("#HBillNo").val("");//鍗曟嵁鍙�
-                //$("#HSourceBillNo").val("");//婧愬崟鍙�
-                //$("#HCreateBy").val("");//鍒跺崟浜�
-                //$("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-                //$("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            });
+            }
 
-            //鐩戝惉琛屽弻鍑讳簨浠�
-            table.on('rowDouble(mainTable)', function (obj) {
-                layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
-            });
+            //瀹℃牳
+            function set_CheckBill() {
+            }
 
-
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
-
-
-            //浠ヤ笂鏄痩ayui妯″潡
+            //鍙嶅鏍�
+            function set_AbandonCheck() {
+            }
+            
         });
 
 
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
index 9028361..53af7d6 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
@@ -9,6 +9,11 @@
     <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>
+    <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>
     <style>
         .main-btn { /*澶撮儴涓绘寜閽�*/
             padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
@@ -31,19 +36,11 @@
         <div class="layui-card" style="padding: 2px;background-color: #efefef;">
             <div class="layui-card-body" style="padding: 1px;">
                 <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
-                    <div style="padding: 10px;">
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
-                            <i class="layui-icon layui-icon-print layuiadmin-button-btn"><span class="btn-title">棰勮</span></i>
-                        </button>
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
-                            <i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"><span class="btn-title">鏂板</span></i>
-                        </button>
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
-                            <i class="layui-icon layui-icon-edit layuiadmin-button-btn"><span class="btn-title">淇敼</span></i>
-                        </button>
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">
-                            <i class="layui-icon layui-icon-delete layuiadmin-button-btn"><span class="btn-title">淇濆瓨</span></i>
-                        </button>
+                    <div class="layui-card-header">
+                        <div class="layui-btn-group">
+                            <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-filter="btnSave">淇濆瓨</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
+                        </div>
                     </div>
                     <div class="layui-tab" lay-filter="tab-POStockInBill">
                         <ul class="layui-tab-title" lay-filter="tab-all">
@@ -504,6 +501,7 @@
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
                         </div>
                     </script>
+                    <input id="HItemID" name="HItemID" type="hidden" />
                 </form>
             </div>
         </div>
@@ -513,10 +511,6 @@
         <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
         <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
     </script>
-    <script src="../../../layuiadmin/layui/layui.js"></script>
-    <script src="../../../layuiadmin/Scripts/json2.js"></script>
-    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
-    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script>
 
         layui.config({
@@ -538,28 +532,25 @@
             //    }, function () { window.location.href = "../../user/login.html"; });
             //}
 
-            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;
+            //鑾峰彇椤甸潰璺宠浆鍙傛暟
+            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]];//婧愬崟绫诲瀷
             }
-
-            var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
-
-            //鍒ゆ柇鏄惁鏂板
-            if (linterid == null || linterid == 0) {
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
+                $("#HItemID").val(0);
+            }
+            else if (OperationType == 2) {//鏈夋簮鍗曟柊澧�
+                $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetMAXNum",
                     type: "GET",
-                    data: { "HBillType": '3772' },
+                    data: { "HBillType": '7505' },
                     success: function (d) {
                         //console.log(d.data);
                         $("#HInterID").val(d.data[0].HInterID);
@@ -568,11 +559,24 @@
                         $("#HMaker").val(sessionStorage["HUserName"]);
                     }
                 });
+                GetICMOBillValue(linterid)
             }
-            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+            else if (OperationType == 3) {//缂栬緫
+                $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
                 RoadBillMain(linterid);
-                RoadBillSub(linterid);
+                //RoadBillSub(linterid);
             }
+            else if (OperationType == 4) {//娴忚
+                $("#HItemID").val(linterid);//
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                RoadBillMain(linterid);
+                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+
             //鍒濆琛ㄦ牸鏁版嵁
             var rowdata = [{
                 "HProcNo": "0", "hprocid": "0", "HProcNumber": "", "宸ュ簭": "", "鍔犲伐璇存槑": "",
@@ -924,17 +928,23 @@
             //閫夋嫨鐢熶骇浠诲姟鍗�
             form.on('submit(btnSearchICMOBill)', function () {
                 layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '鐢熶骇浠诲姟鍗曞垪琛�'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鐢熶骇浠诲姟鍗曞垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
                     , content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ICMOBillListView.html', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    , 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('璇烽�夋嫨鏁版嵁');
+                        }
+                        GetICMOBillValue(checkStatus.data[0].hmainid)
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
+                    , btn2: function (index, layero) { }
                 })
             });
 
@@ -1010,13 +1020,80 @@
             });
 
             form.on('submit(Cancel)', function () {
-                //sessionStorage["SourceFlag"] = false;
-                parent.location.href = "../../../views/index.html"
-                //window.close();//鍏抽棴褰撳墠椤�
+                Pub_Close(1);
             })
 
-            //鑾峰彇鏄庣粏琛�
-            window.GetICMOBillDetail = function (hmainid) {  //杩斿洖璐d换浜�
+
+            ////鑾峰彇鏄庣粏琛�
+            //window.GetICMOBillDetail = function (hmainid) {
+            //    $.ajax({
+            //        url: GetWEBURL() + "/Sc_ProcessExchangeBill/GetICMOBillList",
+            //        type: "GET",
+            //        data: { "hmainid": hmainid, "OrganizationID": sessionStorage["OrganizationID"] },
+            //        success: function (result) {
+            //            if (result.count == 1) {
+            //                option.data = result.data;
+            //                table.render(option);
+            //            }
+            //            else {
+            //                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //            }
+            //        }
+            //    })
+            //}
+
+
+            //杩斿洖鐢熶骇浠诲姟鍗�
+            function GetICMOBillValue(hmainid) {
+                $.ajax({
+                    url: GetWEBURL() + "/Sc_ProcessExchangeBill/GetICMOBillDetail",
+                    type: "GET",
+                    data: { "hmainid": hmainid, "OrganizationID": sessionStorage["OrganizationID"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            var data = result.data[result.data.length - 1];
+                            $("#HICMOInterID").val(data.hmainid);
+                            $("#HICMOBillNo").val(data.鐢熶骇璁㈠崟鍙�);
+                            $("#HICMOEntryID").val(data.HEntryID);
+                            $("#HOrderProcNO").val(data.璁㈠崟璺熻釜鍙�);
+                            $("#HMaterID").val(data.hmaterid);
+                            $("#HMaterName").val(data.鐗╂枡鍚嶇О);
+                            $("#HMaterID2").val(data.hmaterid);
+                            $("#HMaterName2").val(data.鐗╂枡鍚嶇О);
+                            $("#HMaterNumber").val(data.鐗╂枡浠g爜);
+                            $("#HMaterNumber2").val(data.鐗╂枡浠g爜);
+                            $("#HModel").val(data.瑙勬牸鍨嬪彿);
+                            $("#HBatchNo").val(data.鎵瑰彿);
+                            $("#HUnitID").val(data.hunitid);
+                            $("#HUnitName").val(data.璁¢噺鍗曚綅鍚嶇О);
+                            $("#HUnitNumber").val(data.璁¢噺鍗曚綅浠g爜);
+                            $("#HPlanQty").val(data.璁″垝鐢熶骇鏁伴噺);
+                            $("#HQty").val(data.娴佽浆鍗℃暟閲�);
+                            $("#HprocExQty").val(data.娴佽浆鍗℃暟閲�);
+                            $("#HPlanBeginDate").val(data.璁″垝寮�宸ユ棩鏈�);
+                            $("#HPlanEndDate").val(data.璁″垝瀹屽伐鏃ユ湡);
+                            $("#HWorkShopID").val(data.hdeptid);
+                            $("#HWorkShopName").val(data.鐢熶骇杞﹂棿鍚嶇О);
+                            $("#HProdMaterCode").val(data.浜у搧CODE);
+                            $("#HSeOrderBillNo").val(data.閿�鍞鍗曞彿);
+                            $("#HCusShortName").val(data.瀹㈡埛绠�绉�);
+                            $("#HCusNeedMaterial").val(data.瀹㈡埛瑕佹眰鏉愭枡鎴愬垎);
+                            $("#HPlanSendGoodsDate").val(data.棰勮鍑鸿揣鏃ユ湡);
+                            $("#HProdMaterName").val(data.浜у搧鍚嶇О);
+                            $("#HCusName").val(data.瀹㈡埛鍚嶇О);
+                            $("#HWorkRemark").val(data.鐢熶骇澶囨敞);
+                            $("#HImportNote").val(data.閲嶈鎻愮ず);
+                        }
+                        else {
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    }
+                })
+                //txtHBillNo.Text = sBillNo;
+                GetICMOBillDetail(hmainid);
+            }
+
+            function GetICMOBillDetail(hmainid) {
                 $.ajax({
                     url: GetWEBURL() + "/Sc_ProcessExchangeBill/GetICMOBillList",
                     type: "GET",
@@ -1045,55 +1122,6 @@
             ZRProcName, QRName;
 
 
-        //杩斿洖鐢熶骇浠诲姟鍗�
-        function GetICMOBillValue(obj) {
-            $.ajax({
-                url: GetWEBURL() + "/Sc_ProcessExchangeBill/GetICMOBillDetail",
-                type: "GET",
-                data: { "hmainid": obj[0].hmainid, "OrganizationID": sessionStorage["OrganizationID"] },
-                success: function (result) {
-                    if (result.count == 1) {
-                        var data = result.data[result.data.length-1];
-                        $("#HICMOInterID").val(data.hmainid);
-                        $("#HICMOBillNo").val(data.鐢熶骇璁㈠崟鍙�);
-                        $("#HICMOEntryID").val(data.HEntryID);
-                        $("#HOrderProcNO").val(data.璁㈠崟璺熻釜鍙�);
-                        $("#HMaterID").val(data.hmaterid);
-                        $("#HMaterName").val(data.鐗╂枡鍚嶇О);
-                        $("#HMaterID2").val(data.hmaterid);
-                        $("#HMaterName2").val(data.鐗╂枡鍚嶇О);
-                        $("#HMaterNumber").val(data.鐗╂枡浠g爜);
-                        $("#HMaterNumber2").val(data.鐗╂枡浠g爜);
-                        $("#HModel").val(data.瑙勬牸鍨嬪彿);
-                        $("#HBatchNo").val(data.鎵瑰彿);
-                        $("#HUnitID").val(data.hunitid);
-                        $("#HUnitName").val(data.璁¢噺鍗曚綅鍚嶇О);
-                        $("#HUnitNumber").val(data.璁¢噺鍗曚綅浠g爜);
-                        $("#HPlanQty").val(data.璁″垝鐢熶骇鏁伴噺);
-                        $("#HQty").val(data.娴佽浆鍗℃暟閲�);
-                        $("#HprocExQty").val(data.娴佽浆鍗℃暟閲�);
-                        $("#HPlanBeginDate").val(data.璁″垝寮�宸ユ棩鏈�);
-                        $("#HPlanEndDate").val(data.璁″垝瀹屽伐鏃ユ湡);
-                        $("#HWorkShopID").val(data.hdeptid);
-                        $("#HWorkShopName").val(data.鐢熶骇杞﹂棿鍚嶇О);
-                        $("#HProdMaterCode").val(data.浜у搧CODE);
-                        $("#HSeOrderBillNo").val(data.閿�鍞鍗曞彿);
-                        $("#HCusShortName").val(data.瀹㈡埛绠�绉�);
-                        $("#HCusNeedMaterial").val(data.瀹㈡埛瑕佹眰鏉愭枡鎴愬垎);
-                        $("#HPlanSendGoodsDate").val(data.棰勮鍑鸿揣鏃ユ湡);
-                        $("#HProdMaterName").val(data.浜у搧鍚嶇О);
-                        $("#HCusName").val(data.瀹㈡埛鍚嶇О);
-                        $("#HWorkRemark").val(data.鐢熶骇澶囨敞);
-                        $("#HImportNote").val(data.閲嶈鎻愮ず);
-                    }
-                    else {
-                        layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    }
-                }
-            })
-            //txtHBillNo.Text = sBillNo;
-            GetICMOBillDetail(obj[0].hmainid);
-        }
         function GetHReasonValue(obj)  //杩斿洖涓嶈壇鍘熷洜
         {
             HReasonName = obj[0].HName;

--
Gitblit v1.9.1