From 298b3a3cf75ad9364c5097ee10bc5ade1e0ed42c Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期二, 01 二月 2022 10:06:40 +0800
Subject: [PATCH] 领料出库

---
 WebTM/views/生产管理/报工台工序/不良采集/Sc_QualityReportStepBill.html       |   14 
 WebTM/views/生产管理/报工台工序/工序汇报/Sc_ProcessReportBillList.html       |  646 +++++++++++++++++
 WebTM/views/生产工序管理/工序计划单/Sc_ProcessPlanList.html                |   55 
 WebTM/views/IpadStepIndex.html                                  |   12 
 WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html                 |    5 
 WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html                  |   30 
 WebTM/views/index.html                                          |    2 
 WebTM/views/生产管理/报工台工序/工序汇报/Sc_Add_ProcessReportBillList.html   | 1333 +++++++++++++++++++++++++++++++++++++
 WebTM/views/生产管理/报工台工序/返工/Sc_Add_MESReturnStepWorkBillList.html |   24 
 WebTM/WebTM.csproj                                              |    2 
 WebTM/views/生产管理/生产开工单/Sc_Add_MESBeginWorkBillList.html         |    2 
 11 files changed, 2,062 insertions(+), 63 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index b280d0d..5b5ba2e 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -770,9 +770,11 @@
     <Content Include="views\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫鍋滃伐\Sc_MESStopStepWorkBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫瀹屽伐\Sc_Add_MESEndStepWorkBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫瀹屽伐\Sc_MESEndStepWorkBillList.html" />
+    <Content Include="views\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫宸ュ簭姹囨姤\Sc_Add_ProcessReportBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫寮�宸Sc_Add_MESBeginStepWorkBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫寮�宸Sc_MESBeginStepWorkBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫鐢熶骇姹囨姤\Sc_ICMOReportBillList.html" />
+    <Content Include="views\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫宸ュ簭姹囨姤\Sc_ProcessReportBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫杩斿伐\Sc_Add_MESReturnStepWorkBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫杩斿伐\Sc_MESReturnStepWorkBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫闃查敊\Sc_Add_MaterToSourceStepBillList.html" />
diff --git a/WebTM/views/IpadStepIndex.html b/WebTM/views/IpadStepIndex.html
index e950550..38c0809 100644
--- a/WebTM/views/IpadStepIndex.html
+++ b/WebTM/views/IpadStepIndex.html
@@ -715,6 +715,8 @@
 
                 },
                 success: function (dom, index) {
+                    //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+                    var iframe = window['layui-layer-iframe' + index];
                     var data = [];
                     data.push({
                         "workcode": workcode,
@@ -729,9 +731,6 @@
                         "HSourceBillType": HSourceBillType,
                         "HProcID": HProcID
                     });
-
-                    //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
-                    var iframe = window['layui-layer-iframe' + index];
                     //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
                     iframe.edit(data);
                 },
@@ -761,6 +760,8 @@
 
                 },
                 success: function (dom, index) {
+                    //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+                    var iframe = window['layui-layer-iframe' + index];
                     var data = [];
                     data.push({
                         "HBillType": HBillType,
@@ -769,9 +770,6 @@
                         "HSourceBillNo": HSourceBillNo,
                         "HSourceBillType": HSourceBillType
                     });
-
-                    //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
-                    var iframe = window['layui-layer-iframe' + index];
                     //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
                     iframe.edit(data);
                 },
@@ -886,7 +884,7 @@
         //鍗曟嵁鐘舵�侀獙璇�
         function WorkStaus(HSourceID1, workcode, HSourceInterID, btn) {
             var flag = false;
-            var sWhere = "";
+            var sWhere = ""; //浠诲姟鍗曠姸鎬�(0寰呯敓浜э紝1鐢熶骇涓紝2鎸傝捣锛�3宸插畬宸�)
             switch (btn) {
                 case "寮�宸�":
                     sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('0','2')";   //鏄惁鏈変笉涓哄紑宸ュ紑宸ョ姸鎬併�佸仠宸ョ姸鎬�
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index b32e779..c95f10b 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -309,6 +309,8 @@
                                 <dd>
                                     <a>姹囨姤绠$悊(宸ュ簭)</a>
                                     <dl class="layui-nav-child">
+                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_Add_ProcessReportList.html">宸ュ簭姹囨姤鍗�</a></dd>
+                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportList.html">宸ュ簭姹囨姤鍗曠淮鎶�</a></dd>
                                         <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>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
index 78006f0..6caaa7f 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
@@ -13,6 +13,11 @@
         input.layui-input.layui-unselect {
             padding-right: 0;
         }
+
+        .layui-table-cell {
+            height: auto;
+            white-space: normal;
+        }
     </style>
 </head>
 <body>
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\350\256\241\345\210\222\345\215\225/Sc_ProcessPlanList.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\350\256\241\345\210\222\345\215\225/Sc_ProcessPlanList.html"
index eff938f..1e29b75 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\350\256\241\345\210\222\345\215\225/Sc_ProcessPlanList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\350\256\241\345\210\222\345\215\225/Sc_ProcessPlanList.html"
@@ -314,8 +314,22 @@
                         , { field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true }
                         , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 120, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
                         , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
+                        , {
+                            field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 200, templet: function (d) {
+                                switch (d.鍗曟嵁绫诲瀷) {
+                                    case 3715:
+                                        return "宸ュ簭璁″垝鍗�"
+                                        break;
+                                    case 3718:
+                                        return "宸ュ簭杩斿伐鍗�"
+                                        break;
+                                    default:
+                                        return d.HBillStatus
+                                }
+                            }
+                        }
                         //, { field: 'HBillStatus ', title: '鍗曟嵁鐘舵��', width: 105 }
-                        , { field: 'HMaterID', title: 'HMaterID' }
+                        , { field: 'HMaterID', title: 'HMaterID', hide: true }
                         ////, { field: 'hunitid', title: 'hunitid' }
                         , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜 ', width: 115 }
                         , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
@@ -323,61 +337,61 @@
                         , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
                         , { field: 'HUnitNumber', title: '鍗曚綅浠g爜' }
                         , { field: '鍗曚綅', title: '鍗曚綅' }
-                        , { field: 'hunitid', title: 'hunitid' }
+                        , { field: 'hunitid', title: 'hunitid', hide: true}
                         , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜' }
                         ////, { field: 'HCenterID', title: 'HCenterID' }
                         , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅' }
                         , { field: '鐢熶骇鏁伴噺', title: '鐢熶骇鏁伴噺' }
                         ////, { field: 'hbomid', title: 'hbomid' }
-                        , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�' }
-                        , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡' }
+                        , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�', templet: "<div>{{d.璁″垝寮�宸ユ棩鏈� ==null ?'':layui.util.toDateString(d.璁″垝寮�宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>"}
+                        , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡', templet: "<div>{{d.璁″垝瀹屽伐鏃ユ湡 ==null ?'':layui.util.toDateString(d.璁″垝瀹屽伐鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
                         , { field: '鎽樿', title: '鎽樿' }
                         , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
                         , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�' }
-                        , { field: 'hicmointerid', title: 'hicmointerid' }
+                        , { field: 'hicmointerid', title: 'hicmointerid', hide: true}
                         , { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿' }
                         , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
-                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
                         , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
                         , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
                         , { field: '淇敼浜�', title: '淇敼浜�' }
-                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
                         , { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
                         ////, { field: 'hsubid', title: 'hsubid' }
-                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
                         , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷' }
                         , { field: '浣滃簾浜�', title: '浣滃簾浜�' }
-                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
+                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
                         , { field: 'hsubid', title: 'hsubid', fixed: true, hide: true }
                         , { field: '宸ュ簭璁″垝鍗曞彿', title: '宸ュ簭璁″垝鍗曞彿' }
                         , { field: '宸ュ簭鍙�', title: '宸ュ簭鍙�' }
-                        , { field: 'hprocid', title: 'hprocid' }
+                        , { field: 'hprocid', title: 'hprocid', hide: true}
                         , { field: '宸ュ簭浠g爜', title: '宸ュ簭浠g爜' }
                         , { field: '宸ュ簭', title: '宸ュ簭' }
                         , { field: '鍔犲伐璇存槑', title: '鍔犲伐璇存槑' }
                         , { field: '寮�宸ュ浐澶�', title: '寮�宸ュ浐澶�' }
                         , { field: '寮�宸ュ浐鏁�', title: '寮�宸ュ浐鏁�' }
-                        , { field: 'HCenterID', title: 'HCenterID' }
+                        , { field: 'HCenterID', title: 'HCenterID', hide: true}
                         , { field: '宸ヤ綔涓績浠g爜', title: '宸ヤ綔涓績浠g爜' }
                         , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
-                        , { field: 'HDeptID', title: 'HDeptID' }
+                        , { field: 'HDeptID', title: 'HDeptID', hide: true}
                         , { field: '鍔犲伐杞﹂棿浠g爜', title: '鍔犲伐杞﹂棿浠g爜' }
                         , { field: '鍔犲伐杞﹂棿', title: '鍔犲伐杞﹂棿' }
-                        , { field: 'HGroupID', title: 'HGroupID' }
+                        , { field: 'HGroupID', title: 'HGroupID', hide: true}
                         , { field: '鐝粍浠g爜', title: '鐝粍浠g爜' }
                         , { field: '鐝粍鍚嶇О', title: '鐝粍鍚嶇О' }
-                        , { field: 'HWorkerID', title: 'HWorkerID' }
+                        , { field: 'HWorkerID', title: 'HWorkerID', hide: true}
                         , { field: '鎿嶄綔鍛樹唬鐮�', title: '鎿嶄綔鍛樹唬鐮�' }
                         , { field: '鎿嶄綔鍛�', title: '鎿嶄綔鍛�' }
-                        , { field: 'HSourceID', title: 'HSourceID' }
+                        , { field: 'HSourceID', title: 'HSourceID', hide: true}
                         , { field: '璧勬簮浠g爜', title: '璧勬簮浠g爜' }
                         , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮' }
                         , { 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')}}</div>" }
+                        , { field: '宸ュ簭璁″垝瀹屽伐鏃ユ湡', title: '宸ュ簭璁″垝瀹屽伐鏃ユ湡', templet: "<div>{{d.宸ュ簭璁″垝瀹屽伐鏃ユ湡 ==null ?'':layui.util.toDateString(d.宸ュ簭璁″垝瀹屽伐鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
                         , { field: '鍑嗗鏃堕棿', title: '鍑嗗鏃堕棿' }
                         , { field: '鎺掗槦鏃堕棿', title: '鎺掗槦鏃堕棿' }
                         , { field: '杞Щ鏃堕棿', title: '杞Щ鏃堕棿' }
@@ -387,11 +401,10 @@
                         , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�' }
                         , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿' }
                         , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷' }
-                        , { field: '閿�鍞鍗曚富ID', title: '閿�鍞鍗曚富ID' }
-                        , { field: '閿�鍞鍗曞瓙ID', title: '閿�鍞鍗曞瓙ID' }
+                        , { field: '閿�鍞鍗曚富ID', title: '閿�鍞鍗曚富ID', hide: true}
+                        , { field: '閿�鍞鍗曞瓙ID', title: '閿�鍞鍗曞瓙ID', hide: true}
                         , { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿' }
-                        , { field: 'HBillType', title: 'HBillType' }
-                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
+                        , { field: 'HBillType', title: 'HBillType', hide: true}
                         , { field: 'HBillSubType', title: 'HBillSubType' }
                         , { field: 'HQtyDecimal', title: 'HQtyDecimal' }
                         , { field: 'HPriceDecimal', title: 'HPriceDecimal' }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill.html"
index d373884..fedc192 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill.html"
@@ -102,7 +102,8 @@
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">褰撳墠宸ュ簭</label>
                                             <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HProcNo" id="HProcNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HProcName" id="HProcName" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" class="layui-input" name="HProcNo" id="HProcNo">
                                                 <input type="hidden" name="HProcID" id="HProcID" value="0">
                                             </div>
                                         </div>
@@ -629,6 +630,11 @@
                             $("#HMaterID").val(data.HMaterID);
                             $("#HMaterModel").val(data.HMaterModel);
                             $("#HICMOEntryID").val(data.HICMOEntryID);
+                            $("#HProcID").val(data.HProcID);
+                            $("#HProcNo").val(data.HProcNo);
+                            $("#HProcName").val(data.HProcName);
+                            $("#HSourceID").val(data.HSourceID);
+                            $("#HSourceName").val(data.HSourceName);
                         } else {
                             layer.alert(result.Message, { icon: 5 });
                         }
@@ -649,7 +655,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '鐢熶骇璧勬簮鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../PublicPage/SourceInformation.html', 'yes']
+                    , content: ['../../../PublicPage/SourceInformation.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -674,7 +680,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '鐝粍鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../PublicPage/GroupInformation.html', 'yes']
+                    , content: ['../../../PublicPage/GroupInformation.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -699,7 +705,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '妫�楠屽憳鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../PublicPage/UserInformation.html', 'yes']
+                    , content: ['../../../PublicPage/UserInformation.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\267\245\345\272\217\346\261\207\346\212\245/Sc_Add_ProcessReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\267\245\345\272\217\346\261\207\346\212\245/Sc_Add_ProcessReportBillList.html"
new file mode 100644
index 0000000..17db4ad
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\267\245\345\272\217\346\261\207\346\212\245/Sc_Add_ProcessReportBillList.html"
@@ -0,0 +1,1333 @@
+锘�<!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">
+    <script src="../../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <style type="text/css">
+        /*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+        /*end*/
+
+    </style>
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 15px;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="component-form-group" id="component-form-group" style="background-color:white;">
+                    <div class="layui-card-header">
+                        <div class="layui-btn-group">
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">鏂板</button>
+                            <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="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>-->
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="view">棰勮</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="print">鎵撳嵃</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+                        </div>
+                    </div>
+
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <h1 style="text-align:center;margin-top:10px;"><b>宸ュ簭姹囨姤鍗�</b></h1>
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class=" layui-inline">
+                                            <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
+                                                <input id="HInterID" name="HInterID" type="hidden" />
+                                            </div>
+                                        </div>
+                                        <div class=" layui-inline">
+                                            <label class="layui-form-label">鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">浠诲姟鍗曞彿</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HInnerBillNo" id="HInnerBillNo" class="layui-input">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">閮ㄩ棬<label style="color:red"> * </label></label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="WareHouse" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HInnerBillNo" id="HInnerBillNo" class="layui-input">
+                                            </div>
+                                        </div>
+
+                                        <div class=" layui-inline">
+                                            <label class="layui-form-label">鐝粍<label style="color:red"> * </label></label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">浜у搧浠g爜<label style="color:red"> * </label></label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HMaterCode" id="HMaterCode" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterList" id="HMaterList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">浜у搧鍚嶇О:</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HMaterName" lay-verify="HMaterName" id="HMaterName" autocomplete="off">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">瑙勬牸鍨嬪彿:</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HMaterSpec" lay-verify="HMaterSpec" id="HMaterSpec" autocomplete="off">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鍗曚綅<label style="color:red"> * </label></label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HMaterCode" id="HMaterCode" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterList" id="HMaterList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">璁″垝鏁伴噺:</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HMaterName" lay-verify="HMaterName" id="HMaterName" autocomplete="off">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鍏ュ簱鏁伴噺:</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HMaterSpec" lay-verify="HMaterSpec" id="HMaterSpec" autocomplete="off">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鎬诲伐浣滄椂闂�:</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HMainSourceEntryID" lay-verify="HMainSourceEntryID" id="HMainSourceEntryID" autocomplete="off" disabled>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">婧愬崟绫诲瀷</label>
+                                            <div class="layui-input-inline">
+                                                <select name="SourceType" lay-filter="SourceType" id="SourceType">
+                                                    <option value="2">宸ュ簭璁″垝鍗�</option>
+                                                    <option value="2">宸ュ簭娲惧伐鍗�</option>
+                                                    <option value="1" selected="selected">鎵嬪伐褰曞叆</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">婧愬崟鍗曞彿</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" class="layui-input" value="">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="XDHList" id="XDHList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">澶囨敞</label>
+                                            <div class="layui-input-inline">
+                                                <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--鍒跺崟淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍒跺崟浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">瀹℃牳浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍏抽棴浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍒跺崟鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">瀹℃牳鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍏抽棴鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">淇敼浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">浣滃簾浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">淇敼鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">浣滃簾鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+
+                        </div>
+                    </div>
+
+                    <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+                        <ul class="layui-tab-title">
+                            <li class="layui-this">鏄庣粏淇℃伅</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>
+                    </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" id="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine" id="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                        </div>
+                    </script>
+                    <script type="text/html" id="xuhao">
+                        {{d.LAY_TABLE_INDEX+1}}
+                    </script>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script type="text/html" id="barDemo">
+        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+    </script>
+    <script>
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+        }
+
+
+        layui.config({
+            base: '../../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            //#region 鍏叡鍙橀噺路
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+            //鏌ヨ鏉′欢
+            var option = [];
+            var option1 = [];
+            var sWhere = "";
+            var sBillType = "3714"; //
+
+            //#endregion
+
+
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+            //鍒濆鍖栬〃鍗曟彃浠�
+            set_InitFrom();
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            set_CountGrid();
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鏂板
+                set_AddFNew();
+            }
+            else if (OperationType == 3) {//缂栬緫
+                set_EditFromGrid(linterid);
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
+
+
+            //#region 鐐瑰嚮浜嬩欢锛屽寘鎷琽n鍜宖orm浜嬩欢
+            //澶村伐鍏锋爮
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;;
+                var AddRow = table.cache['mainTable'];
+                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "", "HStockOrgID": sessionStorage["OrganizationID"] };
+                switch (obj.event) {
+                    //鏂板涓�琛�
+                    case 'btn-AddLine': btnAddLine(NewRow);
+                        break;
+                    //澶嶅埗涓�琛�
+                    case 'btn-CopyLine': btnCopyLine(data);
+                        break;
+                }
+            });
+            //琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+            });
+            //琛ㄥご淇℃伅浠撳簱寮圭獥
+            form.on('submit(WareHouse)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '浠撳簱鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/WareHouseInformation.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HWHName").val(checkStatus.data[0].HName);
+                        $("#HWHID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+            //琛ㄥご淇℃伅浠撶鍛樺脊绐�
+            form.on('submit(HKeeperList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '浠撶鍛樺垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HKeeperName").val(checkStatus.data[0].HName);
+                        $("#HKeeperID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+            //琛ㄥご淇℃伅楠屾敹鍛樺脊绐�
+            form.on('submit(HSecManagerList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '楠屾敹鍛樺垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSecManagerName").val(checkStatus.data[0].HName);
+                        $("#HSecManagerID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+            //琛ㄥご淇℃伅涓氬姟鍛樺脊绐�
+            form.on('submit(HEmpList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '涓氬姟鍛樺垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HEmpName").val(checkStatus.data[0].HName);
+                        $("#HEmpID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+            //琛ㄥご淇℃伅璐熻矗浜哄脊绐�
+            form.on('submit(HManagerList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '璐熻矗浜哄垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HManagerName").val(checkStatus.data[0].HName);
+                        $("#HManagerID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+            //琛ㄥご淇℃伅缁翠慨鍗曚綅寮圭獥
+            form.on('submit(HSupList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '缁翠慨鍗曚綅鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/SupplierInformation.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSupName").val(checkStatus.data[0].HName);
+                        $("#HSupID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+            //琛ㄥご淇℃伅閮ㄩ棬寮圭獥
+            form.on('submit(Department)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '閮ㄩ棬鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/DeptInformation.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        $("#HDeptID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+
+            //鏂板
+            form.on('submit(set_AddNew)', function (data) {
+                $("#component-form-group")[0].reset();
+                layui.form.render();
+                set_AddFNew();
+            });
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {
+                var refSav = "";
+                if (linterid == "" || linterid == null) {
+                    refSav = "Add";
+                }
+                if (linterid != "" && linterid != null) {
+                    refSav = "Update";
+                }
+                //debugger;
+                data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(table.cache['mainTable']);
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ';' + sessionStorage["HUserName"];
+
+                if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
+                {
+                    return false;
+                }
+                $.ajax(
+                    {
+                        type: "POST",
+                        url: GetWEBURL() + "/Sc_MouldRepairInBill/SaveGetMouldRepairInBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: { "msg": sMainSub },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                    var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                    parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+                                });
+                            }
+                            else {
+
+                                f_alert(data.Message);
+                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                            }
+                            layer.closeAll("loading");
+                        },
+                        error: function (err) {
+
+                            f_alert("閿欒:" + err);
+                            console.log("Reason" + sMainStr);
+                        }
+                    });
+            });
+            //瀹℃牳
+            form.on('submit(set_CheckBill)', function (data) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    var user = sessionStorage["HUserName"];
+                    //閫昏緫鍒犻櫎鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "Sc_MouldRepairInBill/set_CheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "CurUserName": user },
+                        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('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            });
+            //鍙嶅鏍�
+            form.on('submit(set_AbandonCheck)', function (data) {//
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    var user = sessionStorage["HUserName"];
+                    //閫昏緫鍒犻櫎鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "Sc_MouldRepairInBill/set_AbandonCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "CurUserName": user },
+                        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('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            });
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {//
+                Pub_Close(1);
+            });
+            //鎵撳嵃Printing
+            form.on("submit(view)", function (data) {
+                if (linterid != "" || linterid != null) {
+                    layer.open({
+                        type: 2
+                        , area: ['50%', '50%']
+                        , title: '鎵撳嵃妯$増閫夋嫨'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + '&MyMsg=' + linterid.toString() + '&Type=HMouldRepairInBill', 'yes']
+                        , resize: false
+                    })
+                }
+                else {
+                    layer.msg('褰撳墠鍗曟嵁ID涓虹┖锛�');
+                }
+            });
+            //鎵撳嵃Printing
+            form.on("submit(print)", function (data) {
+                if (linterid != "" || linterid != null) {
+                    layer.open({
+                        type: 2
+                        , area: ['50%', '50%']
+                        , title: '鎵撳嵃妯$増閫夋嫨'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + '&MyMsg=' + linterid.toString() + '&Type=HMouldRepairInBill', 'yes']
+                        , resize: false
+                    })
+                }
+                else {
+                    layer.msg('褰撳墠鍗曟嵁ID涓虹┖锛�');
+                }
+            });
+            //鍏抽棴褰撳墠椤�
+            form.on('submit(Cancel)', function () {
+                parent.location.href = "../../../views/index.html"
+                //window.close();//鍏抽棴褰撳墠椤�
+            })
+            //鐩戝惉鍗曞厓鏍肩紪杈�  鍗曞厓鏍肩紪杈戝悗 鍙樻洿
+            table.on('edit(mainTable)', function (obj) {
+                // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+                var oldText = $(this).prev().text();
+                var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+                    , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+                    , field = obj.field; //寰楀埌瀛楁
+                //layer.msg('[ID: ' + data.id + '] ' + field + ' 瀛楁鏇存敼涓猴細' + value);
+
+                switch (field) {
+                    case "HDesignLife":  //璁捐瀵垮懡
+                        value = isNaN(value) ? 0 : value;
+                        var HUseLife = isNaN(data.HUseLife) ? 0 : data.HUseLife;
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HDesignLife: value,                          //璁捐瀵垮懡
+                            HLeaveLife: value - HUseLife,           //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
+                        });
+                        break;
+                    case "HLeaveLife":  //鍓╀綑瀵垮懡
+                        var HDesignLife = isNaN(data.HDesignLife) ? 0 : data.HDesignLife;
+                        var HUseLife = isNaN(data.HUseLife) ? 0 : data.HUseLife;
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.tr.find('td[data-field=HLeaveLife] input').val(HDesignLife - HUseLife);
+                        obj.update({
+                            HLeaveLife: HDesignLife - HUseLife,   //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
+                        });
+                        break;
+                    case "HUseLife":    //浣跨敤瀵垮懡
+                        var HDesignLife = isNaN(data.HDesignLife) ? 0 : data.HDesignLife;
+                        value = isNaN(value) ? 0 : value;
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HLeaveLife: HDesignLife - value, //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
+                        });
+                        break;
+                    case "HQty":        //瀹炴敹鏁伴噺
+                        value = isNaN(value) ? 0 : value;
+                        var HPrice = isNaN(data.HPrice) ? 0 : data.HPrice;
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HMoney: value * HPrice, //閲戦=瀹炴敹鏁伴噺*鍗曚环
+                        });
+                        break;
+                    case "HPrice":      //鍗曚环
+                        value = isNaN(value) ? 0 : value;
+                        var HQty = isNaN(data.HQty) ? 0 : data.HQty;
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HMoney: value * HQty, //閲戦=瀹炴敹鏁伴噺*鍗曚环
+                        });
+                        break;
+                    case "HMoney":     //閲戦
+                        var HPrice = isNaN(data.HPrice) ? 0 : data.HPrice;
+                        var HQty = isNaN(data.HQty) ? 0 : data.HQty;
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HMoney: HPrice * HQty, //閲戦=瀹炴敹鏁伴噺*鍗曚环
+                        });
+                        break;
+                    default:
+                }
+            });
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+            //鍒濆鍖栬〃鍗曟彃浠�
+            function set_InitFrom() {
+                laydate.render({
+                    elem: '#HDate'
+                    , elem: '#HMakeDate'
+                    , elem: '#HCheckDate'
+                    , elem: '#HCloseDate'
+                    , elem: '#HUpDateDate'
+                    , elem: '#HDeleteDate'
+                });
+            }
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                columns = [
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+                    , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
+                    , { field: 'HMaterCode', title: '鍣ㄥ叿浠g爜', edit: 'text', event: 'HMaterCode', width: 100 }
+                    , { field: 'HMaterName', title: '鍣ㄥ叿鍚嶇О', edit: 'text', width: 100 }
+                    , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+                    , { field: 'HBatchNo', title: '鎵规', edit: 'text', width: 100 }
+                    , { field: 'HUnitID', title: 'HUnitID', edit: 'text', width: 100, hide: true }
+                    , { field: 'HUnitCode', title: '璁¢噺鍗曚綅浠g爜', edit: 'text', event: 'HUnitCode', width: 100 }
+                    , { field: 'HUnitName', title: '璁¢噺鍗曚綅', edit: 'text', width: 100 }
+                    , { field: 'HDesignLife', title: '璁捐瀵垮懡', edit: 'text', width: 100 }
+                    , { field: 'HLeaveLife', title: '鍓╀綑瀵垮懡', edit: 'text', width: 100 }
+                    , { field: 'HUseLife', title: '浣跨敤瀵垮懡', edit: 'text', width: 100 }
+                    , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', edit: 'text', width: 100 }
+                    , { field: 'HQty', title: '瀹炴敹鏁伴噺', edit: 'text', width: 100 }
+                    , { field: 'HWHID', title: 'HWHID', edit: 'text', width: 100, hide: true }
+                    , { field: 'HWHCode', title: '鏀舵枡浠撳簱浠g爜', edit: 'text', event: 'HWHCode', width: 100 }
+                    , { field: 'HWHName', title: '鏀舵枡浠撳簱鍚嶇О', edit: 'text', width: 100 }
+                    , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
+                    , { field: 'HStockOrgID', title: 'HStockOrgID', width: 100, hide: true }
+                ];
+                option = {
+                    id: 'mainTable'
+                    , elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , page: false
+                    , cellMinWidth: 120
+                    , height: 500
+                    , cols: [columns]
+                    , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                    , done: function (res, curr, count) {
+                    }
+                };
+            }
+            //鍒濆姹囨�讳俊鎭�
+            function set_CountGrid() {
+                //琛ㄥご
+                columns = [
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', edit: 'text', event: 'HMaterCode', width: 100 }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', edit: 'text', width: 100 }
+                    , { field: '鎵规', title: '鎵规', edit: 'text', width: 100 }
+                    , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', edit: 'text', width: 100 }
+                    , { field: 'hwhid', title: 'HWHID', edit: 'text', width: 100, hide: true }
+                    , { field: '浠撳簱浠g爜', title: '浠撳簱浠g爜', edit: 'text', event: 'HWHCode', width: 120 }
+                    , { field: '浠撳簱', title: '浠撳簱', edit: 'text', width: 120 }
+                    , { field: '瀛愬娉�', title: '澶囨敞', edit: 'text', width: 100 }
+                ];
+                option1 = {
+                    id: 'mainTable1'
+                    , elem: '#mainTable1'
+                    , height: 500
+                    , page: true
+                    , limit: 500
+                    , cellMinWidth: 120
+                    , height: 500
+                    , cols: [columns]
+                    , done: function (res, curr, count) {
+                    }
+                };
+            }
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                //鑾峰彇鏈�澶у崟鎹彿
+                get_MAXNum();
+                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "", "HStockOrgID": sessionStorage["OrganizationID"] }];
+                table.render(option);
+            }
+            //鑾峰彇鏈�澶у崟鎹彿
+            function get_MAXNum() {
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("0");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": sBillType },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                        $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                        $("#HInterID").val(0);
+                    }
+                });
+            }
+            //缂栬緫
+            function set_EditFromGrid(linterid) {
+                set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
+                set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
+                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "", "HStockOrgID": sessionStorage["OrganizationID"] }];
+                table.render(option);
+            }
+            //缂栬緫鑾峰彇琛ㄥご
+            function set_EditForm(linterid) {
+                $.ajax({
+                    url: GetWEBURL() + "Sc_CheckToolsRepairWorkBillList/Sc_MouldRepairInHouseBillListCheckDetai",
+                    type: "GET",
+                    data: {
+                        "HID": linterid
+                    },
+                    success: function (result) {
+
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data.h_v_Sc_MouldRepairInBillList[0];
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HBillNo": data.鍗曟嵁鍙�
+                                , "HDate": formatDate(data.鏃ユ湡)
+                                , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+                                , "HWHID": data.HWHID                    //浠撳簱ID
+                                , "HWHName": data.浠撳簱               //浠撳簱鍚嶇О
+                                , "HKeeperID": data.HKeeperID
+                                , "HKeeperName": data.淇濈鍛�
+                                , "HSupID": data.HSupID
+                                , "HSupName": data.缁翠慨鍗曚綅
+                                , "HRepairType": data.缁翠慨绫诲瀷
+                                , "HSecManagerID": data.HSecManagerID    //楠屾敹鍛業D
+                                , "HSecManagerName": data.楠屾敹鍛�         //楠屾敹鍛樺悕绉�
+                                , "HManagerID": data.HManagerID
+                                , "HManagerName": data.璐熻矗浜�
+                                , "HDeptID": data.HDeptID                 //閮ㄩ棬ID
+                                , "HDeptName": data.閮ㄩ棬                  //閮ㄩ棬鍚嶇О
+                                , "RepairType": ""                       //缁翠慨绫诲瀷
+                                , "HEmpID": data.HEmpID
+                                , "HEmpName": data.涓氬姟鍛�
+                                , "HSourceBillType": data.婧愬崟绫诲瀷        //婧愬崟绫诲瀷
+                                , "XDH": ""                               //閫夊崟鍙�
+                                , "HExplanation": data.鎽樿              //鎽樿
+                                , "HRemark": data.澶囨敞                    //澶囨敞
+                                //=========================================================
+                                , "HMaker": data.鍒跺崟浜�
+                                , "HChecker": data.瀹℃牳浜�
+                                , "HCloseMan": data.鍏抽棴浜�
+                                , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : formatDate(data.鍒跺崟鏃ユ湡)
+                                , "HCheckDate": data.瀹℃牳鏃ユ湡 == null ? "" : formatDate(data.瀹℃牳鏃ユ湡)
+                                , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : formatDate(data.鍏抽棴鏃ユ湡)
+                                , "HUpDater": data.淇敼浜�
+                                , "HDeleteMan": data.浣滃簾浜�
+                                , "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : formatDate(data.淇敼鏃ユ湡)
+                                , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : formatDate(data.浣滃簾鏃ユ湡)
+                            });
+
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+            //缂栬緫鑾峰彇琛ㄤ綋
+            function set_EditGrid(linterid) {
+                $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+                //缂栬緫鍔犺浇鏁版嵁
+                $.ajax({
+                    url: GetWEBURL() + 'Sc_MouldRepairInBill/Sc_MouldRepairInBillListCheckDetai',
+                    type: "GET",
+                    data: { "sqlWhere": "and hmainid=" + linterid },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            option.data = result.list[0];
+                            table.render(option);
+                            option1.data = result.list[1];
+                            table.render(option1);
+
+                        } else {
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(index0);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //鏃ユ湡鏍煎紡鍖�
+            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 btnAddLine(NewRow) {
+                var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
+                buttonArr = [];//娓呯┖鏁扮粍
+                for (var i = 0; i < tableBak.length; i++) {
+                    buttonArr.push(tableBak[i]);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+                }
+                buttonArr.push(NewRow);  //鍦ㄥ熬閮ㄥ姞涓�琛�
+                table.reload("mainTable", {
+                    data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+                })
+            }
+            //澶嶅埗涓�琛�
+            function btnCopyLine(data) {
+                var copydata = JSON.stringify(data);
+                if (data.length <= 0) {
+                    layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                }
+                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);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                }
+            }
+            // 琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+            function set_GridDelete(obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'del') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+                        console.log("绱㈠紩涓�:" + rowIndex);
+                        if (rowIndex === '0') {
+                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        } else {
+                            //obj.del();
+                            //layer.close(index);
+                            var oldData = table.cache["mainTable"];
+                            oldData.splice(obj.tr.data('index'), 1);
+                            table.reload('mainTable', { data: oldData });
+                            layer.close(index);
+                        }
+                    });
+                }
+            }
+            //琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
+            function set_GridCellCheck(obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        //妯″叿淇℃伅  濡傛灉鍦ㄦā鍏蜂唬鐮佸垪 鎸塅7
+                        if (obj.event === 'HMaterCode')  //妯″叿淇℃伅  濡傛灉鍦ㄦā鍏蜂唬鐮佸垪 鎸塅7
+                        {
+                            //椤甸潰灞�-鑷畾涔�  //F7閫夋嫨妯″叿
+                            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('璇烽�夋嫨鏁版嵁');
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HMaterID: checkStatus.data[0].HItemID,
+                                        HMaterCode: checkStatus.data[0].HNumber,
+                                        HMaterName: checkStatus.data[0].HName,
+                                        HMaterSpec: checkStatus.data[0].HModel,
+
+                                        HDesignLife: 0,  //璁捐瀵垮懡
+                                        HLeaveLife: 0,   //鍓╀綑瀵垮懡
+                                        HQty: 1,         //瀹炴敹鏁伴噺
+                                        HMoney: 0,       //閲戦
+                                    });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        //浠撳簱浠g爜
+                        if (obj.event === 'HWHCode')  //浠撳簱浠g爜
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '浠撳簱鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../PublicPage/WareHouseInformation.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({
+                                        HWHID: checkStatus.data[0].HItemID,
+                                        HWHCode: checkStatus.data[0].HNumber,
+                                        HWHName: checkStatus.data[0].HName,
+                                    });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        if (obj.event === 'HUnitCode')  //璁¢噺鍗曚綅淇℃伅
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '璁¢噺鍗曚綅鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../PublicPage/UnitInformation.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HUnitID: checkStatus.data[0].HItemID,
+                                        HUnitCode: checkStatus.data[0].HNumber,
+                                        HUnitName: checkStatus.data[0].HName,
+                                    });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        obj.event = "";
+                        return false;
+                    }
+                })
+            }
+            //?
+            function f_alert(sMsg) {
+                layer.alert(sMsg, { icon: 5 });
+
+            }
+            //闈炵┖楠岃瘉
+            function AllowLoadData(sSubStr) {
+                var Result = true;
+                if ($("#HWHID").val() == '' || $("#HSecManagerID").val() == null) {
+                    layer.msg("浠撳簱涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HKeeperID").val() == '' || $("#HSecManagerID").val() == null) {
+                    layer.msg("浠撶鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HSupID").val() == '' || $("#HSecManagerID").val() == null) {
+                    layer.msg("缁翠慨鍗曚綅涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HManagerID").val() == '' || $("#HSecManagerID").val() == null) {
+                    layer.msg("璐熻矗浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HDeptID").val() == '' || $("#HSecManagerID").val() == null) {
+                    layer.msg("缁翠慨閮ㄩ棬涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HSecManagerID").val() == '' || $("#HSecManagerID").val() == null) {
+                    layer.msg("閫佷慨浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HEmpID").val() == '' || $("#HKeeperID").val() == null) {
+                    layer.msg("涓氬姟鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+
+                if (typeof (sSubStr) == "undefined" || sSubStr == "") {
+                    layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+                    sSubStr = JSON.parse(sSubStr);
+                    for (var i = 0; i < sSubStr.length; i++) {
+                        if (sSubStr[i].HMaterID == "") {
+                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍣ㄥ叿淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return Result = false;
+                        }
+                        if (sSubStr[i].HUnitID == "") {
+                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁¢噺鍗曚綅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return Result = false;
+                        }
+                    }
+                }
+                else {
+                    return Result = true;
+                }
+                return Result;
+            }
+            //#endregion
+
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\267\245\345\272\217\346\261\207\346\212\245/Sc_ProcessReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\267\245\345\272\217\346\261\207\346\212\245/Sc_ProcessReportBillList.html"
new file mode 100644
index 0000000..e632b92
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\267\245\345\272\217\346\261\207\346\212\245/Sc_ProcessReportBillList.html"
@@ -0,0 +1,646 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>宸ュ簭姹囨姤鍗曞垪琛�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../../layuiadmin/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>
+        .layui-form-select .layui-input {
+            padding-right: 15px;
+            cursor: pointer;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鐘舵��</label>
+                                    <div class="layui-input-block">
+                                        <select name="Status" lay-filter="Status" style="width:190px;">
+                                            <option value="-1" selected="selected">鍏ㄩ儴</option>
+                                            <option value="0">鏈鏍�</option>
+                                            <option value="1">宸插鏍�</option>
+                                            <option value="2">宸插叧闂�</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block">
+                                        <input type="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="date" class="layui-input" id="HBeginDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                                <div class="layui-colla-content">
+                                    <div class="layui-inline">
+                                        <div class="layui-inline">
+                                            <span>鍏朵粬鏉′欢></span>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">閮ㄩ棬淇℃伅</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="Dept" id="Dept" 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>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鑱屽憳</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="Employee" id="Employee" 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="Group" id="Group" 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"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+        //#region 鎶樺彔娉ㄩ噴
+        //#endregion
+        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 = [];
+            var columns = "";
+            var DataList;
+            var Name = "ICProcessMReportCellWidth";
+        //#endregion
+
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+        //#endregion
+
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 澶村伐鍏锋爮浜嬩欢
+            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 'btn-Audit': set_CheckBill();
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit': set_AbandonCheck();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                };
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(table, option);
+            });
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                //娓呯┖杩囨护鏉′欢
+                set_ClearQuery();
+            });
+            //#endregion
+
+        //#endregion
+
+
+        //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖栬繃婊ゆ潯浠舵煡璇�
+                get_FastQuery(table, option)
+               
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                sWhere = "";
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                get_FastQuery(table, option)
+            }
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍�
+            function set_InitGrid(sWhere) {
+               
+                columns = [
+                    { type: 'checkbox' }
+                    , { field: 'hmainid ', title: 'hmainid', width: 105, sort: true, fixed: true, hide: true }
+                    , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 120, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
+                    , {
+                        field: 'HBillType', title: '鍗曟嵁绫诲瀷', width: 160, templet: function (d) {
+                            if (d.HBillType == "3714") {
+                                return "宸ュ簭姹囨姤鍗�";
+                            }
+                        }
+                    }
+                    , {
+                        field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 160, templet: function (d) {
+                            switch (d.HBillStatus) {
+                                case 0:
+                                    return "鍒涘缓"
+                                    break;
+                                case 1:
+                                    return "鏈"
+                                    break;
+                                case 2:
+                                    return "宸插"
+                                    break;
+                                case 3:
+                                    return "鍏抽棴"
+                                    break;
+                                case 4:
+                                    return "浣滃簾"
+                                    break;
+                                case 5:
+                                    return "瀹℃牳閫�鍥�"
+                                    break;
+                                case 6:
+                                    return "瀹℃牳涓�"
+                                    break;
+                                case 7:
+                                    return "宸查槄"
+                                    break;
+                                case 8:
+                                    return "宸插洖澶�"
+                                    break;
+                                case 9:
+                                    return "缁撴"
+                                    break;
+                                case 10:
+                                    return "楠岃瘉"
+                                    break;
+                                case 11:
+                                    return "涓嬭揪"
+                                    break;
+                                case 12:
+                                    return "寮�宸�"
+                                    break;
+                                case 13:
+                                    return "鐢宠瀹℃壒"
+                                    break;
+                                case 15:
+                                    return "鐢宠妫�楠�"
+                                    break;
+                                case 16:
+                                    return "鍒ゅ畾鍚堟牸"
+                                    break;
+                                case 17:
+                                    return "鍒ゅ畾涓嶅悎鏍�"
+                                    break;
+                                default:
+                                    return d.HBillStatus
+                            }
+                        }
+                    }
+                    , { field: 'HDeptID', title: '閮ㄩ棬ID', width: 115, hide: true}
+                    , { field: '閮ㄩ棬', title: '閮ㄩ棬' }
+                    , { field: 'HMaterID', title: 'HMaterID', hide: true}
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 160 }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 160 }
+                    , { field: '瑙勬牸鍨嬪彿 ', title: '瑙勬牸鍨嬪彿', width: 215 }
+                    , { field: 'HUnitID ', title: 'HUnitID ', width: 115, hide: true}
+                    , { field: '鍗曚綅浠g爜', title: '鍗曚綅浠g爜', width: 150}
+                    , { field: '鍗曚綅鍚嶇О', title: '鍗曚綅鍚嶇О', width: 100 }
+                    , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 215}
+                    , { field: 'hsubid', title: 'hsubid', hide: true}
+                    , { field: 'HEmpID', title: 'HEmpID', hide: true}
+                    , { field: '鑱屽憳', title: '鑱屽憳', width: 100}
+                    , { field: '宸ュ簭', title: '宸ュ簭', width: 200}
+                    , { field: '鍗曚环 ', title: '鍗曚环', width: 100}
+                    , { field: '鏁伴噺', title: '鏁伴噺', width: 100}
+                    , { field: '涓嶈壇鏁伴噺', title: '涓嶈壇鏁伴噺', width: 100}
+                    , { field: '鎶ュ簾鏁�', title: '鎶ュ簾鏁�', width: 100}
+                    , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 215}
+                    , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100}
+                    , { 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: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 100}
+                    , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 100}
+                    , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 215}
+                    , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 100}
+                    , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 100}
+                    , { field: 'HBillSubType', title: 'HBillSubType', width: 100, hide: true}
+                    , { field: 'HICMOInterID', title: 'HICMOInterID', width: 100, hide: true}
+                    , { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿', width: 100, hide: true}
+                    , { field: 'HSourceID', title: 'HSourceID', width: 100, hide: true}
+                    , { field: '鐢熶骇璧勬簮浠g爜', title: '鐢熶骇璧勬簮浠g爜', width: 100 }
+                    , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 200}
+                ];
+                //濉厖琛ㄦ牸鏁版嵁
+                table.render({
+                    elem: '#mainTable',
+                    url: GetWEBURL() + '/Sc_ProcessReport/MES_Sc_ProcessReportList_Json'
+                    , toolbar: '#toolbarDemo'
+                    , id: 'mainTable'   //琛ㄦ牸id
+                    , where: { sWhere: sWhere }  //鎵╁睍鍙傛暟,鍙互浼犳暟鎹埌鍚庡彴
+                    , page: true
+                    , totalRow: true
+                    , height: 'full-50'
+                    , cols: [columns]
+                    , limit: 10
+                    , limits: [50, 500, 1000, 5000]
+                    , method: 'get'   //鎻愪氦鏂瑰紡
+                    , layout: ['count', 'prev', 'page', 'next', 'limit', 'skip']
+                    , response: {
+                        statusCode: 1 //閲嶆柊瑙勫畾鎴愬姛鐨勭姸鎬佺爜涓� 1锛宼able 缁勪欢榛樿涓� 0
+                    },
+                    done: function (res) {   //杩斿洖鏁版嵁鎵ц鍥炶皟鍑芥暟
+                        layer.close(layer.index);    //杩斿洖鏁版嵁鍏抽棴loading		    	
+                    }
+                    , parseData: function (res) {
+                        if (res.count == 0) {
+                            return {
+                                'code': 201, //鎺ュ彛鐘舵��
+                                'msg': '鏃犳暟鎹�', //鎻愮ず鏂囨湰
+                                'count': 0, //鏁版嵁闀垮害
+                                'data': [] //鏁版嵁鍒楄〃锛屾槸鐩存帴濉厖杩涜〃鏍间腑鐨勬暟缁�
+                            }
+                        }
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery(table, option) {
+                var Status = $("select[name='Status']").val();//鐘舵��
+                var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+                var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
+                var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+                var Dept = $("#Dept").val();       //閮ㄩ棬淇℃伅
+                var Part = $("#Part").val();       //鐗╂枡淇℃伅
+                var Employee = $("#Employee").val();       //鑱屽憳淇℃伅
+                var Group = $("#Group").val();       //鐝粍淇℃伅
+                if (Status) {
+                    switch (Status) {
+                        case '-1':   //鍏ㄩ儴
+                            sWhere += "";
+                            break;
+                        case '0':    //鏈鏍�
+                            sWhere += " and 瀹℃牳浜�=''";
+                            break;
+                        case '1':    //宸插鏍�
+                            sWhere += " and 瀹℃牳浜�<>''";
+                            break;
+                        case '2':    //宸插叧闂�
+                            sWhere += " and 鍏抽棴浜�<>''";
+                        default:
+
+                    }
+                }
+                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 (Dept) {
+                    sWhere += " and 閮ㄩ棬 like '%" + Dept + "%'";
+                }
+                if (Part) {
+                    sWhere += " and concat(鐗╂枡浠g爜,鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿) like '%" + Part + "%'";
+                }
+                if (Employee) {
+                    sWhere += " and concat(鍒跺崟浜�) like '%" + Employee + "%'";
+                }
+                if (Group) {
+                    sWhere += " and concat(鍒跺崟浜�) like '%" + Group + "%'";
+                }
+                set_InitGrid(sWhere);
+                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+                sWhere = "";
+            }
+            //#endregion
+
+            //#region 閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $('#Status').find("option[value='-1']").attr("selected", true);
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HBillNo").val("");
+                $("#Dept").val("");
+                $("#Part").val("");
+                $("#Employee").val("");
+                $("#Group").val("");
+            }
+            //#endregion
+
+            //#region 鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    area: ['100%', '100%'],
+                    title: '鐢熶骇姹囨姤鍗�-鏂板',
+                    shift: 0,
+                    content: '../鐢熶骇姹囨姤鍗�/Sc_Add_ICMOReportBillList.html?OperationType=1&linterid=&HSouceBillType=',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 缂栬緫
+            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: '缂栬緫鐢熶骇姹囨姤鍗�'
+                        , closeBtn: 1
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鐢熶骇姹囨姤鍗�/Sc_Add_ICMOReportBillList.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒犻櫎
+            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_MESBeginStepWorkBill/DeltetMESBeginStepWorkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": InterID, "UserName": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+            //#endregion
+
+            //#region 瀹℃牳
+            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_ProcessReport/MES_Sc_ProcessReportCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        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('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶅鏍�
+            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_ProcessReport/MES_Sc_ProcessReportCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        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
+
+            //#region 棰勮
+            function get_PrintReport() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + InterID);
+                    //window.open("../鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
+                    window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + InterID + "&Type=HDepartMent" + "&OpenTmp=b");
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+                }
+            }
+            //#endregion
+
+            //#region 娓呯┖杩囨护鏉′欢
+            function set_ClearQuery() {
+                $('#Status').find("option[value='-1']").attr("selected", true);
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HBillNo").val("");
+                $("#Dept").val("");
+                $("#Part").val("");
+                $("#Employee").val("");
+                $("#Group").val("");
+            }
+            //#endregion
+
+        //#endregion
+
+
+        });
+
+
+
+
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_Add_MESReturnStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_Add_MESReturnStepWorkBillList.html"
index 849f6ca..3b5ce2e 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_Add_MESReturnStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_Add_MESReturnStepWorkBillList.html"
@@ -87,7 +87,7 @@
                             <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>
+                                <button type="button" id="Exit" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
                             </div>
 
                         </div>
@@ -134,14 +134,14 @@
                                                     <div class="layui-inline">
                                                         <label class="layui-form-label">宸ュ簭搴忓彿</label>
                                                         <div class="layui-input-inline">
-                                                            <input type="text" name="HProcNo" id="HProcNo" lay-verify="number" autocomplete="off" class="layui-input" />
+                                                            <input type="text" name="HProcNo" id="HProcNo"  autocomplete="off" class="layui-input" />
                                                         </div>
                                                     </div>
                                                     <div class="layui-inline">
                                                         <label class="layui-form-label">杩斿伐宸ュ簭</label>
                                                         <div class="layui-input-inline">
                                                             <div class="layui-input-inline">
-                                                                <select name="HProcID" id="HProcID" lay-verify="required" lay-search="">
+                                                                <select name="HProcID" id="HProcID"  lay-search="">
                                                                     <option value="">閫夋嫨鎴栨悳绱㈤�夋嫨杩斿伐宸ュ簭</option>
                                                                 </select>
                                                             </div>
@@ -168,7 +168,7 @@
                                                     <div class="layui-inline">
                                                         <label class="layui-form-label">浜у搧浠g爜</label>
                                                         <div class="layui-input-inline">
-                                                            <input type="text" name="HMaterCode" id="HMaterCode" class="layui-input" value="" style="float:left;width:150px;">
+                                                            <input type="text" name="HMaterNumber" id="HMaterNumber" class="layui-input" value="" style="float:left;width:150px;">
                                                             <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input" value="" style="float:left;width:150px;">
                                                             <button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterList" id="HMaterList" style="width:40px;">
                                                                 <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -476,7 +476,7 @@
                 $('#HICMOBillNo').attr("disabled", true);
                 $('#HICMOInterID').attr("disabled", true);
                 $('#HICMOBillList').addClass("layui-btn-disabled").attr("disabled", true);
-                $('#HMaterCode').attr("disabled", true);
+                $('#HMaterNumber').attr("disabled", true);
                 $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
                 $('#HMaterName').attr("disabled", true);
                 $('#HMaterSpec').attr("disabled", true);
@@ -507,7 +507,7 @@
                                 var LoadData = data.data.h_p_JIT_GetInfoByICMOStatusInterID;
                                
                                 $("#HMaterID").val(LoadData[0].HMaterID); //浜у搧ID
-                                $("#HMaterCode").val(LoadData[0].HMaterNumber); //浜у搧浠g爜
+                                $("#HMaterNumber").val(LoadData[0].HMaterNumber); //浜у搧浠g爜
                                 $("#HMaterName").val(LoadData[0].HMaterName); //浜у搧鍚嶇О
                                 $("#HMaterSpec").val(LoadData[0].HModel); //浜у搧瑙勬牸
 
@@ -546,7 +546,7 @@
                 $('#HICMOBillNo').attr("disabled", true);
                 $('#HICMOInterID').attr("disabled", true);
                 $('#HICMOBillList').addClass("layui-btn-disabled").attr("disabled", true);
-                $('#HMaterCode').attr("disabled", true);
+                $('#HMaterNumber').attr("disabled", true);
                 $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
                 $('#HMaterName').attr("disabled", true);
                 $('#HMaterSpec').attr("disabled", true);
@@ -585,7 +585,7 @@
                                 , "HPlanBeginDate": formatDate(data.杩斿伐鏃堕棿)
 
                                 , "HMaterID": data.HMaterID
-                                , "HMaterCode": data.浜у搧浠g爜
+                                , "HMaterNumber": data.浜у搧浠g爜
                                 , "HMaterName": data.浜у搧鍚嶇О
                                 , "HMaterSpec": data.瑙勬牸鍨嬪彿
 
@@ -724,7 +724,7 @@
             //閫�鍑�
             form.on('submit(Exit)', function (data) {
                 Pub_Close(1);
-                window.parent.location.reload();
+                parent.location.reload();
             });
 
 
@@ -750,7 +750,7 @@
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
                         $("#HMaterName").val(checkStatus.data[0].HName);
-                        $("#HMaterCode").val(checkStatus.data[0].HNumber);
+                        $("#HMaterNumber").val(checkStatus.data[0].HNumber);
                         $("#HMaterID").val(checkStatus.data[0].HItemID);
                         $("#HMaterSpec").val(checkStatus.data[0].HModel);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
@@ -978,6 +978,10 @@
                 layer.msg("杩斿伐宸ュ簭鍙蜂笉鑳戒负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return Result = false;
             }
+            if (!(/(^[1-9]\d*$)/.test($("#HProcNo").val()))) {
+                layer.msg("杩斿伐宸ュ簭鍙峰彧鑳戒负姝f暣鏁板瓧!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return Result = false;
+            }
             if ($("#HProcID").val() == '' || $("#HProcID").val() == null) {
                 layer.msg("杩斿伐宸ュ簭涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return Result = false;
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 d0b122e..637e35b 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"
@@ -697,7 +697,7 @@
             //閫�鍑�
             form.on('submit(Exit)', function (data) {
                 Pub_Close(1);
-                window.parent.location.reload();
+                parent.location.reload();
             });
 
 
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
index f75a7ca..18f6dae 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
@@ -223,7 +223,7 @@
                             </div>
                             <div class="layui-tab-item">
                                 <!-- <table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>-->
-                                <div class="layui-form-item" style="padding:15px;margin:0px">
+                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
                                     <div class="layui-row">
                                         <div class="layui-col-xs3">
                                             <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉$爜</label>
@@ -233,7 +233,7 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="layui-form-item" style="padding:15px;margin:0px">
+                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
                                     <div class="layui-row">
                                         <div class="layui-col-xs3">
                                             <label class="layui-form-label" style="width:40px;padding-left:0px;">鐗╂枡</label>
@@ -243,7 +243,7 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="layui-form-item" style="padding:15px;margin:0px">
+                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
                                     <div class="layui-row">
                                         <div class="layui-col-xs3">
                                             <label class="layui-form-label" style="width:40px;padding-left:0px;">瑙勬牸</label>
@@ -253,17 +253,7 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="layui-form-item" style="padding:15px;margin:0px">
-                                    <div class="layui-row">
-                                        <div class="layui-col-xs3">
-                                            <label class="layui-form-label" style="width:40px;padding-left:0px;">瑙勬牸</label>
-                                        </div>
-                                        <div class="layui-col-xs8">
-                                            <input type="text" name="HMaterModel_B" id="HMaterModel_B" lay-verify="HMaterModel_B" autocomplete="off" class="layui-input">
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="layui-form-item" style="padding:15px;margin:0px">
+                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
                                     <div class="layui-row">
                                         <div class="layui-col-xs3">
                                             <label class="layui-form-label" style="width:40px;padding-left:0px;">鎵规</label>
@@ -273,7 +263,7 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="layui-form-item" style="padding:15px;margin:0px">
+                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
                                     <div class="layui-row">
                                         <div class="layui-col-xs3">
                                             <label class="layui-form-label" style="width:40px;padding-left:0px;">鍗曚綅</label>
@@ -283,7 +273,7 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="layui-form-item" style="padding:15px;margin:0px">
+                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
                                     <div class="layui-row">
                                         <div class="layui-col-xs3">
                                             <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
@@ -293,7 +283,7 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="layui-form-item" style="padding:15px;margin:0px">
+                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
                                     <div class="layui-row">
                                         <div class="layui-col-xs3">
                                             <label class="layui-form-label" style="width:40px;padding-left:0px;">瀹归噺</label>
@@ -303,7 +293,7 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="layui-form-item" style="padding:15px;margin:0px">
+                                <div class="layui-form-item" style="padding: 0px; margin: 0px">
                                     <div class="layui-row">
                                         <div class="layui-col-xs3">
                                             <label class="layui-form-label" style="width:40px;padding-left:0px;">浠撳簱</label>
@@ -313,7 +303,7 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="layui-form-item" style="padding:15px;margin:0px">
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                     <div class="layui-row">
                                         <div class="layui-col-xs3">
                                             <label class="layui-form-label" style="width:40px;padding-left:0px;">浠撲綅</label>
@@ -324,7 +314,7 @@
                                     </div>
                                 </div>
                             </div>
-                                <div class="layui-tab-item">
+                            <div class="layui-tab-item">
                                     <table class="layui-hide" id="fj-table-qd" lay-filter="fj-table-qd"></table>
                                 </div>
                             </div>

--
Gitblit v1.9.1