From 8bf9796934a40aeef7e93779b023ad7f937b468c Mon Sep 17 00:00:00 2001
From: cwjbxqmz <1134865194@qq.com>
Date: 星期一, 27 十一月 2023 14:51:33 +0800
Subject: [PATCH] 1

---
 WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill - 复制.html | 3705 ++++++++++++++++++++++++
 WebTM/views/user/login.html                                      |  270 +
 WebTM/views/user/login2.html                                     |  271 -
 WebTM/views/车间管理/单品过站/Sc_SourceLineRepairBillList.html           |  668 ++++
 WebTM/views/应收管理/报表分析/YS_CusShouldIncomeReport.html              |  555 +++
 WebTM/views/基础资料/生产基础资料/Gy_Source.html                           |    4 
 WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html                  |    2 
 WebTM/views/生产管理/作业指导书/Gy_SOPBill_Video.html                     |   21 
 WebTM/views/IpadIndex.html                                       |   15 
 WebTM/views/index_Mobile.html                                    |   10 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_QCCheckClass.html            |    5 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_CheckItem.html               |    7 
 WebTM/views/index_QiaoYi.html                                    |    7 
 WebTM/views/设备管理/Sb_EquipMaintainPlanBillEdit.html               |   73 
 WebTM/views/user/login_pda.html                                  |  279 +
 WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html                  |  127 
 WebTM/views/车间管理/单品过站/RetrospectiveQueryReport.html              |  398 ++
 WebTM/views/设备管理/Sb_EquipDotCheckPlanBillEdit.html               |  275 +
 WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html      |   93 
 WebTM/views/index.html                                           |   22 
 WebTM/views/车间管理/单品过站/Cj_ProcessItemBGA.html                     |   40 
 WebTM/views/home/console_Mobile_QiaoYi.html                      |  173 -
 WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBill_QiaoYi_PDA.html          |  154 
 WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html                 |    2 
 WebTM/views/设备管理/设备规程单/Sb_EquipDotCheckRuleEdit.html             |    8 
 WebTM/views/index_Mobile_QiaoYi.html                             |  489 ---
 WebTM/views/车间管理/单品过站/Cj_CollectionOfSingleProductDefects.html   |   31 
 WebTM/views/车间管理/单品过站/BadQueryReport.html                        |  398 ++
 WebTM/views/车间管理/单品过站/Cj_ProcessItemStationPlatform.html         |  104 
 WebTM/views/车间管理/单品过站/Cj_ProcessItemBGA_PJGH.html                |   10 
 WebTM/views/系统管理/用户管理/Xt_UserListEdit.html                       |  144 
 WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBillList_QiaoYi_PDA.html      |   26 
 WebTM/views/公共页面/Kf_ChaoBaoEditDlg.html                          |   53 
 WebTM/layuiadmin/Scripts/webConfig.js                            |    4 
 WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_BadReason.html               |    6 
 WebTM/WebTM.csproj                                               |   11 
 WebTM/views/应收管理/报表分析/YS_CusShouldIncomeEntryReport.html         |  532 +++
 37 files changed, 7,746 insertions(+), 1,246 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 1e5cb69..b48f269 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -208,8 +208,9 @@
     <Content Include="views\userfiles\images\pda.jpg" />
     <Content Include="views\userfiles\images\loginBackground-New.jpg" />
     <Content Include="views\userfiles\images\wy.jpg" />
+    <Content Include="views\user\login_pda.html" />
     <Content Include="views\user\login_anrui.html" />
-    <Content Include="views\user\login2.html" />
+    <Content Include="views\user\login.html" />
     <Content Include="views\video\1.wav" />
     <Content Include="views\video\jingbao.wav" />
     <Content Include="views\video\success.wav" />
@@ -290,6 +291,8 @@
     <Content Include="views\宸ヨ祫绠$悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesSumQueryBillList.html" />
     <Content Include="views\宸ヨ祫绠$悊\璇峰亣鐢宠\Pay_OutApplyBill.html" />
     <Content Include="views\宸ヨ祫绠$悊\璇峰亣鐢宠\Pay_OutApplyBillList.html" />
+    <Content Include="views\搴旀敹绠$悊\鎶ヨ〃鍒嗘瀽\YS_CusShouldIncomeEntryReport.html" />
+    <Content Include="views\搴旀敹绠$悊\鎶ヨ〃鍒嗘瀽\YS_CusShouldIncomeReport.html" />
     <Content Include="views\鏉$爜鏄庣粏\Kf_BarCodeDetailQuery.html" />
     <Content Include="views\鐢熶骇绠$悊\浣滀笟鎸囧涔Gy_SOPBill_Video.html" />
     <Content Include="views\鐢熶骇绠$悊\寮傚父鍙嶉鍗昞Sc_Reply_MESExecptFeedBackBill.html" />
@@ -325,12 +328,16 @@
     <Content Include="views\璁惧绠$悊\璁惧瑙勭▼鍗昞Sb_EquipDotCheckRuleList_PDA.html" />
     <Content Include="views\璐ㄩ噺绠$悊\宸ュ簭妫�楠屽崟\MES_ProcessCheckBillList_PDA.html" />
     <Content Include="views\璐ㄩ噺绠$悊\宸ュ簭妫�楠屽崟\MES_ProcessCheckBill_PDA.html" />
+    <Content Include="views\杞﹂棿绠$悊\鍗曞搧杩囩珯\BadQueryReport.html" />
+    <Content Include="views\璐ㄩ噺绠$悊\棣栦欢妫�楠屽崟\QC_Add_Edit_FirstPieceCheckBill - 澶嶅埗.html" />
     <Content Include="views\杞﹂棿绠$悊\鍗曞搧杩囩珯\Cj_CollectionOfSingleProductDefects.html" />
     <Content Include="views\璐ㄩ噺绠$悊\棣栦欢妫�楠屽崟\QC_FirstPieceCheckReport_ZTFB.html" />
     <Content Include="views\璐ㄩ噺绠$悊\棣栦欢妫�楠屽崟\QC_FirstPieceCheckReport_ZDQX.html" />
     <Content Include="views\杞﹂棿绠$悊\鍗曞搧杩囩珯\Cj_ProcessItemBGA.html" />
     <Content Include="views\杞﹂棿绠$悊\鍗曞搧杩囩珯\Cj_ProcessItemBGA_PJGH.html" />
     <Content Include="views\杞﹂棿绠$悊\鍗曞搧杩囩珯\Cj_ProcessItemStationPlatform.html" />
+    <Content Include="views\杞﹂棿绠$悊\鍗曞搧杩囩珯\RetrospectiveQueryReport.html" />
+    <Content Include="views\杞﹂棿绠$悊\鍗曞搧杩囩珯\Sc_SourceLineRepairBillList.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆\MES_ProcessExchangeBillList_PDA_QiaoYi.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆\MES_Sc_ICMOBillList_PDA_QiaoYi.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆\MES_Sc_ProcessExchangeBillMain_Note_PDA.html" />
@@ -910,7 +917,7 @@
     <Content Include="views\user\administrators\role.html" />
     <Content Include="views\user\administrators\roleform.html" />
     <Content Include="views\user\forget.html" />
-    <Content Include="views\user\login.html" />
+    <Content Include="views\user\login2.html" />
     <Content Include="views\user\reg.html" />
     <Content Include="views\user\user\list.html" />
     <Content Include="views\user\user\userform.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index e70a0c8..2b04786 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,10 +3,10 @@
     //var WEBURL = "http://192.168.16.80:8011/";          //鍔炲叕瀹ゆ湇鍔″櫒
     //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch鏈湴*/
     //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
-    //var WEBURL = "http://localhost/API/";             //棰滄檽鍐涙湰鍦伴厤缃�
+    var WEBURL = "http://localhost/API/";             //棰滄檽鍐涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄤ箰鏈湴閰嶇疆
    /* var WEBURL = "http://localhost:8082/API/";    //鏉滆春鏈湴閰嶇疆*/
-    var WEBURL = "http://localhost:81/API/";  //闄堥洴闈欐湰鍦伴厤缃�
+    //var WEBURL = "http://localhost:81/API/";  //闄堥洴闈欐湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //浣欐�濇澃鏈湴閰嶇疆
     //var WEBURL = "http://localhost:8088/ARAPI/";    //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
     //var WEBURL = "http://10.1.4.155/API/";   //姹熶赴瀹㈡埛NEW
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 90019a2..9c2bfd7 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -643,9 +643,9 @@
                 title: '浣滀笟鎸囧涔�',
                 closeBtn: 1,
                 shift: 2,
-                area: ['80%', '80%'],
+                area: ['95%', '95%'],
                 maxmin: true,
-                content: '../../../views/鐢熶骇绠$悊/浣滀笟鎸囧涔�/Gy_SOPBill_Video.html?OperationType=5&HMaterID=' + HMaterID + '&HSourceNo=' + workcode + '&HSourceEntryID=' + HSourceEntryID,
+                content: '鐢熶骇绠$悊/浣滀笟鎸囧涔�/Gy_SOPBill_Video.html?OperationType=5&HMaterID=' + HMaterID + '&HSourceNo=' + workcode + '&HSourceEntryID=' + HSourceEntryID,
                 end: function () {
 
                 },               
@@ -1059,21 +1059,22 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="layui-row layui-col-space10">
-                            <div class="layui-col-sm12 layui-col-md4" onclick="KSOpenWork(event,this)">
+                        <div class="layui-row layui-col-space10" style="display:none;">
+                            <div class="layui-col-sm12 layui-col-md4" onclick="KSOpenWork(event,this)" >
                                 <div class="cnt bottomright">
                                     <span class="layui-icon layui-icon-pause imgicon"></span>
                                     <span class="imgtitle">蹇�熷紑宸�</span>
                                 </div>
                             </div>
+                           
+                        </div>
+                        <div class="layui-row layui-col-space10">
                             <div class="layui-col-sm12 layui-col-md4" onclick="SOP(event,this)">
                                 <div class="cnt bottomright">
                                     <span class="layui-icon layui-icon-pause imgicon"></span>
                                     <span class="imgtitle">浣滀笟鎸囧涔�</span>
                                 </div>
                             </div>
-                        </div>
-                        <div class="layui-row layui-col-space10">
                             <div class="layui-col-sm12 layui-col-md4" onclick="OpenFistCheck(event,this)">
                                 <div class="cnt bottomright">
                                     <span class="layui-icon layui-icon-search imgicon"></span>
@@ -1081,7 +1082,7 @@
                                 </div>
                             </div>
                             <div class="layui-col-sm12 layui-col-md4">
-                                <div class="cnt bottomright" style="pointer-events:none; background-color:rgb(0 0 0 / 10%)">
+                                <div class="cnt bottomright" style="pointer-events:none; background-color:rgb(0 0 0 / 10%);display:none;">
                                     <span class="layui-icon layui-icon-search imgicon"></span>
                                     <span class="imgtitle">宸℃</span>
                                 </div>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_QiaoYi_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_QiaoYi_PDA.html"
index 2a7c966..a4dbbf8 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_QiaoYi_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_QiaoYi_PDA.html"
@@ -73,19 +73,17 @@
                         </div>
                     </div>
                     <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
-                        <div class="layui-row">
-                            <div class="layui-col-xs2">
-                                <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdModify" class="layui-btn" id="cmdModify">缂栬緫</button>
-                            </div>
-                            <div class="layui-col-xs2">
-                                <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
-                            </div>
-                            <div class="layui-col-xs2">
-                                <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRefresh" class="layui-btn" id="cmdRefresh">鍒锋柊</button>
-                            </div>
-                            <div class="layui-col-xs2">
-                                <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
-                            </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdModify" class="layui-btn" id="cmdModify">缂栬緫</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRefresh" class="layui-btn" id="cmdRefresh">鍒锋柊</button>
+                        </div>
+                        <div class="layui-col-xs2">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
                         </div>
                     </div>
                     <!--澶辫触鎻愮ず闊�-->
@@ -348,7 +346,7 @@
 
         form.on('submit(cmdCancel)', function () {
             layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
-                parent.location.href = "../../../views/index_Mobile.html";
+                parent.location.href = "../../../views/index_Mobile_QiaoYi.html";
             });
         })
 
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html"
index d83d8be..81169ac 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html"
@@ -346,8 +346,8 @@
 
                 //鍏夋爣榛樿鍦ㄦ潯鐮佷綅缃笂
                 var pFocus = $("#HSourceBillNo");
-                pFocus.focus();     //鑾峰彇鍏夋爣
                 pFocus.select();
+                pFocus.focus();     //鑾峰彇鍏夋爣
             }
 
             //鍒濆鍖栬〃鍗曟椂闂存彃浠�
@@ -525,7 +525,12 @@
                         $("#HStockPlaceName").val("");
                         $("#HStockPlaceName").removeAttr("readonly");
                         $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
-                        layer.msg("浠撳簱鏉$爜涓虹┖锛�", { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        layer.msg("浠撳簱鏉$爜涓虹┖锛�", {
+                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HWHName").select();
+                            $("#HWHName").focus();
+                        });
                         return;
                     }
 
@@ -550,6 +555,7 @@
                                 }
                                 element.tabChange('tab-Kf_SellOutBill_QiaoYi_PDA', '1');
                                 //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+                                $("#HBarCode").select();
                                 $("#HBarCode").focus();
                             }
                             else {
@@ -560,7 +566,12 @@
                                 $("#HStockPlaceName").val("");
                                 $("#HStockPlaceName").removeAttr("readonly");
                                 $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
-                                layer.msg(result.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                layer.msg(result.Message, {
+                                    icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                }, function () {
+                                    $("#HWHName").select();
+                                    $("#HWHName").focus();
+                                });
                             }
                             layer.closeAll("loading");
                         }
@@ -599,7 +610,12 @@
                         $("#HWHName").val("");
                         $("#HStockPlaceID").val("0");
                         $("#HStockPlaceName").val("");
-                        layer.msg("浠撲綅鏉$爜涓虹┖锛�", { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        layer.msg("浠撲綅鏉$爜涓虹┖锛�", {
+                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HStockPlaceName").select();
+                            $("#HStockPlaceName").focus();
+                        });
                         return;
                     }
 
@@ -616,6 +632,7 @@
                                 $("#HWHID").val(result.data[0].HWHID);
                                 //element.tabChange('tab-Kf_SellOutBill_QiaoYi_PDA', '1');
                                 //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+                                $("#HBarCode").select();
                                 $("#HBarCode").focus();
                             }
                             else {
@@ -624,7 +641,12 @@
                                 $("#HWHName").val("");
                                 $("#HStockPlaceID").val("0");
                                 $("#HStockPlaceName").val("");
-                                layer.msg(result.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                layer.msg(result.Message, {
+                                    icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                }, function () {
+                                    $("#HStockPlaceName").select();
+                                    $("#HStockPlaceName").focus();
+                                });
                             }
                             layer.closeAll("loading");
                         }
@@ -660,7 +682,12 @@
                         playSound();
                         $("#HKeeperID").val("0");
                         $("#HKeeperName").val("");
-                        layer.msg("淇濈鍛樻潯鐮佷负绌猴紒", { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        layer.msg("淇濈鍛樻潯鐮佷负绌猴紒", {
+                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HKeeperName").select();
+                            $("#HKeeperName").focus();
+                        });
                         return;
                     }
 
@@ -675,13 +702,19 @@
                                 $("#HKeeperName").val(result.data[0].HName);
                                 element.tabChange('tab-Kf_SellOutBill_QiaoYi_PDA', '1');
                                 //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+                                $("#HBarCode").select();
                                 $("#HBarCode").focus();
                             }
                             else {
                                 playSound();
                                 $("#HKeeperID").val("0");
                                 $("#HKeeperName").val("");
-                                layer.msg(result.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                layer.msg(result.Message, {
+                                    icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                }, function () {
+                                    $("#HKeeperName").select();
+                                    $("#HKeeperName").focus();
+                                });
                             }
                             layer.closeAll("loading");
                         }
@@ -717,7 +750,12 @@
                         playSound();
                         $("#HSecManagerID").val("0");
                         $("#HSecManagerName").val("");
-                        layer.msg("楠屾敹鍛樻潯鐮佷负绌猴紒", { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        layer.msg("楠屾敹鍛樻潯鐮佷负绌猴紒", {
+                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HSecManagerName").select();
+                            $("#HSecManagerName").focus();
+                        });
                         return;
                     }
 
@@ -732,13 +770,19 @@
                                 $("#HSecManagerName").val(result.data[0].HName);
                                 element.tabChange('tab-Kf_SellOutBill_QiaoYi_PDA', '1');
                                 //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+                                $("#HBarCode").select();
                                 $("#HBarCode").focus();
                             }
                             else {
                                 playSound();
                                 $("#HSecManagerID").val("0");
                                 $("#HSecManagerName").val("");
-                                layer.msg(result.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                layer.msg(result.Message, {
+                                    icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                }, function () {
+                                    $("#HSecManagerName").select();
+                                    $("#HSecManagerName").focus();
+                                });
                             }
                             layer.closeAll("loading");
                         }
@@ -774,7 +818,12 @@
                         playSound();
                         $("#HDeptID").val("0");
                         $("#HDeptName").val("");
-                        layer.msg("閮ㄩ棬鏉$爜涓虹┖锛�", { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        layer.msg("閮ㄩ棬鏉$爜涓虹┖锛�", {
+                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HDeptName").select();
+                            $("#HDeptName").focus();
+                        });
                         return;
                     }
 
@@ -789,13 +838,19 @@
                                 $("#HDeptName").val(result.data[0].HName);
                                 element.tabChange('tab-Kf_SellOutBill_QiaoYi_PDA', '1');
                                 //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+                                $("#HBarCode").select();
                                 $("#HBarCode").focus();
                             }
                             else {
                                 playSound();
                                 $("#HDeptID").val("0");
                                 $("#HDeptName").val("");
-                                layer.msg(result.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                layer.msg(result.Message, {
+                                    icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                }, function () {
+                                    $("#HDeptName").select();
+                                    $("#HDeptName").focus();
+                                });
                             }
                             layer.closeAll("loading");
                         }
@@ -961,7 +1016,7 @@
                         parent.layer.close(index);
                     }
                     else {
-                        parent.location.href = "../../../views/index_Mobile.html";
+                        parent.location.href = "../../../views/index_Mobile_QiaoYi.html";
                     }
                 });
             })
@@ -985,12 +1040,24 @@
 
                 if (HSourceFlag == false) {
                     playSound();
-                    layer.msg("璇峰厛鎵弿婧愬崟鏉$爜锛�", { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    layer.msg("璇峰厛鎵弿婧愬崟鏉$爜锛�", {
+                        icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                    }, function () {
+                        element.tabChange('tab-Kf_SellOutBill_QiaoYi_PDA', '1');
+                        $("#HSourceBillNo").select();
+                        $("#HSourceBillNo").focus();
+                    });
                     return;
                 }
                 if (sHWHID == 0) {
                     playSound();
-                    layer.msg("浠撳簱鏈�夋嫨锛岃鍏堥�夋嫨浠撳簱鎴栦粨浣嶏紒", { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    layer.msg("浠撳簱鏈�夋嫨锛岃鍏堥�夋嫨浠撳簱鎴栦粨浣嶏紒", {
+                        icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                    }, function () {
+                        element.tabChange('tab-Kf_SellOutBill_QiaoYi_PDA', '1');
+                        $("#HStockPlaceName").select();
+                        $("#HStockPlaceName").focus();
+                    });
                     return;
                 }
                 layer.open({
@@ -1007,6 +1074,7 @@
                     }
                     , end: function () {
                         element.tabChange('tab-Kf_SellOutBill_QiaoYi_PDA', '2');
+                        $("#HBarCode").select();
                         $("#HBarCode").focus();
                         //鏄剧ず琛ㄤ綋鏄庣粏
                         DisBillEntryList();
@@ -1063,13 +1131,20 @@
                                 $('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
                             }
                             element.tabChange('tab-Kf_SellOutBill_QiaoYi_PDA', '2');
+                            $("#HBarCode").select();
                             $("#HBarCode").focus();
                             //鏄剧ず琛ㄤ綋鏄庣粏
                             DisBillEntryList();
                         }
                         else {
                             playSound();
-                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            layer.msg(result.Message, {
+                                icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            }, function () {
+                                element.tabChange('tab-Kf_SellOutBill_QiaoYi_PDA', '1');
+                                $("#HSourceBillNo").select();
+                                $("#HSourceBillNo").focus();
+                            });
                         }
                     }
                 });
@@ -1085,14 +1160,18 @@
             $('#HBarCode').on('keydown', function (event) {
                 if (event.keyCode == 13) {
                     GetMeesageByBarCode();
+                    $("#HBarCode").select();
                     $("#HBarCode").focus();     //鑾峰彇鍏夋爣
+                    layer.closeAll("loading");
                 }
             });
 
             //鏉$爜鎸夐挳
             form.on('submit(HBarCode-BT)', function (data) {
                 GetMeesageByBarCode();
+                $("#HBarCode").select();
                 $("#HBarCode").focus();     //鑾峰彇鍏夋爣
+                layer.closeAll("loading");
             });
 
             //鎵潯鐮�
@@ -1109,7 +1188,13 @@
                 layer.load(3)
                 if (HDeleteFlag == "*") {
                     if (sBarCode == "") {
-                        layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        playSound();
+                        layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
+                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HBarCode").select();
+                            $("#HBarCode").focus();
+                        });
                         return;
                     }
                     else {
@@ -1132,13 +1217,22 @@
                                 }
                                 else {
                                     playSound();
-                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-
+                                    layer.msg(data.Message, {
+                                        icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                    }, function () {
+                                        $("#HBarCode").select();
+                                        $("#HBarCode").focus();
+                                    });
                                 }
                             },
                             error: function (err) {
                                 playSound();
-                                layer.msg('閿欒' + err, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                layer.msg('閿欒' + err, {
+                                    icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                }, function () {
+                                    $("#HBarCode").select();
+                                    $("#HBarCode").focus();
+                                });
                             }
                         });
                 }
@@ -1146,7 +1240,12 @@
                     var sBarCode = $('#HBarCode').val()
                     if (sBarCode == '') {
                         playSound();
-                        layer.msg("鏉$爜涓虹┖锛岃鎵弿鏉$爜锛�", { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        layer.msg("鏉$爜涓虹┖锛岃鎵弿鏉$爜锛�", {
+                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HBarCode").select();
+                            $("#HBarCode").focus();
+                        });
                         return;
                     }
                     if (sBarCode != "") {
@@ -1250,12 +1349,22 @@
                             }
                             else {
                                 playSound();
-                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                layer.msg(result.Message, {
+                                    icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                }, function () {
+                                    $("#HBarCode").select();
+                                    $("#HBarCode").focus();
+                                });
                             }
                         },
                         error: function (err) {
                             playSound();
-                            layer.msg("閿欒锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            layer.msg("閿欒锛�" + err, {
+                                icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            }, function () {
+                                $("#HBarCode").select();
+                                $("#HBarCode").focus();
+                            });
                         }
                     });
                 }
@@ -1322,7 +1431,6 @@
                             table.render(BarCodelistOption);
                         }
                         else {
-                            //layer.msg(result.Message);
                             layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         }
                     }
diff --git a/WebTM/views/home/console_Mobile_QiaoYi.html b/WebTM/views/home/console_Mobile_QiaoYi.html
index a564dbe..f394cdd 100644
--- a/WebTM/views/home/console_Mobile_QiaoYi.html
+++ b/WebTM/views/home/console_Mobile_QiaoYi.html
@@ -20,61 +20,18 @@
                             <div class="layadmin-shortcut">
                                 <div carousel-item>
                                     <ul class="layui-row layui-col-space10">
-                                        <!--<li class="layui-col-xs3">
-                                            <a href="../杞﹂棿绠$悊/宸ュ簭娴佽浆/MES_StationInBill_PDA.html" target="main_self_frame">
-                                                <i class="layui-icon layui-icon-find-fill"></i>
-                                                <cite>宸ュ簭杩涚珯鎺ユ敹鍗�</cite>
-                                            </a>
-                                        </li>
-                                        <li class="layui-col-xs3">
-                                            <a href="../杞﹂棿绠$悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA.html" target="main_self_frame">
-                                                <i class="layui-icon layui-icon-find-fill"></i>
-                                                <cite>宸ュ簭鍑虹珯姹囨姤鍗�</cite>
-                                            </a>
-                                        </li>-->
-                                        <!--<li class="layui-col-xs3">
-                                            <a href="../杞﹂棿绠$悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill.html" target="main_self_frame">
-                                                <i class="layui-icon layui-icon-find-fill"></i>
-                                                <cite>濮斿宸ュ簭鍙戝嚭鍗�</cite>
-                                            </a>
-                                        </li>-->
                                         <li class="layui-col-xs3">
                                             <a href="../杞﹂棿绠$悊/宸ュ簭娴佽浆/MES_StationInBill_PDA_QiaoYi.html?type=jzd" target="main_self_frame">
                                                 <i class="layui-icon layui-icon-add-circle"></i>
                                                 <cite>宸ュ簭杩涚珯鎺ユ敹鍗�</cite>
                                             </a>
                                         </li>
-                                        <!--<li class="layui-col-xs3">
-                                            <a href="../楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_Fast.html" target="main_self_frame">
-                                                <i class="layui-icon layui-icon-template-1"></i>
-                                                <cite>濮斿鍏ュ簱</cite>
-                                            </a>
-                                        </li>-->
                                         <li class="layui-col-xs3">
                                             <a href="../杞﹂棿绠$悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA_QiaoYi.html?type=czd" target="main_self_frame">
                                                 <i class="layui-icon layui-icon-theme"></i>
                                                 <cite>宸ュ簭鍑虹珯姹囨姤鍗�</cite>
                                             </a>
                                         </li>
-
-                                        <!--<li class="layui-col-xs3">
-                                            <a href="../棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_Fast.html" target="main_self_frame">
-                                                <i class="layui-icon layui-icon-chart"></i>
-                                                <cite>棰嗘枡鍑哄簱</cite>
-                                            </a>
-                                        </li>
-                                        <li class="layui-col-xs3">
-                                            <a href="../棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_Fast.html" target="main_self_frame">
-                                                <i class="layui-icon layui-icon-chart"></i>
-                                                <cite>濮斿鍑哄簱</cite>
-                                            </a>
-                                        </li>
-                                        <li class="layui-col-xs3">
-                                            <a href="../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html" target="main_self_frame">
-                                                <i class="layui-icon layui-icon-chat"></i>
-                                                <cite>閿�鍞嚭搴�</cite>
-                                            </a>
-                                        </li>-->
                                         <li class="layui-col-xs3">
                                             <a href="../楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_Fast.html" target="main_self_frame">
                                                 <i class="layui-icon layui-icon-android"></i>
@@ -93,138 +50,24 @@
                                                 <cite>鍏朵粬鍑哄簱</cite>
                                             </a>
                                         </li>
-                                        <!--<li class="layui-col-xs3">
-                                          <a href="../鐢熶骇绠$悊/鐢熶骇鎷嗙鍗�/Sc_PackSplitBill_Fast.html" target="main_self_frame">
-                                              <i class="layui-icon layui-icon-find-fill"></i>
-                                              <cite>鐢熶骇鎷嗙鍗�</cite>
-                                          </a>
-                                        </li>
-                                        <li class="layui-col-xs3">
-                                          <a href="../鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNew.html" target="main_self_frame">
-                                              <i class="layui-icon layui-icon-find-fill"></i>
-                                              <cite>鐢熶骇姹囨姤鍗�</cite>
-                                          </a>
-                                        </li>
-                                        <li class="layui-col-xs3">
-                                          <a href="../浠撳瓨绠$悊/鏉$爜搴撳瓨/KF_ICInventoryByMaterID.html" target="main_self_frame">
-                                              <i class="layui-icon layui-icon-find-fill"></i>
-                                              <cite>鏉$爜搴撳瓨</cite>
-                                          </a>
-                                        </li>
-                                        <li class="layui-col-xs3">
-                                          <a href="../鐢熶骇绠$悊/缁勬墭鍗曠紪杈�/Sc_GroupOrderBillEdit_Fast.html" target="main_self_frame">
-                                              <i class="layui-icon layui-icon-find-fill"></i>
-                                              <cite>缁勬墭鍗曠紪杈�</cite>
-                                          </a>
-                                        </li>-->
                                         <li class="layui-col-xs3">
                                             <a href="../棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_FastList.html" target="main_self_frame">
                                                 <i class="layui-icon layui-icon-auz"></i>
                                                 <cite>鍏朵粬鍑哄簱缂撳瓨鍒楄〃</cite>
                                             </a>
                                         </li>
-                                        <!--<li class="layui-col-xs3">
-                                            <a href="../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html" target="main_self_frame">
-                                                <i class="layui-icon layui-icon-align-center"></i>
-                                                <cite>閲囪喘鍏ュ簱</cite>
+                                        <li class="layui-col-xs3">
+                                            <a href="../WMS鎵爜妯″潡/閿�鍞嚭搴�/Kf_SellOutBill_QiaoYi_PDA.html" target="main_self_frame">
+                                                <i class="layui-icon layui-icon-chat"></i>
+                                                <cite>閿�鍞嚭搴�</cite>
                                             </a>
-                                        </li>-->
-                                        <!--<li class="layui-col-xs3">
-                                            <a href="../鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNewList.html" target="main_self_frame">
+                                        </li>
+                                        <li class="layui-col-xs3">
+                                            <a href="../WMS鎵爜妯″潡/閿�鍞嚭搴�/Kf_SellOutBillList_QiaoYi_PDA.html" target="main_self_frame">
                                                 <i class="layui-icon layui-icon-find-fill"></i>
-                                                <cite>鐢熶骇姹囨姤鍗曠紦瀛樺垪琛�</cite>
-                                            </a>
-                                        </li>-->
-                                        <!--<li class="layui-col-xs3">
-                                            <a href="../浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockOutBill_Fast.html" target="main_self_frame">
-                                                <i class="layui-icon layui-icon-auz"></i>
-                                                <cite>鍒嗗竷璋冨嚭</cite>
-                                            </a>
-                                        </li>-->
-                                        <!--<li class="layui-col-xs3">
-                                            <a href="../棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_Fast.html" target="main_self_frame">
-                                                <i class="layui-icon layui-icon-bluetooth"></i>
-                                                <cite>濮斿棰嗘枡</cite>
+                                                <cite>閿�鍞嚭搴撶紦瀛樺垪琛�</cite>
                                             </a>
                                         </li>
-                                        <li class="layui-col-xs3">
-                                            <a href="../楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_Fast.html" target="main_self_frame">
-                                                <i class="layui-icon layui-icon-mike"></i>
-                                                <cite>濮斿鍏ュ簱</cite>
-                                            </a>
-                                        </li>
-                                        <li class="layui-col-xs3">
-                                            <a href="../楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_Fast.html" target="main_self_frame">
-                                                <i class="layui-icon layui-icon-carousel"></i>
-                                                <cite>鍏朵粬鍏ュ簱</cite>
-                                            </a>
-                                        </li>
-                                        <li class="layui-col-xs3">
-                                            <a href="../棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_Fast.html" target="main_self_frame">
-                                                <i class="layui-icon layui-icon-cellphone"></i>
-                                                <cite>鍏朵粬鍑哄簱</cite>
-                                            </a>
-                                        </li>
-                                        <li class="layui-col-xs3">
-                                            <a href="../棰嗘枡鍙戣揣/鏀舵枡鍏ュ簱/Kf_ReciveBill_Fast_AR.html" target="main_self_frame">
-                                                <i class="layui-icon layui-icon-chart"></i>
-                                                <cite>鍒拌揣纭</cite>
-                                            </a>
-                                        </li>
-                                        <li class="layui-col-xs3">
-                                            <a href="../璐ㄩ噺绠$悊/鏉ユ枡妫�楠屽崟/Kf_QCStockInCheckBill_Fast.html" target="main_self_frame">
-                                                <i class="layui-icon layui-icon-chrome"></i>
-                                                <cite>鏉ユ枡妫�楠�</cite>
-                                            </a>
-                                        </li>
-                                        <li class="layui-col-xs3">
-                                            <a href="../璐ㄩ噺绠$悊/鏉ユ枡妫�楠屽崟/Kf_SCStockInCheckBill_Fast.html" target="main_self_frame">
-                                                <i class="layui-icon layui-icon-diamond"></i>
-                                                <cite>鐢熶骇妫�楠�</cite>
-                                            </a>
-                                        </li>
-                                        <li class="layui-col-xs3">
-                                            <a href="../浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_ARPD.html" target="main_self_frame">
-                                                <i class="layui-icon layui-icon-dollar"></i>
-                                                <cite>璋冩嫧鐩樼偣</cite>
-                                            </a>
-                                        </li>
-                                        <li class="layui-col-xs3">
-                                            <a href="../棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_Check_New.html" target="main_self_frame">
-                                                <i class="layui-icon layui-icon-home"></i>
-                                                <cite>鐢熶骇棰嗘枡鏍¢獙</cite>
-                                            </a>
-                                        </li>
-                                        <li class="layui-col-xs3">
-                                            <a href="../棰嗘枡鍙戣揣/鐢熶骇琛ユ枡/Kf_MateReplenishOutBill_Check_New.html" target="main_self_frame">
-                                                <i class="layui-icon layui-icon-windows"></i>
-                                                <cite>鐢熶骇琛ユ枡鏍¢獙</cite>
-                                            </a>
-                                        </li>
-                                        <li class="layui-col-xs3">
-                                            <a href="../棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_Check_New.html" target="main_self_frame">
-                                                <i class="layui-icon layui-icon-list"></i>
-                                                <cite>濮斿棰嗘枡鏍¢獙</cite>
-                                            </a>
-                                        </li>
-                                        <li class="layui-col-xs3">
-                                            <a href="../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Check_New.html" target="main_self_frame">
-                                                <i class="layui-icon layui-icon-search"></i>
-                                                <cite>閿�鍞嚭搴撴牎楠�</cite>
-                                            </a>
-                                        </li>
-                                        <li class="layui-col-xs3">
-                                            <a href="../棰嗘枡鍙戣揣/鐢熶骇琛ユ枡/Kf_MateReplenishOutBill_Check_New.html" target="main_self_frame">
-                                                <i class="layui-icon layui-icon-addition"></i>
-                                                <cite>鐢熶骇琛ユ枡</cite>
-                                            </a>
-                                        </li>
-                                        <li class="layui-col-xs3">
-                                            <a href="../鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNew.html" target="main_self_frame">
-                                                <i class="layui-icon layui-icon-align-center"></i>
-                                                <cite>鐢熶骇姹囨姤鍗�</cite>
-                                            </a>
-                                        </li>-->
                                     </ul>
                                 </div>
                             </div>
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index a3c6b0c..ba83326 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -596,9 +596,12 @@
                                     <a>鍗曞搧杩囩珯</a>
                                     <dl class="layui-nav-child append" id="append">
                                         <dd><a lay-href="杞﹂棿绠$悊/鍗曞搧杩囩珯/Cj_ProcessItemStationPlatform.html">宸ュ簭鍗曞搧杩囩珯骞冲彴</a></dd>
-                                        <dd><a lay-href="杞﹂棿绠$悊/鍗曞搧杩囩珯/Cj_CollectionOfSingleProductDefects.html">宸ュ簭鍗曞搧涓嶈壇閲囬泦</a></dd>
+                                        <!--<dd><a lay-href="杞﹂棿绠$悊/鍗曞搧杩囩珯/Cj_CollectionOfSingleProductDefects.html">宸ュ簭鍗曞搧涓嶈壇閲囬泦</a></dd>-->
                                         <dd><a lay-href="杞﹂棿绠$悊/鍗曞搧杩囩珯/Cj_ProcessItemBGA.html">宸ュ簭鍗曞搧杩斾慨鍙�</a></dd>
-                                        <dd><a lay-href="杞﹂棿绠$悊/鍗曞搧杩囩珯/Cj_ProcessItemBGA_PJGH.html">宸ュ簭鍗曞搧杩斾慨鍙�(閰嶄欢鏇存崲)</a></dd>
+                                        <!--<dd><a lay-href="杞﹂棿绠$悊/鍗曞搧杩囩珯/Cj_ProcessItemBGA_PJGH.html">宸ュ簭鍗曞搧杩斾慨鍙�(閰嶄欢鏇存崲)</a></dd>-->
+                                        <dd><a lay-href="杞﹂棿绠$悊/鍗曞搧杩囩珯/Sc_SourceLineRepairBillList.html">杩斾慨璁板綍鍒楄〃</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/鍗曞搧杩囩珯/RetrospectiveQueryReport.html">鍚堟牸杩芥函鏌ヨ鎶ヨ〃</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/鍗曞搧杩囩珯/BadQueryReport.html">涓嶈壇杩芥函鏌ヨ鎶ヨ〃</a></dd>
                                     </dl>
                                 </dd>
                             </dl>
@@ -814,7 +817,7 @@
                                         <dd><a lay-href="璁惧绠$悊/璁惧鍏ュ簱妫�楠岄獙鏀跺崟/Sb_EquipStockInCheckBillList.html">璁惧鍏ュ簱妫�楠岄獙鏀跺崟缁存姢</a></dd>
                                         <dd><a lay-href="璁惧绠$悊/璁惧鎶曚骇妫�楠岄獙鏀跺崟/Sb_EquipWorkBeforeCheckBillEdit.html">璁惧鎶曚骇妫�楠岄獙鏀跺崟</a></dd>
                                         <dd><a lay-href="璁惧绠$悊/璁惧鎶曚骇妫�楠岄獙鏀跺崟/Sb_EquipWorkBeforeCheckBillList.html">璁惧鎶曚骇妫�楠岄獙鏀跺崟缁存姢</a></dd>
-                                    </dl>       
+                                    </dl>
                                 </dd>
                                 <dd>
                                     <a>缁翠慨绠$悊</a>
@@ -942,6 +945,19 @@
                                 </dd>
                             </dl>
                         </li>
+                        <!--搴旀敹绠$悊-->
+                        <li data-name="set" class="layui-nav-item">
+                            <a><i class="layui-icon layui-icon-rmb"></i><cite>搴旀敹绠$悊</cite></a>
+                            <dl class="layui-nav-child">
+                                <dd>
+                                    <a>搴旀敹鎶ヨ〃</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="搴旀敹绠$悊/鎶ヨ〃鍒嗘瀽/YS_CusShouldIncomeReport.html">瀹㈡埛搴旀敹璐︽鍒嗘瀽鎶ヨ〃</a></dd>
+                                        <dd><a lay-href="搴旀敹绠$悊/鎶ヨ〃鍒嗘瀽/YS_CusShouldIncomeEntryReport.html">瀹㈡埛搴旀敹璐︽鏄庣粏鍒嗘瀽鎶ヨ〃</a></dd>
+                                    </dl>
+                                </dd>
+                            </dl>
+                        </li>
                         <!--鍙鍖栫湅鏉�-->
                         <li data-name="template" class="layui-nav-item">
                             <a href="javascript:;" lay-tips="鍙鍖栫湅鏉�" lay-direction="2">
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index 3d96b98..896cd9f 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -421,10 +421,6 @@
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               閿�鍞嚭搴�
                           </a>
-                          <a href="WMS鎵爜妯″潡/閿�鍞嚭搴�/Kf_SellOutBill_QiaoYi_PDA.html" target="main_self_frame" style="color: aqua;">
-                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                              閿�鍞嚭搴撯�斾箶涓�
-                          </a>
                           <a href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Check_New.html" target="main_self_frame" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               閿�鍞嚭搴撴牎楠�
@@ -687,12 +683,6 @@
                           <a lay-href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_FastList.html" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               閿�鍞嚭搴撶紦瀛樺垪琛�
-                          </a>
-                      </dd>
-                      <dd>
-                          <a lay-href="WMS鎵爜妯″潡/閿�鍞嚭搴�/Kf_SellOutBillList_QiaoYi_PDA.html" style="color: aqua;">
-                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                              閿�鍞嚭搴撶紦瀛樺垪琛ㄢ�斾箶涓�
                           </a>
                       </dd>
                       <dd>
diff --git a/WebTM/views/index_Mobile_QiaoYi.html b/WebTM/views/index_Mobile_QiaoYi.html
index 3fa152e..d210a59 100644
--- a/WebTM/views/index_Mobile_QiaoYi.html
+++ b/WebTM/views/index_Mobile_QiaoYi.html
@@ -85,84 +85,6 @@
                                 <cite>杞﹂棿绠$悊</cite>
                             </a>
                             <dl class="layui-nav-child">
-                                <!--<dd>
-                <a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆/MES_StationInBill_PDA_OLD.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    宸ュ簭杩涚珯鎺ユ敹鍗�
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="杞﹂棿绠$悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Sc_StationInBill_Mul_PDA.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    宸ュ簭杩涚珯鎺ユ敹鍗曟壒閲�
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA_OLD.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    宸ュ簭鍑虹珯姹囨姤鍗�
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Sc_StationOutBill_Mul_PDA.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    宸ュ簭鍑虹珯姹囨姤鍗曟壒閲�
-                </a>
-            </dd>-->
-                                <!--<dd>
-                <a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill_PDA.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    宸ュ簭濮斿鍙戝嚭鍗�
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill_Mul_PDA.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    宸ュ簭濮斿鍙戝嚭鍗曟壒閲�
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鎺ユ敹鍗�/Cj_StationEntrustOutBill_PDA.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    宸ュ簭濮斿鎺ユ敹鍗�
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鎺ユ敹鍗�/Cj_StationEntrustOutBill_Mul_PDA.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    宸ュ簭濮斿鎺ユ敹鍗曟壒閲�
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportOverList.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    宸ュ簭姹囨姤鍏ュ簱鍒楄〃
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="缁勮鍗�/Sc_PCruxBindingPDA.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    浜х嚎鍏抽敭浠剁粦瀹�
-                </a>
-            </dd>-->
-                                <!--<dd>
-                <a lay-href="" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    宸ュ簭姹囨姤鍗昻ull
-                </a>
-            </dd>-->
-                                <!--<dd>
-                <a lay-href="" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    濮斿宸ュ簭璁″垝杞嚭鍗昻ull
-                </a>
-            </dd>-->
-                                <!--<dd>
-                <a lay-href="" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    濮斿宸ュ簭璁″垝姹囨姤鍗昻ull
-                </a>
-            </dd>-->
                                 <dd>
                                     <a href="杞﹂棿绠$悊/宸ュ簭娴佽浆/MES_StationInBill_PDA_QiaoYi.html?type=jzd" target="main_self_frame" style="color: aqua;">
                                         <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
@@ -215,129 +137,6 @@
                                 </dd>
                             </dl>
                         </li>
-                        <!-- 妯℃不鍏风鐞� -->
-                        <!--<li data-name="set" class="layui-nav-item">
-        <a style="padding-left:20px;">
-            <img src="../layuiadmin/myicon/杞﹂棿绠$悊.svg" alt="杞﹂棿绠$悊" style="width:25px;height:25px;margin-right: 5px;" />
-            <cite>妯℃不鍏风鐞�</cite>
-        </a>
-        <dl class="layui-nav-child">
-            <dd>
-                <a lay-href="妯℃不鍏风鐞�/妯℃不鍏风偣妫�淇濆吇/Sc_MouldDotCheckBill_PDA.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    妯℃不鍏风偣妫�璁板綍鍗�
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="妯℃不鍏风鐞�/妯℃不鍏风偣妫�淇濆吇/Sc_MouldMaintainBill_PDA.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    妯℃不鍏蜂繚鍏昏褰曞崟
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="妯℃不鍏风鐞�/妯″叿缁翠慨璁板綍鍗�/Sc_MouldRepairWorkBill_PDA.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    妯℃不鍏风淮淇褰曞崟
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="妯℃不鍏风鐞�/妯″叿瀵垮懡璋冩暣鍗�/Sc_MouldLifeChangeBill_PDA.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    妯℃不鍏峰鍛借皟鏁村崟
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="妯℃不鍏风鐞�/妯″叿鐢熶骇棰嗙敤鍗�/Sc_MouldProdOutBill_PDA.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    妯″叿鐢熶骇棰嗙敤鍗�
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="妯℃不鍏风鐞�/妯″叿鐢熶骇閫�搴撳崟/Sc_MouldProdBackBill_PDA.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    妯″叿鐢熶骇閫�搴撳崟
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="妯℃不鍏风鐞�/妯″叿澶勭悊鍑哄簱鍗�/Sc_MouldScrapOutBill_PDA.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    妯℃不鍏峰鐞嗗嚭搴撳崟
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="妯℃不鍏风鐞�/妯″叿鎶ュ簾鍏ュ簱鍗�/Sc_MouldScrapInBill_PDA.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    妯″叿鎶ュ簾鍏ュ簱鍗�
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="妯℃不鍏风鐞�/妯″叿鍏朵粬鍏ュ簱鍗�/Sc_MouldOtherInBill_PDA.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    妯℃不鍏峰叾浠栧叆搴撳崟
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="妯℃不鍏风鐞�/妯″叿鍏朵粬鍑哄簱鍗�/Sc_MouldOtherOutBill_PDA.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    妯℃不鍏峰叾浠栧嚭搴撳崟
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="妯℃不鍏风鐞�/妯″叿鐢熶骇棰嗙敤鍗�/Sc_MouldProdOutBill_PDA.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    妯″叿鐢熶骇棰嗙敤鍗�
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="妯℃不鍏风鐞�/妯″叿鐢熶骇閫�搴撳崟/Sc_MouldProdBackBill_PDA.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    妯″叿鐢熶骇閫�搴撳崟
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="妯℃不鍏风鐞�/妯″叿澶勭悊鍑哄簱鍗�/Sc_MouldScrapOutBill_PDA.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    妯″叿澶勭悊鍑哄簱鍗�
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="妯℃不鍏风鐞�/妯″叿鏀瑰埗鍏ュ簱鍗�/Sc_MouldRepairInBill_PDA.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    妯″叿鏀瑰埗鍏ュ簱鍗�
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="妯℃不鍏风鐞�/妯″叿鏀瑰埗鍑哄簱鍗�/Sc_MouldRepairOutBill_PDA.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    妯″叿鏀瑰埗鍑哄簱鍗�
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="妯℃不鍏风鐞�/妯″叿閲囪喘鍏ュ簱鍗�/Sc_MouldProdInBill_PDA.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    妯″叿閲囪喘鍏ュ簱鍗�
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="妯℃不鍏风鐞�/璁惧淇濆吇璁板綍鍗�/Sb_EquipMaintainBill_PDA.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    璁惧淇濆吇璁板綍鍗�
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="妯℃不鍏风鐞�/璁惧缁翠慨璁板綍鍗�/Sb_EquipRepairWorkBill_PDA.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    璁惧缁翠慨璁板綍鍗�
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="妯℃不鍏风鐞�/璁惧鐐规璁板綍鍗�/Sb_EquipDotCheckBill_PDA.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    璁惧鐐规璁板綍鍗�
-                </a>
-            </dd>
-        </dl>
-    </li>-->
                         <!-- 浠撳偍鏉$爜绠$悊 -->
                         <li data-name="set" class="layui-nav-item">
                             <a style="padding-left:20px;">
@@ -345,86 +144,24 @@
                                 <cite>浠撳偍鏉$爜绠$悊</cite>
                             </a>
                             <dl class="layui-nav-child">
-                                <!--<dd>
-        <a href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html" target="main_self_frame" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            閲囪喘鍏ュ簱
-        </a>
-    </dd>
-    <dd>
-        <a href="楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_Fast.html" target="main_self_frame" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            濮斿鍏ュ簱
-        </a>
-    </dd>
-    <dd>
-        <a href="楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_Fast.html" target="main_self_frame" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            鐢熶骇鍏ュ簱
-        </a>
-    </dd>-->
                                 <dd>
                                     <a href="楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_Fast.html" target="main_self_frame" style="color: aqua;">
                                         <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                                         鍏朵粬鍏ュ簱
                                     </a>
                                 </dd>
-                                <!--<dd>
-        <a href="楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBackBill_Fast.html" target="main_self_frame" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            鍏朵粬鍏ュ簱锛堢孩瀛楋級
-        </a>
-    </dd>-->
-                                <!--<dd>
-        <a href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_Fast.html" target="main_self_frame" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            鐢熶骇棰嗘枡
-        </a>
-    </dd>
-    <dd>
-        <a href="棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_Fast.html" target="main_self_frame" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            濮斿棰嗘枡
-        </a>
-    </dd>
-    <dd>
-        <a href="棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_Check_New.html" target="main_self_frame" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            濮斿棰嗘枡鏍¢獙
-        </a>
-    </dd>
-    <dd>
-        <a href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html" target="main_self_frame" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            閿�鍞嚭搴�
-        </a>
-        <a href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Check_New.html" target="main_self_frame" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            閿�鍞嚭搴撴牎楠�
-        </a>
-    </dd>-->
+                                <dd>
+                                    <a href="WMS鎵爜妯″潡/閿�鍞嚭搴�/Kf_SellOutBill_QiaoYi_PDA.html" target="main_self_frame" style="color: aqua;">
+                                        <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                                        閿�鍞嚭搴�
+                                    </a>
+                                </dd>
                                 <dd>
                                     <a href="棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_Fast.html" target="main_self_frame" style="color: aqua;">
                                         <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                                         鍏朵粬鍑哄簱
                                     </a>
-                                    <!--<a href="棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_Check.html" target="main_self_frame" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            鍏朵粬鍑哄簱鏍¢獙
-        </a>-->
                                 </dd>
-                                <!--<dd>
-        <a href="棰嗘枡鍙戣揣/鐢熶骇琛ユ枡/Kf_MateReplenishOutBill_Check_New.html" target="main_self_frame" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            鐢熶骇琛ユ枡鏍¢獙
-        </a>
-    </dd>
-    <dd>
-        <a href="棰嗘枡鍙戣揣/濮斿琛ユ枡/Kf_EntrustReplenishOutBill_Check_New.html" target="main_self_frame" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            濮斿琛ユ枡鏍¢獙
-        </a>
-    </dd>-->
                                 <dd>
                                     <a href="浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html" target="main_self_frame" style="color: aqua;">
                                         <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
@@ -437,113 +174,7 @@
                                         鏉$爜鏌ヨ
                                     </a>
                                 </dd>
-                                <!--<dd>
-        <a href="" target="main_self_frame" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            鍒嗘寮忚皟鍏
-        </a>
-    </dd>-->
-                                <!--<dd>
-        <a href="浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockOutBill_Fast.html" target="main_self_frame" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            鍒嗘寮忚皟鍑�
-        </a>
-    </dd>
-    <dd>
-        <a href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBackBill.html" target="main_self_frame" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            閲囪喘閫�鏂�
-        </a>
-    </dd>
-    <dd>
-        <a href="楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBackBill.html" target="main_self_frame" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            鐢熶骇閫�搴�
-        </a>
-    </dd>
-    <dd>
-        <a href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBill_Fast.html" target="main_self_frame" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            鐢熶骇閫�鏂�
-        </a>
-    </dd>-->
-                                <!--<dd>
-        <a href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBackBill_Fast.html" target="main_self_frame" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            閿�鍞��璐�
-        </a>
-    </dd>
-    <dd>
-        <a href="棰嗘枡鍙戣揣/鏀舵枡鍏ュ簱/Kf_ReciveBill_Fast.html" target="main_self_frame" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            鍒拌揣纭
-        </a>
-    </dd>
-    <dd>
-        <a href="鐢熶骇绠$悊/鐢熶骇瑁呯鍗�/Sc_PackUnionBill_Fast.html" target="main_self_frame" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            鐢熶骇瑁呯鍗�
-        </a>
-    </dd>
-    <dd>
-        <a href="鐢熶骇绠$悊/鐢熶骇鎷嗙鍗�/Sc_PackSplitBill_Fast.html" target="main_self_frame" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            鐢熶骇鎷嗙鍗�
-        </a>
-    </dd>
-    <dd>
-        <a href="鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNew.html" target="main_self_frame" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            鐢熶骇姹囨姤鍗�
-        </a>
-    </dd>-->
-                                <!--<dd>
-        <a href="" target="main_self_frame" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            鏉$爜鏌ヨn
-        </a>
-    </dd>-->
-                                <!--<dd>
-        <a href="浠撳瓨绠$悊/鏉$爜搴撳瓨/KF_ICInventoryByMaterID.html" target="main_self_frame" style="color: aqua;">
-            <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-            搴撳瓨鏌ヨ
-        </a>
-    </dd>-->
                             </dl>
-                        </li>
-                        <!-- 璁惧绠$悊 -->
-                        <!--<li data-name="set" class="layui-nav-item">
-        <a style="padding-left:20px;">
-            <img src="../layuiadmin/myicon/杞﹂棿绠$悊.svg" alt="杞﹂棿绠$悊" style="width:25px;height:25px;margin-right: 5px;" />
-            <cite>璁惧绠$悊</cite>
-        </a>
-        <dl class="layui-nav-child">
-            <dd>
-                <a lay-href="璁惧绠$悊/Sb_EquipDotCheckBillList_PDA.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    璁惧鐐规璁板綍鍗�
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="璁惧绠$悊/Sb_EquipMaintainBillList_PDA.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    璁惧淇濆吇璁板綍鍗�
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="璁惧绠$悊/Sb_EquipMaintainBillList_Mul.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    璁惧淇濆吇璁板綍鍗昣Mul
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="璁惧绠$悊/Sb_EqpMaintenanceBillList_PDA.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    璁惧缁翠慨璁板綍鍗�
-                </a>
-            </dd>
-        </dl>
-    </li>-->
                         <!-- 缂撳瓨鍒楄〃 -->
                         <li data-name="set" class="layui-nav-item">
                             <a style="padding-left:20px;">
@@ -551,36 +182,6 @@
                                 <cite>缂撳瓨鍒楄〃</cite>
                             </a>
                             <dl class="layui-nav-child">
-                                <!--<dd>
-                <a lay-href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_FastList.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    閲囪喘鍏ュ簱缂撳瓨鍒楄〃
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_FastList.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    鐢熶骇棰嗘枡缂撳瓨鍒楄〃
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_FastList.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    鐢熶骇鍏ュ簱缂撳瓨鍒楄〃
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_FastList.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    閿�鍞嚭搴撶紦瀛樺垪琛�
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_CheckList_New.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    閿�鍞嚭搴撴牎楠岀紦瀛樺垪琛�
-                </a>
-            </dd>-->
                                 <dd>
                                     <a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillQuery_Mobile.html" style="color: aqua;">
                                         <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
@@ -594,89 +195,23 @@
                                     </a>
                                 </dd>
                                 <dd>
+                                    <a lay-href="WMS鎵爜妯″潡/閿�鍞嚭搴�/Kf_SellOutBillList_QiaoYi_PDA.html" style="color: aqua;">
+                                        <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                                        閿�鍞嚭搴撶紦瀛樺垪琛�
+                                    </a>
+                                </dd>
+                                <dd>
                                     <a lay-href="棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_FastList.html" style="color: aqua;">
                                         <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                                         鍏朵粬鍑哄簱缂撳瓨鍒楄〃
                                     </a>
                                 </dd>
-                                <!--<dd>
-                <a lay-href="楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_FastList.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    濮斿鍏ュ簱缂撳瓨鍒楄〃
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="楠屾敹鍏ュ簱/濮斿鍑哄簱/Kf_EntrustOutBill_FastList.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    濮斿棰嗘枡缂撳瓨鍒楄〃
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_CheckList_New.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    濮斿棰嗘枡鏍¢獙缂撳瓨鍒楄〃
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="棰嗘枡鍙戣揣/鐢熶骇琛ユ枡/Kf_MateReplenishOutBill_CheckList_New.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    鐢熶骇琛ユ枡鏍¢獙缂撳瓨鍒楄〃
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="棰嗘枡鍙戣揣/濮斿琛ユ枡/Kf_EntrustReplenishOutBill_CheckList_New.html" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    濮斿琛ユ枡鏍¢獙缂撳瓨鍒楄〃
-                </a>
-            </dd>-->
                                 <dd>
                                     <a lay-href="浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBill_FastList.html" style="color: aqua;">
                                         <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                                         鐩存帴璋冩嫧缂撳瓨鍒楄〃
                                     </a>
                                 </dd>
-                                <!--<dd>
-                <a lay-href="" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    鍒嗘寮忚皟鍑虹紦瀛樺垪琛╪ull
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    鍒嗘寮忚皟鍏ョ紦瀛樺垪琛╪ull
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    閲囪喘閫�鏂欑紦瀛樺垪琛╪ull
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    鐢熶骇閫�搴撶紦瀛樺垪琛╪ull
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    鐢熶骇閫�鏂欑紦瀛樺垪琛╪ull
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    閿�鍞��璐х紦瀛樺垪琛╪ull
-                </a>
-            </dd>
-            <dd>
-                <a lay-href="" style="color: aqua;">
-                    <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                    鍒拌揣鐐规暟缂撳瓨鍒楄〃null
-                </a>
-            </dd>-->
                             </dl>
                         </li>
                         <!-- 绯荤粺绠$悊 -->
diff --git a/WebTM/views/index_QiaoYi.html b/WebTM/views/index_QiaoYi.html
index d035487..cac44c6 100644
--- a/WebTM/views/index_QiaoYi.html
+++ b/WebTM/views/index_QiaoYi.html
@@ -607,6 +607,13 @@
                                         <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇璁㈠崟鍙樻洿鍗�/Sc_ICMOChangeBillList.html">鐢熶骇璁㈠崟鍙樻洿鍗曠淮鎶�</a></dd>
                                     </dl>
                                 </dd>
+                                <dd>
+                                    <a>鎶ヨ〃鍒嗘瀽</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="搴旀敹绠$悊/鎶ヨ〃鍒嗘瀽/YS_CusShouldIncomeReport.html">瀹㈡埛搴旀敹璐︽鍒嗘瀽鎶ヨ〃</a></dd>
+                                        <dd><a lay-href="搴旀敹绠$悊/鎶ヨ〃鍒嗘瀽/YS_CusShouldIncomeEntryReport.html">瀹㈡埛搴旀敹璐︽鏄庣粏鍒嗘瀽鎶ヨ〃</a></dd>
+                                    </dl>
+                                </dd>
                             </dl>
                         </li>
 
diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html
index c8a0d38..71db7ca 100644
--- a/WebTM/views/user/login.html
+++ b/WebTM/views/user/login.html
@@ -1,60 +1,222 @@
-锘�
-
+锘�<!--
+    Last modified: 2022-06-25 18:40:11
+    Url: https://www.axui.cn
+-->
 <!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 href="../../layuiadmin/ax/ax-response.css" rel="stylesheet" />
+    <link href="../../layuiadmin/ax/ax.css" rel="stylesheet" />
+    <link href="../../layuiadmin/ax/main.css" rel="stylesheet" />
+
     <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
     <link rel="stylesheet" href="../../layuiadmin/style/login.css" media="all">
-    <style>
-        .layadmin-user-login-body .layui-form-item .layui-input {
-            color: blue;
-        }
-    </style>
 </head>
-<body>
-    <!--<audio id="cs" hidden controls>
-        <source src="../video/jingbao.wav" type="audio/ogg">
-    </audio>-->
-    <div class="layadmin-user-login layadmin-user-display-show" id="LAY-user-login" style="display: none;">
-        <div class="layadmin-user-login-main" style="margin: -5.8% auto;">
-            <div class="layadmin-user-login-box layadmin-user-login-header">
-                <h2 style="color:white;">L-MES</h2>
-                <p style="color: white;">鏅轰簯LMES绠$悊绯荤粺</p>
-            </div>
-            <div class="layadmin-user-login-box layadmin-user-login-body layui-form">
-                <div class="layui-form-item">
-                    <select name="Organization" id="Organization" lay-verify="required" lay-search class="layui-input">
-                        <!--鍔ㄦ�佹覆鏌撶粍缁�-->
-                    </select>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layadmin-user-login-icon layui-icon layui-icon-username login-input" for="LAY-user-login-password"></label>
-                    <input type="text" name="username" id="LAY-user-login-username" lay-verify="required" placeholder="鐢ㄦ埛鍚�" class="layui-input" style="background-color:transparent;color:white" autocomplete="off">
-                </div>
-                <div class="layui-form-item">
-                    <label class="layadmin-user-login-icon layui-icon layui-icon-password login-input" for="LAY-user-login-password"></label>
-                    <input type="password" name="password" id="LAY-user-login-password" lay-verify="required" placeholder="瀵嗙爜" class="layui-input" style="background-color:transparent;color:white" autocomplete="off">
-                </div>
-                <div class="layui-form-item">
-                    <!--<input type="button" onclick="playSound('wavFileId');" value="play" />-->
-                    <button type="button" lay-submit="" class="layui-btn layui-btn-fluid" id="LAY-user-login-submit" name="LAY-user-login-submit" lay-filter="LAY-user-login-submit">鐧� 鍏�</button>
 
-                    <!--<button type="button" lay-submit="" class="layui-btn layui-btn-fluid" id="LAY-user-login-yp" name="LAY-user-login-yp" lay-filter="LAY-user-login-yp">闊抽</button>-->
+<body class="ax-align-origin">
+
+
+    <div class="login ax-shadow-cloud ax-radius-md">
+        <div class="ax-row ax-radius-md ax-split">
+            <div class="ax-col ax-col-14 ax-radius-left ax-radius-md cover"></div>
+            <div class="ax-col ax-col-10">
+                <div class="core">
+
+                    <div class="ax-break"></div>
+
+                    <div class="ax-tab" axTab>
+
+                        <ul class="ax-row ax-tab-nav ax-menu-tab">
+                            <a href="###" class="ax-item ax-col" style="font-size: 20px;">鏅轰簯杩堟�滾-MES</a>
+                            <!--<a href="###" class="ax-item">娉ㄥ唽鏂扮敤鎴�</a>-->
+                            <!--<li class="ax-col"></li>-->
+                        </ul>
+
+                        <ul class="ax-tab-content">
+                            <li>
+                                <form>
+
+                                    <div class="ax-break"></div>
+                                    <div class="ax-break ax-hide-tel"></div>
+
+                                    <div class="ax-form-group">
+                                        <div class="ax-flex-row">
+                                            <div class="ax-form-con">
+                                                <div class="ax-form-input">
+                                                    <select name="Organization" id="Organization" lay-verify="required" lay-search class="layui-input">
+                                                        <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                    </select>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="ax-break-md"></div>
+
+                                    <div class="ax-form-group">
+                                        <div class="ax-flex-row">
+                                            <div class="ax-form-con">
+                                                <div class="ax-form-input">
+                                                <span class="ax-pos-left" style="width: 2.4rem;"><i class="ax-iconfont ax-icon-me-f"></i></span>
+                                                <input name="LAY-user-login-username" value="" placeholder="杈撳叆鐧诲綍鍚嶇О" type="text" id="LAY-user-login-username">
+                                                <span class="ax-pos-right"><a href="###" class="ax-iconfont ax-icon-close ax-val-none"></a></span></div>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="ax-break-md"></div>
+
+                                    <div class="ax-form-group">
+                                        <div class="ax-flex-row">
+                                            <div class="ax-form-con">
+                                                <div class="ax-form-input">
+                                                    <span class="ax-pos-left" style="width:2.4rem;"><i class="ax-iconfont ax-icon-lock-f"></i></span>
+                                                    <input name="LAY-user-login-password" placeholder="杈撳叆瀵嗙爜" type="password" id="LAY-user-login-password">
+                                                    <span class="ax-pos-right"><a href="###" class="ax-iconfont ax-icon-close ax-val-none"></a></span>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="ax-break-md"></div>
+
+                                    <!--<div class="ax-form-group">
+                                        <div class="ax-flex-row">
+                                            <div class="ax-form-con">
+                                                <div class="ax-form-input">
+                                                    <div class="ax-row">
+                                                        <div class="ax-flex-block">
+                                                            <span class="ax-pos-left" style="width:2.4rem;"><i class="ax-iconfont ax-icon-shield-f"></i></span>
+                                                            <input name="username" placeholder="杈撳叆楠岃瘉鐮�..." value="" type="text"><span class="ax-pos-right"><a href="###" class="ax-iconfont ax-icon-close ax-val-none"></a></span>
+                                                        </div>
+                                                        <a href="###" class="ax-form-img"><img src="../../layuiadmin/ax/images/yanzhengma.jpg"></a>
+                                                    </div>
+                                                </div>
+
+                                            </div>
+                                        </div>
+                                    </div>-->
+
+
+                                    <div class="ax-break-md"></div>
+
+                                    <!--<div class="ax-form-group">
+                                        <div class="ax-flex-row">
+                                            <div class="ax-form-con">
+                                                <div class="ax-form-input">
+                                                    <div class="ax-row">
+                                                        <div class="ax-flex-block">
+                                                            <label class="ax-checkbox"><input name="free-agree" value="0" checked="" type="checkbox"><span>璁颁綇瀵嗙爜</span></label>
+                                                        </div>
+                                                        <a href="###" class="ax-form-txt ax-color-ignore">蹇樿浜嗗瘑鐮侊紵</a>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>-->
+
+
+                                    <div class="ax-break-md"></div>
+
+                                    <div class="ax-form-group">
+                                        <div class="ax-flex-row">
+                                            <div class="ax-flex-block">
+                                                <div class="ax-form-input"><button type="button" lay-submit="" class="ax-btn ax-primary ax-full" id="LAY-user-login-submit" name="LAY-user-login-submit" lay-filter="LAY-user-login-submit">鐧诲綍</button></div>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="ax-break"></div>
+                                    <div class="ax-break ax-hide-tel"></div>
+                                    <div class="ax-break ax-hide-tel"></div>
+
+                                </form>
+                            </li>
+                            <li>
+                                <form>
+
+                                    <div class="ax-break"></div>
+                                    <div class="ax-break ax-hide-tel"></div>
+
+                                    <div class="ax-form-group">
+                                        <div class="ax-flex-row">
+                                            <div class="ax-form-con">
+                                                <div class="ax-form-input"><span class="ax-pos-left" style="width: 2.4rem;"><i class="ax-iconfont ax-icon-me-f"></i></span><input name="username" placeholder="杈撳叆鍚嶇О" type="text"><span class="ax-pos-right"><a href="###" class="ax-iconfont ax-icon-close ax-val-none"></a></span></div>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="ax-break-md"></div>
+
+                                    <div class="ax-form-group">
+                                        <div class="ax-flex-row">
+                                            <div class="ax-form-con">
+                                                <div class="ax-form-input">
+                                                    <span class="ax-pos-left" style="width:2.4rem;"><i class="ax-iconfont ax-icon-lock-f"></i></span>
+                                                    <input name="password" placeholder="杈撳叆瀵嗙爜" type="password"><span class="ax-pos-right"><a href="###" class="ax-iconfont ax-icon-close ax-val-none"></a></span>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="ax-break-md"></div>
+
+                                    <div class="ax-form-group">
+                                        <div class="ax-flex-row">
+                                            <div class="ax-form-con">
+                                                <div class="ax-form-input">
+                                                    <span class="ax-pos-left" style="width:2.4rem;"><i class="ax-iconfont ax-icon-lock-f"></i></span>
+                                                    <input name="password" placeholder="鍐嶆杈撳叆瀵嗙爜" type="password"><span class="ax-pos-right"><a href="###" class="ax-iconfont ax-icon-close ax-val-none"></a></span>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+
+
+                                    <div class="ax-break-md"></div>
+
+                                    <div class="ax-form-group">
+                                        <div class="ax-flex-row">
+                                            <div class="ax-form-con">
+                                                <div class="ax-form-input">
+                                                    <div class="ax-row">
+                                                        <div class="ax-flex-block">
+                                                            <label class="ax-checkbox"><input name="free-agree" value="0" checked="" type="checkbox"><span>娉ㄥ唽鎴愬姛鍚庣珛鍗崇櫥褰�</span></label>
+                                                        </div>
+                                                        <a href="###" class="ax-form-txt ax-color-primary">鏈夎处鍙凤紵绔嬪嵆鐧诲綍</a>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+
+
+                                    <div class="ax-break-md"></div>
+
+                                    <div class="ax-form-group">
+                                        <div class="ax-flex-row">
+                                            <div class="ax-flex-block">
+                                                <div class="ax-form-input"><button type="button" class="ax-btn ax-primary ax-full">娉ㄥ唽</button></div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="ax-break"></div>
+                                    <div class="ax-break ax-hide-tel"></div>
+                                    <div class="ax-break ax-hide-tel"></div>
+                                </form>
+                            </li>
+                        </ul>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
-
+    <script src="../../layuiadmin/ax/ax.min.js"></script>
     <script src="../../layuiadmin/layui/layui.js"></script>
     <script src="../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../layuiadmin/zgqCustom/zgqCustom.js" type="text/javascript"></script>
-
     <script>
         layui.config({
             base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -105,7 +267,7 @@
                 }
             })
             //鑾峰彇鐧诲綍椤电粍缁囧垪
-            var Organization = '<option value="0" style="color:red;">缁勭粐</option>';
+            var Organization = '';
             $.ajax({
                 type: "get",
                 url: GetWEBURL() + "/Web/GetOrganizations",
@@ -114,9 +276,9 @@
                         var data = result.data;
                         for (var i = 0; i < data.length; i++) {
                             if (i == 0)
-                                Organization += '<option  style="color:blue;"  value="' + data[i].ID + '" selected>' + data[i].Name + '</option>';
+                                Organization += '<option  "  value="' + data[i].ID + '" selected>' + data[i].Name + '</option>';
                             else
-                            Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                                Organization += '<option  " value="' + data[i].ID + '">' + data[i].Name + '</option>';
 
                         }
                         $("#Organization").append(Organization);
@@ -129,20 +291,12 @@
                 }
             })
 
-         
+
 
             //form.render();
 
             //鍒ゆ柇鐢ㄦ埛鏄Щ鍔ㄧ杩樻槸PC绔�
             var judgeMorPCflag = judgeMorPC();
-
-            if (!judgeMorPCflag) {//绉诲姩绔�
-                $("#LAY-user-login").css("background", "url('../userfiles/images/2.jpg')");
-                $("#LAY-user-login").css("background-size", "100%");
-            } else {
-                $("#LAY-user-login").css("background", "url('../userfiles/images/2.jpg')");
-                $("#LAY-user-login").css("background-size", "100%");
-            }
 
             //鎻愪氦
             form.on("submit(LAY-user-login-submit)", function (obj) {
@@ -157,8 +311,9 @@
             $('#LAY-user-login-password').on('keydown', function (e) {
                 if (e.keyCode == 13) {
                     loging();
+                    //playSound();
                 }
-            });          
+            });
             //鐢ㄦ埛鍚嶆鍥炶溅鍏夋爣绉诲埌瀵嗙爜妗�
             $('#LAY-user-login-username').on('keydown', function (e) {
                 if (e.keyCode == 13) {
@@ -203,7 +358,7 @@
                 var PassWord = $("#LAY-user-login-password").val();
                 layer.load(3);
                 $.ajax({
-                    type: "get", 
+                    type: "get",
                     url: GetWEBURL() + "/Web/GetUser",
                     data: { "UserName": UserName, "PassWord": PassWord, "HOrgName": $("#Organization").val() },
                     success: function (result) {
@@ -243,8 +398,6 @@
                             sessionStorage["login"] = "login";
                             sessionStorage["OrganizationID"] = $("#Organization").val();
                             sessionStorage["Organization"] = $("#Organization option:selected").text();
-                            sessionStorage["HManagerID"] = result.data[0].HSecManagerID;
-                            sessionStorage["HManagerName"] = result.data[0].HSecManager;
                             //sessionStorage["IP"] = System.Configuration.ConfigurationSettings.AppSettings("name");
                             if (!judgeMorPCflag) {//绉诲姩绔�
                                 window.location.href = '../../views/index_Mobile.html'
@@ -273,9 +426,10 @@
                     $("body").append('<audio id="cs" hidden controls> <source src = "../video/jingbao.wav" type = "audio/ogg"> </audio >');
                 var audio = document.getElementById("cs");
                 audio.play();
-            }          
+            }
 
         });
     </script>
 </body>
+
 </html>
\ No newline at end of file
diff --git a/WebTM/views/user/login2.html b/WebTM/views/user/login2.html
index f449051..c8a0d38 100644
--- a/WebTM/views/user/login2.html
+++ b/WebTM/views/user/login2.html
@@ -1,222 +1,60 @@
-锘�<!--
-    Last modified: 2022-06-25 18:40:11
-    Url: https://www.axui.cn
--->
+锘�
+
 <!DOCTYPE html>
 <html>
 <head>
+    <meta charset="utf-8">
     <title>鐧诲叆</title>
-    <link href="../../layuiadmin/ax/ax-response.css" rel="stylesheet" />
-    <link href="../../layuiadmin/ax/ax.css" rel="stylesheet" />
-    <link href="../../layuiadmin/ax/main.css" rel="stylesheet" />
-
+    <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">
     <link rel="stylesheet" href="../../layuiadmin/style/login.css" media="all">
+    <style>
+        .layadmin-user-login-body .layui-form-item .layui-input {
+            color: blue;
+        }
+    </style>
 </head>
+<body>
+    <!--<audio id="cs" hidden controls>
+        <source src="../video/jingbao.wav" type="audio/ogg">
+    </audio>-->
+    <div class="layadmin-user-login layadmin-user-display-show" id="LAY-user-login" style="display: none;">
+        <div class="layadmin-user-login-main" style="margin: -5.8% auto;">
+            <div class="layadmin-user-login-box layadmin-user-login-header">
+                <h2 style="color:white;">L-MES</h2>
+                <p style="color: white;">鏅轰簯LMES绠$悊绯荤粺</p>
+            </div>
+            <div class="layadmin-user-login-box layadmin-user-login-body layui-form">
+                <div class="layui-form-item">
+                    <select name="Organization" id="Organization" lay-verify="required" lay-search class="layui-input">
+                        <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                    </select>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layadmin-user-login-icon layui-icon layui-icon-username login-input" for="LAY-user-login-password"></label>
+                    <input type="text" name="username" id="LAY-user-login-username" lay-verify="required" placeholder="鐢ㄦ埛鍚�" class="layui-input" style="background-color:transparent;color:white" autocomplete="off">
+                </div>
+                <div class="layui-form-item">
+                    <label class="layadmin-user-login-icon layui-icon layui-icon-password login-input" for="LAY-user-login-password"></label>
+                    <input type="password" name="password" id="LAY-user-login-password" lay-verify="required" placeholder="瀵嗙爜" class="layui-input" style="background-color:transparent;color:white" autocomplete="off">
+                </div>
+                <div class="layui-form-item">
+                    <!--<input type="button" onclick="playSound('wavFileId');" value="play" />-->
+                    <button type="button" lay-submit="" class="layui-btn layui-btn-fluid" id="LAY-user-login-submit" name="LAY-user-login-submit" lay-filter="LAY-user-login-submit">鐧� 鍏�</button>
 
-<body class="ax-align-origin">
-
-
-    <div class="login ax-shadow-cloud ax-radius-md">
-        <div class="ax-row ax-radius-md ax-split">
-            <div class="ax-col ax-col-14 ax-radius-left ax-radius-md cover"></div>
-            <div class="ax-col ax-col-10">
-                <div class="core">
-
-                    <div class="ax-break"></div>
-
-                    <div class="ax-tab" axTab>
-
-                        <ul class="ax-row ax-tab-nav ax-menu-tab">
-                            <a href="###" class="ax-item ax-col" style="font-size: 20px;">鏅轰簯杩堟�滾-MES</a>
-                            <!--<a href="###" class="ax-item">娉ㄥ唽鏂扮敤鎴�</a>-->
-                            <!--<li class="ax-col"></li>-->
-                        </ul>
-
-                        <ul class="ax-tab-content">
-                            <li>
-                                <form>
-
-                                    <div class="ax-break"></div>
-                                    <div class="ax-break ax-hide-tel"></div>
-
-                                    <div class="ax-form-group">
-                                        <div class="ax-flex-row">
-                                            <div class="ax-form-con">
-                                                <div class="ax-form-input">
-                                                    <select name="Organization" id="Organization" lay-verify="required" lay-search class="layui-input">
-                                                        <!--鍔ㄦ�佹覆鏌撶粍缁�-->
-                                                    </select>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-
-                                    <div class="ax-break-md"></div>
-
-                                    <div class="ax-form-group">
-                                        <div class="ax-flex-row">
-                                            <div class="ax-form-con">
-                                                <div class="ax-form-input">
-                                                <span class="ax-pos-left" style="width: 2.4rem;"><i class="ax-iconfont ax-icon-me-f"></i></span>
-                                                <input name="LAY-user-login-username" value="" placeholder="杈撳叆鐧诲綍鍚嶇О" type="text" id="LAY-user-login-username">
-                                                <span class="ax-pos-right"><a href="###" class="ax-iconfont ax-icon-close ax-val-none"></a></span></div>
-                                            </div>
-                                        </div>
-                                    </div>
-
-                                    <div class="ax-break-md"></div>
-
-                                    <div class="ax-form-group">
-                                        <div class="ax-flex-row">
-                                            <div class="ax-form-con">
-                                                <div class="ax-form-input">
-                                                    <span class="ax-pos-left" style="width:2.4rem;"><i class="ax-iconfont ax-icon-lock-f"></i></span>
-                                                    <input name="LAY-user-login-password" placeholder="杈撳叆瀵嗙爜" type="password" id="LAY-user-login-password">
-                                                    <span class="ax-pos-right"><a href="###" class="ax-iconfont ax-icon-close ax-val-none"></a></span>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-
-                                    <div class="ax-break-md"></div>
-
-                                    <!--<div class="ax-form-group">
-                                        <div class="ax-flex-row">
-                                            <div class="ax-form-con">
-                                                <div class="ax-form-input">
-                                                    <div class="ax-row">
-                                                        <div class="ax-flex-block">
-                                                            <span class="ax-pos-left" style="width:2.4rem;"><i class="ax-iconfont ax-icon-shield-f"></i></span>
-                                                            <input name="username" placeholder="杈撳叆楠岃瘉鐮�..." value="" type="text"><span class="ax-pos-right"><a href="###" class="ax-iconfont ax-icon-close ax-val-none"></a></span>
-                                                        </div>
-                                                        <a href="###" class="ax-form-img"><img src="../../layuiadmin/ax/images/yanzhengma.jpg"></a>
-                                                    </div>
-                                                </div>
-
-                                            </div>
-                                        </div>
-                                    </div>-->
-
-
-                                    <div class="ax-break-md"></div>
-
-                                    <!--<div class="ax-form-group">
-                                        <div class="ax-flex-row">
-                                            <div class="ax-form-con">
-                                                <div class="ax-form-input">
-                                                    <div class="ax-row">
-                                                        <div class="ax-flex-block">
-                                                            <label class="ax-checkbox"><input name="free-agree" value="0" checked="" type="checkbox"><span>璁颁綇瀵嗙爜</span></label>
-                                                        </div>
-                                                        <a href="###" class="ax-form-txt ax-color-ignore">蹇樿浜嗗瘑鐮侊紵</a>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>-->
-
-
-                                    <div class="ax-break-md"></div>
-
-                                    <div class="ax-form-group">
-                                        <div class="ax-flex-row">
-                                            <div class="ax-flex-block">
-                                                <div class="ax-form-input"><button type="button" lay-submit="" class="ax-btn ax-primary ax-full" id="LAY-user-login-submit" name="LAY-user-login-submit" lay-filter="LAY-user-login-submit">鐧诲綍</button></div>
-                                            </div>
-                                        </div>
-                                    </div>
-
-                                    <div class="ax-break"></div>
-                                    <div class="ax-break ax-hide-tel"></div>
-                                    <div class="ax-break ax-hide-tel"></div>
-
-                                </form>
-                            </li>
-                            <li>
-                                <form>
-
-                                    <div class="ax-break"></div>
-                                    <div class="ax-break ax-hide-tel"></div>
-
-                                    <div class="ax-form-group">
-                                        <div class="ax-flex-row">
-                                            <div class="ax-form-con">
-                                                <div class="ax-form-input"><span class="ax-pos-left" style="width: 2.4rem;"><i class="ax-iconfont ax-icon-me-f"></i></span><input name="username" placeholder="杈撳叆鍚嶇О" type="text"><span class="ax-pos-right"><a href="###" class="ax-iconfont ax-icon-close ax-val-none"></a></span></div>
-                                            </div>
-                                        </div>
-                                    </div>
-
-                                    <div class="ax-break-md"></div>
-
-                                    <div class="ax-form-group">
-                                        <div class="ax-flex-row">
-                                            <div class="ax-form-con">
-                                                <div class="ax-form-input">
-                                                    <span class="ax-pos-left" style="width:2.4rem;"><i class="ax-iconfont ax-icon-lock-f"></i></span>
-                                                    <input name="password" placeholder="杈撳叆瀵嗙爜" type="password"><span class="ax-pos-right"><a href="###" class="ax-iconfont ax-icon-close ax-val-none"></a></span>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-
-                                    <div class="ax-break-md"></div>
-
-                                    <div class="ax-form-group">
-                                        <div class="ax-flex-row">
-                                            <div class="ax-form-con">
-                                                <div class="ax-form-input">
-                                                    <span class="ax-pos-left" style="width:2.4rem;"><i class="ax-iconfont ax-icon-lock-f"></i></span>
-                                                    <input name="password" placeholder="鍐嶆杈撳叆瀵嗙爜" type="password"><span class="ax-pos-right"><a href="###" class="ax-iconfont ax-icon-close ax-val-none"></a></span>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-
-
-                                    <div class="ax-break-md"></div>
-
-                                    <div class="ax-form-group">
-                                        <div class="ax-flex-row">
-                                            <div class="ax-form-con">
-                                                <div class="ax-form-input">
-                                                    <div class="ax-row">
-                                                        <div class="ax-flex-block">
-                                                            <label class="ax-checkbox"><input name="free-agree" value="0" checked="" type="checkbox"><span>娉ㄥ唽鎴愬姛鍚庣珛鍗崇櫥褰�</span></label>
-                                                        </div>
-                                                        <a href="###" class="ax-form-txt ax-color-primary">鏈夎处鍙凤紵绔嬪嵆鐧诲綍</a>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-
-
-                                    <div class="ax-break-md"></div>
-
-                                    <div class="ax-form-group">
-                                        <div class="ax-flex-row">
-                                            <div class="ax-flex-block">
-                                                <div class="ax-form-input"><button type="button" class="ax-btn ax-primary ax-full">娉ㄥ唽</button></div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="ax-break"></div>
-                                    <div class="ax-break ax-hide-tel"></div>
-                                    <div class="ax-break ax-hide-tel"></div>
-                                </form>
-                            </li>
-                        </ul>
-                    </div>
+                    <!--<button type="button" lay-submit="" class="layui-btn layui-btn-fluid" id="LAY-user-login-yp" name="LAY-user-login-yp" lay-filter="LAY-user-login-yp">闊抽</button>-->
                 </div>
             </div>
         </div>
     </div>
-    <script src="../../layuiadmin/ax/ax.min.js"></script>
+
     <script src="../../layuiadmin/layui/layui.js"></script>
     <script src="../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../layuiadmin/zgqCustom/zgqCustom.js" type="text/javascript"></script>
+
     <script>
         layui.config({
             base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -267,7 +105,7 @@
                 }
             })
             //鑾峰彇鐧诲綍椤电粍缁囧垪
-            var Organization = '';
+            var Organization = '<option value="0" style="color:red;">缁勭粐</option>';
             $.ajax({
                 type: "get",
                 url: GetWEBURL() + "/Web/GetOrganizations",
@@ -276,9 +114,9 @@
                         var data = result.data;
                         for (var i = 0; i < data.length; i++) {
                             if (i == 0)
-                                Organization += '<option  "  value="' + data[i].ID + '" selected>' + data[i].Name + '</option>';
+                                Organization += '<option  style="color:blue;"  value="' + data[i].ID + '" selected>' + data[i].Name + '</option>';
                             else
-                                Organization += '<option  " value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                            Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
 
                         }
                         $("#Organization").append(Organization);
@@ -291,12 +129,20 @@
                 }
             })
 
-
+         
 
             //form.render();
 
             //鍒ゆ柇鐢ㄦ埛鏄Щ鍔ㄧ杩樻槸PC绔�
             var judgeMorPCflag = judgeMorPC();
+
+            if (!judgeMorPCflag) {//绉诲姩绔�
+                $("#LAY-user-login").css("background", "url('../userfiles/images/2.jpg')");
+                $("#LAY-user-login").css("background-size", "100%");
+            } else {
+                $("#LAY-user-login").css("background", "url('../userfiles/images/2.jpg')");
+                $("#LAY-user-login").css("background-size", "100%");
+            }
 
             //鎻愪氦
             form.on("submit(LAY-user-login-submit)", function (obj) {
@@ -310,9 +156,9 @@
             //瀵嗙爜妗嗗洖杞︽墽琛岀櫥褰�
             $('#LAY-user-login-password').on('keydown', function (e) {
                 if (e.keyCode == 13) {
-                    //playSound();
+                    loging();
                 }
-            });
+            });          
             //鐢ㄦ埛鍚嶆鍥炶溅鍏夋爣绉诲埌瀵嗙爜妗�
             $('#LAY-user-login-username').on('keydown', function (e) {
                 if (e.keyCode == 13) {
@@ -357,7 +203,7 @@
                 var PassWord = $("#LAY-user-login-password").val();
                 layer.load(3);
                 $.ajax({
-                    type: "get",
+                    type: "get", 
                     url: GetWEBURL() + "/Web/GetUser",
                     data: { "UserName": UserName, "PassWord": PassWord, "HOrgName": $("#Organization").val() },
                     success: function (result) {
@@ -397,6 +243,8 @@
                             sessionStorage["login"] = "login";
                             sessionStorage["OrganizationID"] = $("#Organization").val();
                             sessionStorage["Organization"] = $("#Organization option:selected").text();
+                            sessionStorage["HManagerID"] = result.data[0].HSecManagerID;
+                            sessionStorage["HManagerName"] = result.data[0].HSecManager;
                             //sessionStorage["IP"] = System.Configuration.ConfigurationSettings.AppSettings("name");
                             if (!judgeMorPCflag) {//绉诲姩绔�
                                 window.location.href = '../../views/index_Mobile.html'
@@ -425,10 +273,9 @@
                     $("body").append('<audio id="cs" hidden controls> <source src = "../video/jingbao.wav" type = "audio/ogg"> </audio >');
                 var audio = document.getElementById("cs");
                 audio.play();
-            }
+            }          
 
         });
     </script>
 </body>
-
 </html>
\ No newline at end of file
diff --git a/WebTM/views/user/login_pda.html b/WebTM/views/user/login_pda.html
new file mode 100644
index 0000000..8be2739
--- /dev/null
+++ b/WebTM/views/user/login_pda.html
@@ -0,0 +1,279 @@
+锘�
+
+<!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">
+    <link rel="stylesheet" href="../../layuiadmin/style/login.css" media="all">
+    <style>
+        .layadmin-user-login-body .layui-form-item .layui-input {
+            color: blue;
+        }
+    </style>
+</head>
+<body>
+    <!--<audio id="cs" hidden controls>
+        <source src="../video/jingbao.wav" type="audio/ogg">
+    </audio>-->
+    <div class="layadmin-user-login layadmin-user-display-show" id="LAY-user-login" style="display: none;">
+        <div class="layadmin-user-login-main" style="margin: -5.8% auto;">
+            <div class="layadmin-user-login-box layadmin-user-login-header">
+                <h2 style="color:white;">L-MES</h2>
+                <p style="color: white;">鏅轰簯LMES绠$悊绯荤粺</p>
+            </div>
+            <div class="layadmin-user-login-box layadmin-user-login-body layui-form">
+                <div class="layui-form-item">
+                    <select name="Organization" id="Organization" lay-verify="required" lay-search class="layui-input">
+                        <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                    </select>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layadmin-user-login-icon layui-icon layui-icon-username login-input" for="LAY-user-login-password"></label>
+                    <input type="text" name="username" id="LAY-user-login-username" lay-verify="required" placeholder="鐢ㄦ埛鍚�" class="layui-input" style="background-color:transparent;color:white" autocomplete="off">
+                </div>
+                <div class="layui-form-item">
+                    <label class="layadmin-user-login-icon layui-icon layui-icon-password login-input" for="LAY-user-login-password"></label>
+                    <input type="password" name="password" id="LAY-user-login-password" lay-verify="required" placeholder="瀵嗙爜" class="layui-input" style="background-color:transparent;color:white" autocomplete="off">
+                </div>
+                <div class="layui-form-item">
+                    <!--<input type="button" onclick="playSound('wavFileId');" value="play" />-->
+                    <button type="button" lay-submit="" class="layui-btn layui-btn-fluid" id="LAY-user-login-submit" name="LAY-user-login-submit" lay-filter="LAY-user-login-submit">鐧� 鍏�</button>
+
+                    <!--<button type="button" lay-submit="" class="layui-btn layui-btn-fluid" id="LAY-user-login-yp" name="LAY-user-login-yp" lay-filter="LAY-user-login-yp">闊抽</button>-->
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script src="../../layuiadmin/layui/layui.js"></script>
+    <script src="../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../layuiadmin/zgqCustom/zgqCustom.js" type="text/javascript"></script>
+
+    <script>
+        layui.config({
+            base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'user'], function () {
+            //var $ = layui.$
+            //, setter = layui.setter
+            //, admin = layui.admin
+            //, form = layui.form
+            //, router = layui.router()
+            //, search = router.search;
+
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , util = layui.util;
+
+            //鑾峰彇鏁版嵁搴撳悕
+            $.ajax({
+                type: "get",
+                url: GetWEBURL() + "/Web/GetDataBases",
+                success: function (result) {
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        sessionStorage["鏁版嵁搴�"] = result.data[0].Name;
+                    }
+                    layer.closeAll("loading");
+                }
+            })
+
+            var load = layer.load(1, {
+                content: '缁勭粐鍔犺浇涓�傘�傘��',
+                shade: [0.4, '#393D49'],
+                // time: 10 * 1000,
+                success: function (layero) {
+                    layero.css('padding-left', '30px');
+                    layero.find('.layui-layer-content').css({
+                        'padding-top': '40px',
+                        'width': '70px',
+                        'color': 'white',
+                        'background-position-x': '16px'
+                    });
+                }
+            })
+            //鑾峰彇鐧诲綍椤电粍缁囧垪
+            var Organization = '<option value="0" style="color:red;">缁勭粐</option>';
+            $.ajax({
+                type: "get",
+                url: GetWEBURL() + "/Web/GetOrganizations",
+                success: function (result) {
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        var data = result.data;
+                        for (var i = 0; i < data.length; i++) {
+                            if (i == 0)
+                                Organization += '<option  style="color:blue;"  value="' + data[i].ID + '" selected>' + data[i].Name + '</option>';
+                            else
+                            Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+
+                        }
+                        $("#Organization").append(Organization);
+                        form.render('select');
+
+                        //璇诲彇閰嶇疆鏂囦欢
+                        get_ReadConfigFile();
+                    }
+                    layer.closeAll("loading");
+                }
+            })
+
+         
+
+            //form.render();
+
+            //鍒ゆ柇鐢ㄦ埛鏄Щ鍔ㄧ杩樻槸PC绔�
+            var judgeMorPCflag = judgeMorPC();
+
+            if (!judgeMorPCflag) {//绉诲姩绔�
+                $("#LAY-user-login").css("background", "url('../userfiles/images/2.jpg')");
+                $("#LAY-user-login").css("background-size", "100%");
+            } else {
+                $("#LAY-user-login").css("background", "url('../userfiles/images/2.jpg')");
+                $("#LAY-user-login").css("background-size", "100%");
+            }
+
+            //鎻愪氦
+            form.on("submit(LAY-user-login-submit)", function (obj) {
+                loging();
+            })
+
+            //闊抽
+            form.on("submit(LAY-user-login-yp)", function (obj) {
+                playSound();
+            })
+            //瀵嗙爜妗嗗洖杞︽墽琛岀櫥褰�
+            $('#LAY-user-login-password').on('keydown', function (e) {
+                if (e.keyCode == 13) {
+                    loging();
+                }
+            });          
+            //鐢ㄦ埛鍚嶆鍥炶溅鍏夋爣绉诲埌瀵嗙爜妗�
+            $('#LAY-user-login-username').on('keydown', function (e) {
+                if (e.keyCode == 13) {
+                    $("#LAY-user-login-password").focus();
+                }
+            })
+
+
+            //璇诲彇閰嶇疆鏂囦欢
+            function get_ReadConfigFile() {
+                //鑾峰彇鏈湴瀛樺偍鐨勬暟鎹�
+                var data = localStorage.getItem("data");
+                if (data != null) {
+                    var data2 = JSON.parse(data);
+                    $("#LAY-user-login-username").val(data2["UserID"]);
+                    $("#Organization").val(data2["OrgID"]);
+                    form.render('select');
+                }
+            }
+
+            //瀛樺偍閰嶇疆鏂囦欢
+            function get_WriteConfigFile() {
+                //娓呯┖鏈湴瀛樺偍鐨勬暟鎹�
+                localStorage.removeItem("data");
+                var data = {
+                    UserID: sessionStorage["Czybm"]
+                    , OrgID: sessionStorage["OrganizationID"]
+                }
+                //鏈湴瀛樺偍
+                localStorage.setItem("data", JSON.stringify(data));
+            }
+
+            //鐧诲綍
+            function loging() {
+                if ($("#Organization").val() == 0) {
+                    //playSound();
+                    layer.msg("璇烽�夋嫨缁勭粐锛�");
+                    return;
+
+                }
+                var UserName = $("#LAY-user-login-username").val();
+                var PassWord = $("#LAY-user-login-password").val();
+                layer.load(3);
+                $.ajax({
+                    type: "get", 
+                    url: GetWEBURL() + "/Web/GetUser",
+                    data: { "UserName": UserName, "PassWord": PassWord, "HOrgName": $("#Organization").val() },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(result.Message, { icon: 1 });
+                            //sessionStorage["HUserName"] = user.username;
+                            sessionStorage["HUserName"] = result.data[0].Czymc;
+                            sessionStorage["HBillerID"] = result.data[0].HK3UserID;
+                            sessionStorage["SourceFlag"] = false;
+                            sessionStorage["HKeeperID"] = result.data[0].HKeeperID;
+                            sessionStorage["HKeeper"] = result.data[0].HKeeper;
+                            sessionStorage["HSecManagerID"] = result.data[0].HSecManagerID;
+                            sessionStorage["HSecManager"] = result.data[0].HSecManager;
+                            sessionStorage["HSellManID"] = result.data[0].HSellManID;
+                            sessionStorage["HSellMan"] = result.data[0].HSellMan;
+                            sessionStorage["HDeptID"] = result.data[0].HDeptID;
+                            sessionStorage["HDept"] = result.data[0].HDept;
+                            sessionStorage["HWHID"] = result.data[0].HWhID;
+                            sessionStorage["HWHName"] = result.data[0].HWHName;
+                            sessionStorage["HSPID"] = result.data[0].HSPID;
+                            sessionStorage["HSPName"] = result.data[0].HSPName;
+                            sessionStorage["HSupID"] = result.data[0].HSupID;
+                            sessionStorage["HSupName"] = result.data[0].HSupName;
+                            sessionStorage["Czmm"] = result.data[0].Czmm;
+                            sessionStorage["Czybm"] = result.data[0].Czybm;
+                            sessionStorage["HEmpID"] = result.data[0].HEmpID;
+                            sessionStorage["HGroup"] = result.data[0].HGroup;
+                            sessionStorage["HGroupID"] = result.data[0].HGroupID;
+                            sessionStorage["HProc"] = result.data[0].HProc;
+                            sessionStorage["HProcNo"] = result.data[0].HProcNo;
+                            sessionStorage["HSource"] = result.data[0].HSource;
+                            sessionStorage["HSourceID"] = result.data[0].HSourceID;
+                            sessionStorage["HWorkCenter"] = result.data[0].HWorkCenter;
+                            sessionStorage["HWorkCenterID"] = result.data[0].HWorkCenterID;
+                            sessionStorage["HProcName"] = result.data[0].HProcName;
+                            sessionStorage["HProcID"] = result.data[0].HProcID;
+                            sessionStorage["login"] = "login";
+                            sessionStorage["OrganizationID"] = $("#Organization").val();
+                            sessionStorage["Organization"] = $("#Organization option:selected").text();
+                            sessionStorage["HManagerID"] = result.data[0].HSecManagerID;
+                            sessionStorage["HManagerName"] = result.data[0].HSecManager;
+                            //sessionStorage["IP"] = System.Configuration.ConfigurationSettings.AppSettings("name");
+                            //鐧诲綍绉诲姩绔�
+                            window.location.href = '../../views/index_Mobile.html'
+                           
+                            get_WriteConfigFile();
+                        }
+                        else {
+                            // $("#verifycode").click();
+                            layer.msg(result.Message, { icon: 5 });
+                        }
+                        layer.closeAll("loading");
+                    },
+                    error: function (result) {
+                        layer.closeAll("loading");
+                        layer.msg("鎺ュ彛璇锋眰澶辫触!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
+                    }
+                })
+            }
+
+            function playSound() {
+                var audio = document.getElementById("cs");
+                if (audio == null)
+                    $("body").append('<audio id="cs" hidden controls> <source src = "../video/jingbao.wav" type = "audio/ogg"> </audio >');
+                var audio = document.getElementById("cs");
+                audio.play();
+            }          
+
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_ChaoBaoEditDlg.html" "b/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_ChaoBaoEditDlg.html"
index d089338..517fb15 100644
--- "a/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_ChaoBaoEditDlg.html"
+++ "b/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_ChaoBaoEditDlg.html"
@@ -296,14 +296,18 @@
             $('#HBarCode').on('keydown', function (event) {
                 if (event.keyCode == 13) {
                     GetBarCode();
+                    $("#HQty").select();
                     $("#HQty").focus();     //鑾峰彇鍏夋爣
+                    layer.closeAll("loading");
                 }
             });
 
             //鏉$爜鎸夐挳
             form.on('submit(HBarCode-BT)', function (data) {
                 GetBarCode();
+                $("#HQty").select();
                 $("#HQty").focus();     //鑾峰彇鍏夋爣
+                layer.closeAll("loading");
             });
 
             //鎵潯鐮�
@@ -311,7 +315,12 @@
                 var sBarCode = $('#HBarCode').val()
                 if (sBarCode == '') {
                     playSound();
-                    layer.msg("鏉$爜涓虹┖锛岃鎵弿鏉$爜锛�", { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    layer.msg("鏉$爜涓虹┖锛岃鎵弿鏉$爜锛�", {
+                        icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                    }, function () {
+                        $("#HBarCode").select();
+                        $("#HBarCode").focus();
+                    });
                     return;
                 }
                 layer.load(3)
@@ -332,12 +341,22 @@
                         }
                         else {
                             playSound();
-                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            layer.msg(result.Message, {
+                                icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            }, function () {
+                                $("#HBarCode").select();
+                                $("#HBarCode").focus();
+                            });
                         }
                     },
                     error: function (err) {
                         playSound();
-                        layer.msg("閿欒锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        layer.msg("閿欒锛�" + err, {
+                            icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HBarCode").select();
+                            $("#HBarCode").focus();
+                        });
                     }
                 });
                 layer.closeAll("loading");
@@ -358,12 +377,22 @@
                 var sBarCode = $('#HBarCode').val()
                 if (sBarCode == '') {
                     playSound();
-                    layer.msg("鏉$爜涓虹┖锛岃鎵弿鏉$爜锛�", { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    layer.msg("鏉$爜涓虹┖锛岃鎵弿鏉$爜锛�", {
+                        icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                    }, function () {
+                        $("#HBarCode").select();
+                        $("#HBarCode").focus();
+                    });
                     return;
                 }
                 if (sHQty == "" || sHQty ==0) {
                     playSound();
-                    layer.msg("鏁伴噺涓嶅厑璁稿皬浜�0锛岃杈撳叆鏁伴噺锛�", { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    layer.msg("鏁伴噺涓嶅厑璁稿皬浜�0锛岃杈撳叆鏁伴噺锛�", {
+                        icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                    }, function () {
+                        $("#HQty").select();
+                        $("#HQty").focus();
+                    });
                     return;
                 }
                 layer.load(3)
@@ -382,12 +411,22 @@
                         }
                         else {
                             playSound();
-                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            layer.msg(result.Message, {
+                                icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            }, function () {
+                                $("#HBarCode").select();
+                                $("#HBarCode").focus();
+                            });
                         }
                     },
                     error: function (err) {
                         playSound();
-                        layer.msg("閿欒锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        layer.msg("閿欒锛�" + err, {
+                            icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HBarCode").select();
+                            $("#HBarCode").focus();
+                        });
                     }
                 });
                 layer.closeAll("loading");
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CheckItem.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CheckItem.html"
index 1759dad..794b341 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CheckItem.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CheckItem.html"
@@ -42,7 +42,7 @@
                                                     <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber">
                                                     <input id="HItemID" name="HItemID" type="hidden" />
                                                     <input id="HParentID" name="HParentID" type="hidden" />
-                                                    <input id="HLevel" name="HLevel" type="hidden" />
+                                                    <input id="HLevel" name="HLevel" type="hidden" value="1" />
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
@@ -155,6 +155,7 @@
                 var isEndCheck = document.getElementById("HStopflag").checked;
                 data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
 
+                hID = hID == "" ? 0 : hID;
                 data.field.HItemID = hID == "" ? 0 : hID;
 
                 data.field.HParentID = TagParentId == "" ? 0 : TagParentId;
@@ -189,7 +190,7 @@
                             },
                             error: function (err) {
 
-                                f_alert("閿欒:" + err);
+                                f_alert("閿欒:" + err.responseText);
                                 console.log("Reason" + sMainStr);
                             }
                         });
@@ -219,7 +220,7 @@
                             },
                             error: function (err) {
 
-                                f_alert("閿欒:" + err);
+                                f_alert("閿欒:" + err.responseText);
                                 console.log("Reason" + sMainStr);
                             }
                         });
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_QCCheckClass.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_QCCheckClass.html"
index 8853e48..1ff5021 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_QCCheckClass.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_QCCheckClass.html"
@@ -151,6 +151,7 @@
                 var isEndCheck = document.getElementById("HStopflag").checked;
                 data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
 
+                hID = hID == "" ? 0 : hID;
                 data.field.HItemID = hID == "" ? 0 : hID;
 
                 data.field.HParentID = TagParentId == "" ? 0 : TagParentId;
@@ -183,7 +184,7 @@
                             },
                             error: function (err) {
 
-                                f_alert("閿欒:" + err);
+                                f_alert("閿欒:" + err.responseText);
                                 console.log("Reason" + sMainStr);
                             }
                         });
@@ -213,7 +214,7 @@
                             },
                             error: function (err) {
 
-                                f_alert("閿欒:" + err);
+                                f_alert("閿欒:" + err.responseText);
                                 console.log("Reason" + sMainStr);
                             }
                         });
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadReason.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadReason.html"
index 90a812b..66299a1 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadReason.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadReason.html"
@@ -226,7 +226,7 @@
                     , shade: 0.6 //閬僵閫忔槑搴�
                     , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                     , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -236,9 +236,9 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HDepName").val(checkStatus.data[0].HName);
+                        $("#HDepName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
                         $("#HDeptID").val(checkStatus.data[0].HItemID);
-                        $("#HDeptNumber").val(checkStatus.data[0].HNumber);
+                        $("#HDeptNumber").val(checkStatus.data[0].閮ㄩ棬浠g爜);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
index 6a3c2a7..3632b50 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
@@ -752,7 +752,9 @@
                             dataCol = data1.data[0].HGridString.split(',');
 
                             for (var i = 0; i < option.cols[0].length - 2; i++) {
-                                var dataCols = dataCol[i].split('|');
+                                if (dataCol[i]) {
+                                    var dataCols = dataCol[i].split('|');
+                                }                                
                                 //闅愯棌鍒�
                                 if (dataCols[1] == 1) {
                                     option.cols[0][i + 1]["hide"] = true;
diff --git "a/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/YS_CusShouldIncomeEntryReport.html" "b/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/YS_CusShouldIncomeEntryReport.html"
new file mode 100644
index 0000000..813e564
--- /dev/null
+++ "b/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/YS_CusShouldIncomeEntryReport.html"
@@ -0,0 +1,532 @@
+锘�<!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/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/HideButton.js"></script>
+    <script src="../../../layuiadmin/grwebapp.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-inline" style="width:200px;">
+                                    <label class="layui-form-label" style="width:35px;">鏃ユ湡</label>
+                                    <div class="layui-input-block" style="position:relative; left:-45px;">
+                                        <input type="date" class="layui-input" id="HBeginDate" style="width:140px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline" style="width:200px;">
+                                    <label class="layui-form-label" style="width:5px;">-</label>
+                                    <div class="layui-input-block" style="position:relative; left:-70px;">
+                                        <input type="date" class="layui-input" id="HEndDate" style="width:140px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">瀹㈡埛</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HCustomer" id="HCustomer" style="width:140px;">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Query" id="Query"><i class="layui-icon layui-icon-search"></i>鏌ヨ</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="Cell"><i class="layui-icon layui-icon-slider"></i>淇濆瓨鍒楀</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="RefreshCell"><i class="layui-icon layui-icon-cols"></i>榛樿鍒楀</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Exit" id="Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
+            
+        //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+            var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+            var OperationType = 2   //鎿嶄綔绫诲瀷锛�1 浠庡叾浠栨ā鍧楄烦杞墦寮�銆�2 鐩存帴鎵撳紑锛�
+            var HCusID = 0          //瀹㈡埛ID
+            var sWhere = "";
+            var option = [];
+            var ins;                //鐢ㄤ簬瀵煎嚭excel
+            var columns = "";
+            var HModName = "YS_CusShouldIncomeEntryReport";
+            var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+        //#endregion
+
+        //#region   浠庡叾浠栨ā鍧楄烦杞� 杩斿洖淇℃伅
+        function getUrlVars() {
+            var vars = [], hash;
+            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+            for (var i = 0; i < hashes.length; i++) {
+                hash = hashes[i].split('=');
+                vars.push(hash[0]);
+                vars[hash[0]] = hash[1];
+            }
+            return vars;
+        }
+            var params = getUrlVars();
+            OperationType = params[params[0]];          //浠庡叾浠栨ā鍧楄烦杞繑鍥炴暟鎹被鍨�  1 浠庡叾浠栨ā鍧楄烦杞墦寮�銆�2 鐩存帴鎵撳紑
+            var HBeginDate_Temp = params[params[1]];    //浠庡叾浠栨ā鍧楄烦杞繑寮�濮嬫棩鏈�
+            var HEndDate_Temp = params[params[2]];      //浠庡叾浠栨ā鍧楄烦杞繑鍥炵粨鏉熸棩鏈�
+            HCusID = params[params[3]];                 //浠庡叾浠栨ā鍧楄烦杞繑鍥炲鎴稩D
+
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //浠庡叾浠栨ā鍧楄烦杞�
+                if (OperationType == 1) {
+                    //鑾峰彇寮�濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+                    $("#HBeginDate").val(Format(HBeginDate_Temp, "yyyy-MM-dd"));
+                    $("#HEndDate").val(Format(HEndDate_Temp, "yyyy-MM-dd"));
+                }
+                else {
+                    //鑾峰彇寮�濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+                    $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                    $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                    HCusID = 0;
+                    OperationType = 2;
+                }
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , page: true
+                    , totalRow: true
+                    , height: 'full-50'
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                };
+            }
+            //#endregion
+
+            //#region 鑾峰彇鍒楀
+            function getColumnsWidth() {
+                var result = [];
+                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
+                //鑾峰彇鍒楀
+                $.ajax({
+                    type: "Get",
+                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidthList',
+                    async: false,
+                    dataType: "json",
+                    data: { "colNum": colNum, "Name": HModName },
+                    success: function (data1) {
+                        if (data1.code == 1) {
+                            result = data1.data;
+                        }
+                        else if (data1.code == -1) {
+
+                        }
+                        else {
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    }, error: function (e) {
+                        layer.alert(e.Message, { icon: 5 });
+                    }
+                });
+                return result;
+            }
+            //#endregion
+
+            //#region 鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    async: false,
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 2; i++) {
+                                if (dataCol[i]) {
+                                    var dataCols = dataCol[i].split('|');
+                                }
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                ////璁剧疆鍒楀
+                                //if (dataCols[3] > 0) {
+                                //    option.cols[0][i + 1]["width"] = dataCols[3];
+                                //}
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                        } else {
+                            table.render(option);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#endregion
+
+        //#endregion
+
+        //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 宸ュ叿鏍忎簨浠�
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //瀵煎嚭鎸夐挳
+                    case 'btn_Export': get_Export();
+                        break;
+                    //鏌ヨ鎸夐挳
+                    case 'btn_Query': get_Display();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'btn_Exit': Pub_Close(OperationType);
+                        break;
+                    //淇濆瓨鍒楀鎸夐挳
+                    case 'btn-Cell': set_SaveGridColWidth();
+                        break;
+                    //榛樿鍒楀鎸夐挳
+                    case 'btn-RefreshCell': set_DefaultGridColWidth();
+                        break;
+                    //鍒楄缃�
+                    case 'btn_HideColumn': get_HideColumn();
+                        break;
+                };
+            });
+            //#endregion
+
+            //#region 瀵煎嚭Execel
+            function get_Export() {
+                table.exportFile(ins.config.id, option.data, "xls");
+            }
+            //#endregion
+
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_Display();
+            });
+
+            //#region 鏌ヨ
+            function get_Display() {
+                var HBeginDate = $("#HBeginDate").val();        //寮�濮嬫棩鏈�
+                var HEndDate = $("#HEndDate").val();            //缁撴潫鏃ユ湡
+                var HCustomer = $("#HCustomer").val();          //瀹㈡埛
+
+                sWhere = "'" + HBeginDate + "','" + HEndDate + "'," + HCusID + ",'" + HCustomer + "'," + HStockOrgID;
+
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + '/YS_ReceiveReportController/GetYS_CusShouldIncomeEntryReport_Json',
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(data1.list[key].ColmCols)) {
+                                    titleData[key] = data1.list[key].ColmCols;
+                                }
+                            }
+
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            for (var i = 0; i < data.length; i++) {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        default:
+
+                                            if (data[i].name == '鏀舵' || data[i].name == '鏀嚭') {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', totalRow: true });
+                                            } else {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+                                            }
+                                    }
+                                }
+                            }
+
+                            columns = col;
+
+                            //璁剧疆璧嬪�煎垪瀹�
+                            var colWidth = getColumnsWidth();
+                            if (colWidth == "" || colWidth == []) {
+
+                            }
+                            else {
+                                $.each(columns, function (x, m) {
+                                    m["width"] = colWidth[x];
+                                });
+                            }
+                            option.cols = [columns];
+                            option.data = data1.data;
+                            option.totalRow = true;
+                            table.render(option);
+                            ins = table.render(option);
+
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    },
+                    error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+                DisPlay_HideColumn();
+            }
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                //娓呯┖杩囨护鏉′欢
+                set_ClearQuery();
+            });
+
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));    //寮�濮嬫棩鏈�
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));   //缁撴潫鏃ユ湡
+                $("#HCustomer").val("");         //瀹㈡埛
+                form.render('select');
+            }
+
+            //#endregion
+
+            //#region 淇濆瓨鍒楀
+            function set_SaveGridColWidth() {
+                var arr = [];
+                // 鍒楁暟
+                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
+                for (var i = 0; i <= colNum; i++) {
+                    var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
+                    var colWidth = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).width();
+                    if (colName != "" && colName != null) {
+                        arr.push(colWidth == -1 ? 200 : colWidth);
+                    }
+                }
+                arr.unshift(40); //棣栦綅杩藉姞
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
+                    async: false,
+                    dataType: "json",
+                    data: { "myMap": JSON.stringify(arr), "Name": HModName },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            //layer.alert(data1.Message, { icon: 1 });
+                        } else {
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    }, error: function (e) {
+                        layer.alert(e.Message, { icon: 5 });
+                    }
+                });
+                //璁剧疆璧嬪�煎垪瀹�
+                var colWidth = getColumnsWidth();
+                if (colWidth == "" || colWidth == []) {
+
+                }
+                else {
+                    $.each(columns, function (x, m) {
+                        m["width"] = colWidth[x];
+                    });
+                }
+                //location.reload();
+            }
+            //#endregion
+
+            //#region 榛樿鍒楀
+            function set_DefaultGridColWidth() {
+                var arr = [];
+                // 鍒楁暟
+                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
+                for (var i = 0; i <= colNum; i++) {
+                    var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
+                    if (colName != "" && colName != null) {
+                        arr.push(200);   //榛樿瀹藉害200
+                    }
+                }
+                arr.unshift(40); //棣栦綅杩藉姞
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
+                    async: false,
+                    dataType: "json",
+                    data: { "myMap": JSON.stringify(arr), "Name": HModName },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+
+                        } else {
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    }, error: function (e) {
+                        layer.alert(e.Message, { icon: 5 });
+                    }
+                });
+                //璁剧疆璧嬪�煎垪瀹�
+                var colWidth = getColumnsWidth();
+                if (colWidth == "" || colWidth == []) {
+
+                }
+                else {
+                    $.each(columns, function (x, m) {
+                        m["width"] = colWidth[x];
+                    });
+                }
+                location.reload();
+            }
+            //#endregion
+
+            //#region 闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+            //#endregion
+
+        //#endregion
+
+
+        });
+
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/YS_CusShouldIncomeReport.html" "b/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/YS_CusShouldIncomeReport.html"
new file mode 100644
index 0000000..bfb0ee6
--- /dev/null
+++ "b/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/YS_CusShouldIncomeReport.html"
@@ -0,0 +1,555 @@
+锘�<!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/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/HideButton.js"></script>
+    <script src="../../../layuiadmin/grwebapp.js"></script>
+    <script src="../../../layuiadmin/soulTable.slim.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-inline" style="width:200px;">
+                                    <label class="layui-form-label" style="width:35px;">鏃ユ湡</label>
+                                    <div class="layui-input-block" style="position:relative; left:-45px;">
+                                        <input type="date" class="layui-input" id="HBeginDate" style="width:140px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline" style="width:200px;">
+                                    <label class="layui-form-label" style="width:5px;">-</label>
+                                    <div class="layui-input-block" style="position:relative; left:-70px;">
+                                        <input type="date" class="layui-input" id="HEndDate" style="width:140px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">瀹㈡埛</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HCustomer" id="HCustomer" style="width:140px;">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Query" id="Query"><i class="layui-icon layui-icon-search"></i>鏌ヨ</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="Cell"><i class="layui-icon layui-icon-slider"></i>淇濆瓨鍒楀</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="RefreshCell"><i class="layui-icon layui-icon-cols"></i>榛樿鍒楀</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Entry" id="btn_Entry"><i class="layui-icon layui-icon-form"></i>鏄剧ず鏄庣粏</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Exit" id="Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
+            
+        //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+            var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+            var sWhere = "";
+            var option = [];
+            var ins;                        //鐢ㄤ簬瀵煎嚭excel
+            var columns = "";
+            var HModName = "YS_CusShouldIncomeReport";
+            var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+        //#endregion
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            if (sessionStorage.login != "login") {
+                layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                }, function () { window.location.href = "../../user/login.html"; });
+            }
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+            //#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"));
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , page: true
+                    , totalRow: true
+                    , height: 'full-50'
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                };
+            }
+            //#endregion
+
+            //#region 鑾峰彇鍒楀
+            function getColumnsWidth() {
+                var result = [];
+                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
+                //鑾峰彇鍒楀
+                $.ajax({
+                    type: "Get",
+                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidthList',
+                    async: false,
+                    dataType: "json",
+                    data: { "colNum": colNum, "Name": HModName },
+                    success: function (data1) {
+                        if (data1.code == 1) {
+                            result = data1.data;
+                        }
+                        else if (data1.code == -1) {
+
+                        }
+                        else {
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    }, error: function (e) {
+                        layer.alert(e.Message, { icon: 5 });
+                    }
+                });
+                return result;
+            }
+            //#endregion
+
+            //#region 鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    async: false,
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 2; i++) {
+                                if (dataCol[i]) {
+                                    var dataCols = dataCol[i].split('|');
+                                }
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                ////璁剧疆鍒楀
+                                //if (dataCols[3] > 0) {
+                                //    option.cols[0][i + 1]["width"] = dataCols[3];
+                                //}
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                        } else {
+                            table.render(option);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#endregion
+
+        //#endregion
+
+        //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 宸ュ叿鏍忎簨浠�
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //瀵煎嚭鎸夐挳
+                    case 'btn_Export': get_Export();
+                        break;
+                    //鏌ヨ鎸夐挳
+                    case 'btn_Query': get_Display();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'btn_Exit': Pub_Close(2);
+                        break;
+                    //淇濆瓨鍒楀鎸夐挳
+                    case 'btn-Cell': set_SaveGridColWidth();
+                        break;
+                    //榛樿鍒楀鎸夐挳
+                    case 'btn-RefreshCell': set_DefaultGridColWidth();
+                        break;
+                    //鍒楄缃�
+                    case 'btn_HideColumn': get_HideColumn();
+                        break;
+                    //鏄剧ず鏄庣粏
+                    case 'btn_Entry': get_Entry();
+                        break;
+                };
+            });
+            //#endregion
+
+            //#region 瀵煎嚭Execel
+            function get_Export() {
+                table.exportFile(ins.config.id, option.data, "xls");
+            }
+            //#endregion
+
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_Display();
+            });
+
+            //#region 鏌ヨ
+            function get_Display() {
+                var HBeginDate = $("#HBeginDate").val();        //寮�濮嬫棩鏈�
+                var HEndDate = $("#HEndDate").val();            //缁撴潫鏃ユ湡
+                var HCustomer = $("#HCustomer").val();          //瀹㈡埛
+
+                sWhere = "'" + HBeginDate + "','" + HEndDate + "','" + HCustomer + "'," + HStockOrgID;
+
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + '/YS_ReceiveReportController/GetYS_CusShouldIncomeReport_Json',
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(data1.list[key].ColmCols)) {
+                                    titleData[key] = data1.list[key].ColmCols;
+                                }
+                            }
+
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'radio', fixed: 'left' });
+                            for (var i = 0; i < data.length; i++) {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+                                    }
+                                }
+                            }
+
+                            columns = col;
+
+                            //璁剧疆璧嬪�煎垪瀹�
+                            var colWidth = getColumnsWidth();
+                            if (colWidth == "" || colWidth == []) {
+
+                            }
+                            else {
+                                $.each(columns, function (x, m) {
+                                    m["width"] = colWidth[x];
+                                });
+                            }
+                            option.cols = [columns];
+                            option.data = data1.data;
+                            option.totalRow = true;
+                            table.render(option);
+                            ins = table.render(option);
+
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    },
+                    error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+                DisPlay_HideColumn();
+            }
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                //娓呯┖杩囨护鏉′欢
+                set_ClearQuery();
+            });
+
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));    //寮�濮嬫棩鏈�
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));   //缁撴潫鏃ユ湡
+                $("#HCustomer").val("");         //瀹㈡埛
+                form.render('select');
+            }
+
+            //#endregion
+
+            //#region 淇濆瓨鍒楀
+            function set_SaveGridColWidth() {
+                var arr = [];
+                // 鍒楁暟
+                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
+                for (var i = 0; i <= colNum; i++) {
+                    var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
+                    var colWidth = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).width();
+                    if (colName != "" && colName != null) {
+                        arr.push(colWidth == -1 ? 200 : colWidth);
+                    }
+                }
+                arr.unshift(40); //棣栦綅杩藉姞
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
+                    async: false,
+                    dataType: "json",
+                    data: { "myMap": JSON.stringify(arr), "Name": HModName },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            //layer.alert(data1.Message, { icon: 1 });
+                        } else {
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    }, error: function (e) {
+                        layer.alert(e.Message, { icon: 5 });
+                    }
+                });
+                //璁剧疆璧嬪�煎垪瀹�
+                var colWidth = getColumnsWidth();
+                if (colWidth == "" || colWidth == []) {
+
+                }
+                else {
+                    $.each(columns, function (x, m) {
+                        m["width"] = colWidth[x];
+                    });
+                }
+                //location.reload();
+            }
+            //#endregion
+
+            //#region 榛樿鍒楀
+            function set_DefaultGridColWidth() {
+                var arr = [];
+                // 鍒楁暟
+                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
+                for (var i = 0; i <= colNum; i++) {
+                    var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
+                    if (colName != "" && colName != null) {
+                        arr.push(200);   //榛樿瀹藉害200
+                    }
+                }
+                arr.unshift(40); //棣栦綅杩藉姞
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
+                    async: false,
+                    dataType: "json",
+                    data: { "myMap": JSON.stringify(arr), "Name": HModName },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+
+                        } else {
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    }, error: function (e) {
+                        layer.alert(e.Message, { icon: 5 });
+                    }
+                });
+                //璁剧疆璧嬪�煎垪瀹�
+                var colWidth = getColumnsWidth();
+                if (colWidth == "" || colWidth == []) {
+
+                }
+                else {
+                    $.each(columns, function (x, m) {
+                        m["width"] = colWidth[x];
+                    });
+                }
+                location.reload();
+            }
+            //#endregion
+
+            //#region 闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+            //#endregion
+
+            //鍙屽嚮琛ㄦ牸浜嬩欢
+            table.on('rowDouble(mainTable)', function (obj) {
+                var HBeginDate = $("#HBeginDate").val();        //寮�濮嬫棩鏈�
+                var HEndDate = $("#HEndDate").val();            //缁撴潫鏃ユ湡
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '瀹㈡埛搴旀敹璐︽鏄庣粏鍒嗘瀽鎶ヨ〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../搴旀敹绠$悊/鎶ヨ〃鍒嗘瀽/YS_CusShouldIncomeEntryReport.html?OperationType=1&HBeginDate=' + HBeginDate + '&HEndDate =' + HEndDate + '&HCusID =' + obj.data["HCusID"], 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        $(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            })
+
+            //#region 鏄剧ず鏄庣粏
+            function get_Entry() {
+                var HBeginDate = $("#HBeginDate").val();        //寮�濮嬫棩鏈�
+                var HEndDate = $("#HEndDate").val();            //缁撴潫鏃ユ湡
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '瀹㈡埛搴旀敹璐︽鏄庣粏鍒嗘瀽鎶ヨ〃'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: ['../../搴旀敹绠$悊/鎶ヨ〃鍒嗘瀽/YS_CusShouldIncomeEntryReport.html?OperationType=1&HBeginDate=' + HBeginDate + '&HEndDate =' + HEndDate + '&HCusID =' + data[0].HCusID, 'yes']
+                        , resize: false
+                        , cancel: function () {
+                            $(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇峰厛閫変腑涓�琛屾暟鎹紒');
+                }
+            }
+            //#endregion
+
+        //#endregion
+
+
+        });
+
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/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 4c67202..f7dfc01 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"
@@ -311,7 +311,7 @@
                          , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 200, sort: true }
                          , { field: '鐐夊彿', title: '鐐夊彿', width: 200, sort: true }
                          , { field: '閽㈠嵎鍙�', title: '閽㈠嵎鍙�', width: 200, sort: true }
-                         , { field: '鐑鐞嗗彿', title: '鐑鐞嗗彿', width: 200, sort: true }
+                         , { field: '鏉$爜鐘舵��', title: '鏉$爜鐘舵��', width: 200, sort: true }
                          , { field: '鍘傚晢', title: '鍘傚晢', width: 200, sort: true }
                          , { field: '鎹嗗寘鍙�', title: '鎹嗗寘鍙�', width: 200, sort: true }
                          , { field: '鐢熶骇鏃ユ湡', title: '鐢熶骇鏃ユ湡', width: 200, templet: "<div>{{d.鐢熶骇鏃ユ湡 ==null ?'':layui.util.toDateString(d.鐢熶骇鏃ユ湡, 'yyyy-MM-dd HH:mm:ss}}</div>", sort: true }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html"
index e4b61ed..10938a3 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html"
@@ -149,7 +149,7 @@
             var HSourceID = sessionStorage["HSourceID"];//鐢熶骇璧勬簮
             //#endregion
             //#region 杩涘叆椤甸潰鏃㈠姞杞�
-           
+
             // 杞挱鍥�
             var ins = carousel.render({
                 elem: '#test1'
@@ -194,7 +194,7 @@
             //缁撴潫鎾斁瑙嗛
             video.addEventListener("pause", (event) => {
                 $('#test1').css('opacity', 1);
-            });          
+            });
 
             //#region 鍒ゆ柇鎿嶄綔绫诲瀷(杩欓噷娌$敤鍒�)
             if (OperationType == 1 || OperationType == 2) {//鏃犳簮鏂板
@@ -206,7 +206,7 @@
             else if (OperationType == 5) {//鏌ョ湅
                 HMaterID = params[params[1]]; //鐗╂枡ID
                 HSourceNo = params[params[2]]; //宸ュ崟鍙�
-                HSourceEntryID = params[params[3]]; //婧愬崟瀛愬唴鐮�      
+                HSourceEntryID = params[params[3]]; //婧愬崟瀛愬唴鐮�
                 get_SopFile(HMaterID, HSourceNo);
                 return;
             }
@@ -276,14 +276,15 @@
                         set_LoadAgain();
                         if (document.getElementById("auto").innerHTML === "鑷姩鎾斁") {
                             clearInterval(timer); //鏆傚仠鍛ㄦ湡鍑芥暟
-                        }}, 120000) //姣忛殧涓ゅ垎閽熸墽琛屼竴娆�
+                        }
+                    }, 120000) //姣忛殧涓ゅ垎閽熸墽琛屼竴娆�
                     num = 1;
                 } else if (document.getElementById("auto").innerHTML = "鎵嬪姩鎾斁" && num == 0) {
                     //ins.reload({ autoplay: false }) //杞挱鍥炬挱鏀炬柟寮忔敼涓烘墜鍔ㄦ挱鏀�
                     document.getElementById("auto").innerHTML = "鑷姩鎾斁";
                 }
             });
-             //#endregion
+            //#endregion
 
             //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛� 锛堣繖閲屾病鐢ㄥ埌锛�
             //澶村伐鍏锋爮浜嬩欢
@@ -294,10 +295,10 @@
                         break;
                 }
             });
-            //#endregion          
-            
             //#endregion
-            
+
+            //#endregion
+
             //#region 鏍规嵁鐗╂枡鍔犺浇鍥剧墖
             function get_SopFile(HMaterID, HSourceNo) {
                 var wait = layer.load();//閬僵
@@ -322,13 +323,13 @@
                                 if (data1.data[i].鏂囦欢绫诲瀷 == '.jpeg' || data1.data[i].鏂囦欢绫诲瀷 == '.jpg') {
                                     var FileName = data1.data[i].鏂囦欢鍚嶇О;
                                     //html += '<img src=`../../../Files/${FileName}` style="width:100%;height:100%">'
-                                    html += '<div><img src=../../../Files/' + FileName + ' alt="" style="width:100%;height:100%"></div>'
+                                    html += '<div><img src=../SOP浣滀笟鎸囧涔�/' + FileName + ' alt="" style="width:100%;height:100%"></div>'
                                     $("#file").append(html);
                                 }
                                 if (data1.data[i].鏂囦欢绫诲瀷 == '.pdf') {
                                     var FileName2 = data1.data[i].鏂囦欢鍚嶇О;
                                     //<embed src="Test PDF.pdf" type="application/pdf" style="width:100%;height:100%" internalinstanceid="81" />
-                                    html += '<div><embed src="../../../Files/' + FileName2 + '"' + ' type="application/pdf" style="width:100%;height:100%"  internalinstanceid="81" /></div>'
+                                    html += '<div><embed src="../SOP浣滀笟鎸囧涔�/' + FileName2 + '"' + ' type="application/pdf" style="width:100%;height:100%"  internalinstanceid="81" /></div>'
                                     $("#file").append(html);
                                 }
                             }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
index f34d79b..a939394 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
@@ -247,7 +247,7 @@
             var yyyy = myDate.getFullYear();
             var MM = myDate.getMonth() + 1;
             var dd = myDate.getDate();
-            var SumMonth = 31; //鍔ㄦ�佷袱鏈堜箣宸� new Date(yyyy, MM, 0).getDate()
+            var SumMonth = new Date(yyyy, MM, 0).getDate(); //鍔ㄦ�佷袱鏈堜箣宸� new Date(yyyy, MM, 0).getDate()
             var dateHQty = 0;
             var SumHQty = 0;//鎷嗗崟鏁伴噺
 
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
index bc0b58e..b59284a 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
@@ -124,6 +124,18 @@
                                                                     </div>
                                                                 </div>
                                                             </div>
+                                                            <div class="layui-inline">
+                                                                <label class="layui-form-label">瀵瑰簲鐝粍</label>
+                                                                <div class="layui-input-inline">
+                                                                    <div class="layui-input-inline">
+                                                                        <input type="text" name="HGroupName" id="HGroupName" readonly class="layui-input" value="" style="float:left;width:150px;">
+                                                                        <input type="text" name="HGroupID" id="HGroupID" value="0" hidden>
+                                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHGroup" style="width:40px;">
+                                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                                        </button>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
                                                         </div>
                                                         <div class="layui-form-item">
                                                             <div class="layui-inline">
@@ -145,6 +157,18 @@
                                                                         <input type="text" name="HSecManager" id="HSecManager" readonly class="layui-input" value="" style="float:left;width:150px;">
                                                                         <input type="text" name="HSecManagerID" id="HSecManagerID" value="0" hidden>
                                                                         <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerList" 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-inline">
+                                                                <label class="layui-form-label">瀵瑰簲鐢熶骇璧勬簮</label>
+                                                                <div class="layui-input-inline">
+                                                                    <div class="layui-input-inline">
+                                                                        <input type="text" name="HSourceName" id="HSourceName" readonly class="layui-input" value="" style="float:left;width:150px;">
+                                                                        <input type="text" name="HSourceID" id="HSourceID" value="0" hidden>
+                                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHSource" style="width:40px;">
                                                                             <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                                         </button>
                                                                     </div>
@@ -211,6 +235,18 @@
                                                                         <input type="text" name="HSupName" id="HSupName" readonly class="layui-input" value="" style="float:left;width:150px;">
                                                                         <input type="text" name="HSupID" id="HSupID" value="0" hidden>
                                                                         <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
+                                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                                        </button>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                            <div class="layui-inline">
+                                                                <label class="layui-form-label">瀵瑰簲宸ュ簭</label>
+                                                                <div class="layui-input-inline">
+                                                                    <div class="layui-input-inline">
+                                                                        <input type="text" name="HProcName" id="HProcName" readonly class="layui-input" value="" style="float:left;width:150px;">
+                                                                        <input type="text" name="HProcID" id="HProcID" value="0" hidden>
+                                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHProc" style="width:40px;">
                                                                             <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                                         </button>
                                                                     </div>
@@ -367,6 +403,21 @@
             //琛ㄥご淇℃伅  渚涘簲鍟嗗脊绐�
             form.on('submit(HSupList)', function () {
                 Gy_Supplier();
+            });
+
+            //琛ㄥご淇℃伅  宸ュ簭
+            form.on('submit(btnHProc)', function () {
+                btnHProc();
+            });
+
+            //琛ㄥご淇℃伅  鐝粍
+            form.on('submit(btnHGroup)', function () {
+                btnHGroup();
+            });
+
+            //琛ㄥご淇℃伅  鐢熶骇璧勬簮
+            form.on('submit(btnHSource)', function () {
+                btnHSource();
             });
 
 
@@ -696,6 +747,93 @@
                 });
             }
 
+            //宸ュ簭鍒楄〃
+            function btnHProc() {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '宸ュ簭鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../../views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.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('璇烽�夋嫨鏁版嵁');
+                        }
+
+                        $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
+                        $("#HProcID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                });
+            }
+
+            //鐝粍鍒楄〃
+            function btnHGroup() {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鐝粍鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../../views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.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('璇烽�夋嫨鏁版嵁');
+                        }
+
+                        $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
+                        $("#HGroupID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                });
+            }
+
+            //鐢熶骇璧勬簮鍒楄〃
+            function btnHSource() {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鐢熶骇璧勬簮鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../../views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.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('璇烽�夋嫨鏁版嵁');
+                        }
+
+                        $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
+                        $("#HSourceID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                });
+            }
+            
             //缂栬緫鑾峰彇琛ㄥご淇℃伅
             function set_EditFromGrid(linterid)
             {
@@ -735,6 +873,12 @@
                                 , "HCloudUserName": data.瀵瑰簲CLOUD璐﹀彿
                                 , "HCloudUserPsd": data.HCloudUserPsd
                                 , "HOrgID": data.HUSEORGID
+                                , "HProcID": data.HProcID
+                                , "HProcName": data.宸ュ簭
+                                , "HGroupID": data.HGroupID
+                                , "HGroupName": data.鐝粍
+                                , "HSourceID": data.HSourceID
+                                , "HSourceName": data.鐢熶骇璧勬簮
                             });
 
                         } else {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html"
index c8bbfd7..6c89ed9 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html"
@@ -23,107 +23,101 @@
                     <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                         <div class="layui-card-header">
                             <div class="layui-btn-group">
-
                                 <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
                                 <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
-
-
                             </div>
-
                         </div>
                         <div class="layui-card-body">
                             <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
                                 <!--<ul class="layui-tab-title">
-                                <li class="layui-this">鍩烘湰淇℃伅</li>-->
+            <li class="layui-this">鍩烘湰淇℃伅</li>-->
                                 <!--<li>鍏朵粬淇℃伅</li>-->
                                 <!--</ul>-->
                                 <h1 style="text-align:center;"><b>璁惧鐐规璁″垝鍗�</b></h1>
                                 <div class="layui-tab-content">
                                     <div class="layui-tab-item layui-show">
-                                        <div class="layui-form-item">
+                                        <div class="layui-row">
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">鍗曟嵁鍙�</label>
-                                                <div class="layui-input-inline">
-                                                    <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo">
-                                                    <input id="HInterID" name="HInterID" type="hidden" />
+                                                <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+                                                <div class="layui-input-block" style="margin-left: 120px;">
+                                                    <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                    <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
                                                     <input id="HMaker" name="HMaker" type="hidden" /><!--鍒跺崟浜�-->
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">鏃ユ湡</label>
-                                                <div class="layui-input-inline">
+                                                <label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
+                                                <div class="layui-input-block" style="margin-left: 120px;">
                                                     <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">
+                                                <label class="layui-form-label" style="width: 85px;">鐐规鍛ㄦ湡</label>
+                                                <div class="layui-input-block" style="margin-left: 120px;">
+                                                    <input type="text" class="layui-input" name="HCheckCycle" lay-verify="HCheckCycle" id="HCheckCycle">
                                                 </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="HEquipName" id="HEquipName" class="layui-input" value="" style="float:left;width:150px;">
-                                                    <input type="hidden" name="HEquipID" id="HEquipID" class="layui-input" value="" style="float:left;width:150px;">
-                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HEquipList" 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-form-item">
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label">鍛ㄦ湡鍗曚綅</label>
-                                                <div class="layui-input-inline">
+                                                <label class="layui-form-label" style="width: 85px;">鍛ㄦ湡鍗曚綅</label>
+                                                <div class="layui-input-block" style="margin-left: 120px;width: 185px;" ">
                                                     <select name="HCycleUnit" lay-filter="aihao" id="HCycleUnit">
                                                         <option value="澶�">澶�</option>
                                                         <option value="鏈�">鏈�</option>
-                                                        <option value="鍛�">鍛�</option>
                                                     </select>
                                                 </div>
                                             </div>
+                                            <div class="layui-inline" style="display:none;">
+                                                <label class="layui-form-label" style="width: 85px;">鍐呴儴鍗曟嵁鍙�</label>
+                                                <div class="layui-input-block" style="margin-left: 120px;">
+                                                    <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-row" style="margin-top:10px;">
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">淇濆吇鍛ㄦ湡</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HCheckCycle" id="HCheckCycle" class="layui-input" value="0">
+                                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璁惧</label>
+                                                <div class="layui-input-block" style="margin-left: 77px;">
+                                                    <input type="text" class="layui-input" lay-verify="HEquipName" name="HEquipName" id="HEquipName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                    <input type="hidden" name="HEquipID" id="HEquipID" lay-verify="HEquipID" value="0">
+                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HEquipList" id="HEquipList" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                    </button>
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">璁″垝寮�濮嬫棩鏈�</label>
-                                                <div class="layui-input-inline">
+                                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐐规瑙勭▼</label>
+                                                <div class="layui-input-block" style="margin-left: 77px;">
+                                                    <input type="text" class="layui-input" lay-verify="HMouldDotCheckRuleName" name="HMouldDotCheckRuleName" id="HMouldDotCheckRuleName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                    <input type="hidden" name="HMouldDotCheckRuleID" id="HMouldDotCheckRuleID" lay-verify="HMouldDotCheckRuleID" value="0">
+                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMouldDotCheckRule" id="btnHMouldDotCheckRule" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                    </button>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 85px;">璁″垝寮�濮嬫棩鏈�</label>
+                                                <div class="layui-input-block" style="margin-left: 120px;">
                                                     <input class="layui-input" name="HBeginDate" id="HBeginDate" 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">
+                                                <label class="layui-form-label" style="width: 85px;">璁″垝缁撴潫鏃ユ湡</label>
+                                                <div class="layui-input-block" style="margin-left: 120px;">
                                                     <input class="layui-input" name="HEndDate" id="HEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="layui-form-item">
+                                        <div class="layui-row" style="margin-top:10px;">
                                             <div class="layui-inline">
-                                                <label class="layui-form-label" style="width:95px;">鍣ㄥ叿鐐规瑙勭▼<label style="color:red"> * </label></label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HMouldDotCheckRuleName" id="HMouldDotCheckRuleName" class="layui-input" value="" style="float:left;width:150px;">
-                                                    <input type="hidden" name="HMouldDotCheckRuleID" id="HMouldDotCheckRuleID" class="layui-input" value="" style="float:left;width:150px;">
-                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHMouldDotCheckRule" style="width:40px;">
-                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                    </button>
+                                                <label class="layui-form-label" style="width: 85px;">鎽樿</label>
+                                                <div class="layui-input-block" style="margin-left: 120px;">
+                                                    <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation" style="width:493px;"></textarea>
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">鎽樿</label>
-                                                <div class="layui-input-inline">
-                                                    <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
-                                                </div>
-                                            </div>
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label">澶囨敞</label>
-                                                <div class="layui-input-inline">
-                                                    <textarea placeholder="璇疯緭鍏ュ娉�" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+                                                <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
+                                                <div class="layui-input-block" style="margin-left: 120px;">
+                                                    <textarea placeholder="璇疯緭鍏ュ娉�" class="layui-textarea" name="HRemark" id="HRemark" style="width:493px;"></textarea>
                                                 </div>
                                             </div>
                                         </div>
@@ -131,8 +125,22 @@
                                 </div>
                             </div>
                         </div>
-
-                        <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                        <div class="layui-tab layui-tab-card">
+                            <ul class="layui-tab-title">
+                                <li class="layui-this">鐐规椤圭洰</li>
+                                <li>鐐规璁″垝</li>
+                            </ul>
+                            <div class="layui-tab-content">
+                                <div class="layui-tab-item layui-show">
+                                    <!--鐐规椤圭洰-->
+                                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                                </div>
+                                <div class="layui-tab-item">
+                                    <!--鐐规璁″垝-->
+                                    <table class="layui-hide" id="mainTable_plan" lay-filter="mainTable_plan"></table>
+                                </div>                                
+                            </div>
+                        </div>                        
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
 
@@ -182,6 +190,7 @@
                 , laydate = layui.laydate
                 , element = layui.element;
             var option;
+            var option_plan;
             var sBillType = "3904";
             //var TabRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" };
 
@@ -248,32 +257,32 @@
                 var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
                 if (AllowLoadData(sSubStr)) {
                     $.ajax({
-                            type: "POST",
-                            url: GetWEBURL() + "/Sb_EquipDotCheckPlanBill/SaveEquipDotCheckPlanBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            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);
+                        type: "POST",
+                        url: GetWEBURL() + "/Sb_EquipDotCheckPlanBill/SaveEquipDotCheckPlanBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        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);
+                        }
+                    });
                 }
             });
             //琛ㄥご淇℃伅璁惧寮圭獥
@@ -337,6 +346,11 @@
                         console.log(checkStatus);
                         $("#HMouldDotCheckRuleName").val(checkStatus.data[0].鍗曟嵁鍙�);
                         $("#HMouldDotCheckRuleID").val(checkStatus.data[0].hmainid);
+                        $("#HCycleUnit").val(checkStatus.data[0].鍛ㄦ湡鍗曚綅);
+                        $("#HCheckCycle").val(checkStatus.data[0].鐐规鍛ㄦ湡);
+                        //$("#HBeginDate").val(Pub_Format(checkStatus.data[0].璁″垝寮�濮嬫棩鏈�, "yyyy-MM-dd"));
+                        //$("#HEndDate").val(Pub_Format(checkStatus.data[0].璁″垝缁撴潫鏃ユ湡, "yyyy-MM-dd"));
+                        form.render('select');
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                         get_DocCheckItem2(checkStatus.data[0].hmainid);
                     }
@@ -362,7 +376,7 @@
             }
             //鍒濆鍖栬〃鏍�
             function set_InitGrid() {
-                //琛ㄥご
+                //鐐规椤圭洰
                 columns = [
                     { type: 'checkbox', fixed: 'left' }
                     , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
@@ -385,6 +399,31 @@
                     , cellMinWidth: 120
                     , height: 500
                     , cols: [columns]
+                    , done: function (res, curr, count) {
+
+                    }
+                };
+
+                //鐐规璁″垝
+                columns_plan = [
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, event: "qwe" }
+                    , { field: 'HPlanDate', title: '璁″垝鏃ユ湡' }
+                    , { field: 'HPlanBeginTime', title: '璁″垝寮�濮嬫椂闂寸偣' }
+                    , { field: 'HPlanEndTime', title: '璁″垝缁撴潫鏃堕棿鐐�' }
+                    , { field: 'HRelationFlag', title: '鍏宠仈鏍囪' }
+                    , { field: 'DiffDate', title: '鐩稿樊闂撮殧' }
+                ];
+                option_plan = {
+                    id: 'mainTable_plan'
+                    , elem: '#mainTable_plan'
+                    , toolbar: '#toolbarDemo'
+                    , page: true
+                    , limit: 500
+                    , limits:[50,200,500,1000,3000]
+                    , cellMinWidth: 120
+                    , height: 500
+                    , cols: [columns_plan]
                     , done: function (res, curr, count) {
 
                     }
@@ -423,6 +462,11 @@
                 set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
                 option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
                 table.render(option);
+
+
+                set_EditGrid_Plan(linterid);  //缂栬緫鑾峰彇琛ㄤ綋--鐐规璁″垝
+                option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HRelationFlag": "鏈偣妫�","DiffDate":0 }];
+                table.render(option_plan);
             }
 
             // 鐐规淇℃伅
@@ -431,23 +475,23 @@
                     url: GetWEBURL() + "/Sb_EquipDotCheckRuleBill/Sb_EquipDotCheckRuleBillListProjectDetai",
                     type: "GET",
                     async: false,
-                    data: { "sqlWhere": "and hmainid=" + data  },
+                    data: { "sqlWhere": "and hmainid=" + data },
                     success: function (result) {
                         if (result != null) {
                             if (result.count == 1) {
-                                var BYData = result.data;//鐐规
+                                var DJData = result.data;//鐐规
                                 var rowdate1 = layui.table.cache["mainTable"];
                                 option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
                                 table.render(option);
 
-                                if (BYData.length != 0)  //琛ㄤ綋鏁版嵁涓嶄负绌烘椂
+                                if (DJData.length != 0)  //琛ㄤ綋鏁版嵁涓嶄负绌烘椂
                                 {
                                     buttonArr = [];//娓呯┖鏁扮粍
-                                    for (var i = 0; i < BYData.length; i++) {
+                                    for (var i = 0; i < DJData.length; i++) {
                                         var checkrow = {
-                                            "HDotCheckItemID": BYData[i].HDotCheckItemID, "HDotCheckCode": BYData[i].鐐规椤圭洰浠g爜, "HDotCheckItem": BYData[i].HDotCheckItem, "HDotCheckPart": BYData[i].HDotCheckPart,
-                                            "HClaim": BYData[i].HClaim, "HManagerID": BYData[i].HManagerID, "HManagerCode": BYData[i].HManagerNumber,
-                                            "HManagerName": BYData[i].HManagerName, "HRemark": BYData[i].HRemark
+                                            "HDotCheckItemID": DJData[i].鐐规椤圭洰ID, "HDotCheckCode": DJData[i].鐐规椤圭洰浠g爜, "HDotCheckItem": DJData[i].鐐规椤圭洰, "HDotCheckPart": DJData[i].鐐规閮ㄤ綅,
+                                            "HClaim": DJData[i].鍏蜂綋瑕佹眰, "HManagerID": DJData[i].璐熻矗浜篒D, "HManagerCode": DJData[i].璐熻矗浜轰唬鐮�,
+                                            "HManagerName": DJData[i].璐熻矗浜�, "HRemark": DJData[i].瀛愬娉�
                                         };
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
@@ -486,8 +530,8 @@
                                 , "HEquipID": data.璁惧ID
                                 , "HCycleUnit": data.鍛ㄦ湡鍗曚綅
                                 , "HCheckCycle": data.鐐规鍛ㄦ湡
-                                , "HBeginDate": data.寮�濮嬫棩鏈�
-                                , "HEndDate": data.缁撴潫鏃ユ湡
+                                , "HBeginDate": formatDate(data.寮�濮嬫棩鏈�)
+                                , "HEndDate": formatDate(data.缁撴潫鏃ユ湡)
                                 , "HExplanation": data.鎽樿
                                 , "HRemark": data.琛ㄥご澶囨敞
                                 , "HMouldDotCheckRuleID": data.HMouldDotCheckRuleID
@@ -502,7 +546,7 @@
                     }
                 });
             }
-            // 缂栬緫鑾峰彇琛ㄤ綋
+            // 缂栬緫鑾峰彇琛ㄤ綋--鐐规椤圭洰
             function set_EditGrid(linterid) {
                 $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
                 //缂栬緫鍔犺浇鏁版嵁
@@ -516,6 +560,40 @@
                         if (result.count == 1) {
                             option.data = result.data;
                             table.render(option);
+
+                        } else {
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(index0);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            // 缂栬緫鑾峰彇琛ㄤ綋--鐐规璁″垝
+            function set_EditGrid_Plan(linterid) {
+                $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+                //缂栬緫鍔犺浇鏁版嵁
+                $.ajax({
+                    url: GetWEBURL() + 'Sb_EquipDotCheckPlanBill/GetPlanList',
+                    type: "GET",
+                    data: { "sqlWhere": "and hmainid=" + linterid },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            var rowdata = [];
+                            var data = result.data;
+                            for (let i = 0; i < data.length; i++) {
+                                rowdata.push(
+                                    {
+                                        "HPlanDate": Pub_Format(data[i].璁″垝鏃ユ湡, "yyyy-MM-dd"), "HPlanBeginTime": Pub_Format(data[i].璁″垝寮�濮嬫椂闂寸偣, "yyyy-MM-dd hh:mm:ss"), "HPlanEndTime": Pub_Format(data[i].璁″垝缁撴潫鏃堕棿鐐�, "yyyy-MM-dd hh:mm:ss")
+                                        , "HRelationFlag": data[i].鍏宠仈鏍囪, "DiffDate": data[i].鐩稿樊闂撮殧
+                                    }
+                                )
+                            }
+
+                            option_plan.data = rowdata;
+                            table.render(option_plan);
 
                         } else {
                             layer.alert(result.code + result.Message, { icon: 5 });
@@ -598,12 +676,12 @@
                             layer.open({
                                 type: 2,
                                 skin: 'layui-layer-rim', //鍔犱笂杈规
-                                title: '鐗╂枡鍒楄〃',
+                                title: '鐐规椤圭洰鍒楄〃',
                                 closeBtn: 1,
                                 shift: 2,
                                 area: ['90%', '90%'],
                                 maxmin: true,
-                                content: ['../PublicPage/CheckItemInformation.html', 'yes'],
+                                content: ['../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckList.html', 'yes'],
                                 btn: ['纭畾', '鍙栨秷']
                                 , btn1: function (index, layero) {
                                     //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -615,8 +693,9 @@
                                     //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
                                     obj.update({
                                         HDotCheckItemID: checkStatus.data[0].HItemID,
-                                        HDotCheckCode: checkStatus.data[0].HNumber,
-                                        HDotCheckItem: checkStatus.data[0].HName
+                                        HDotCheckItem: checkStatus.data[0].鐐规椤圭洰鍚嶇О,
+                                        HDotCheckCode: checkStatus.data[0].鐐规椤圭洰浠g爜,
+                                        //HDotCheckPart: checkStatus.data[0].鐐规閮ㄤ綅
                                     });
                                     layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                                 }
@@ -691,7 +770,7 @@
 
                     }
                 }
-               return Result;
+                return Result;
             }
             //閿欒淇℃伅
             function f_alert(sMsg) {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
index 9321e4a..118338e 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
@@ -136,6 +136,7 @@
                             <ul class="layui-tab-title">
                                 <li class="layui-this">淇濆吇椤逛俊鎭�</li>
                                 <li>閰嶄欢淇℃伅</li>
+                                <li>淇濆吇璁″垝</li>
                             </ul>
                             <div class="layui-tab-content">
                                 <div class="layui-tab-item layui-show">
@@ -143,6 +144,10 @@
                                 </div>
                                 <div class="layui-tab-item">
                                     <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+                                </div>
+                                <div class="layui-tab-item">
+                                    <!--淇濆吇璁″垝-->
+                                    <table class="layui-hide" id="mainTable_plan" lay-filter="mainTable_plan"></table>
                                 </div>
                             </div>
                         </div>
@@ -212,6 +217,7 @@
             //鏌ヨ鏉′欢
             var option = [];//淇濆吇
             var option1 = [];//閰嶄欢
+            var option_plan = [];//璁″垝
             var sBillType = "3902";
             //var TabRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " };//淇濆吇
             //var TabRow1 = { "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "", "HRemark": "" };//閰嶄欢
@@ -446,6 +452,7 @@
             function set_InitGrid() {
                 Table();  //淇濆吇椤瑰垪琛�
                 Table1();  //閰嶄欢椤瑰垪琛�
+                Table3(); //淇濆吇璁″垝
             }
             //鍒濆鍖栦繚鍏婚」鍒楄〃
             function Table() {
@@ -510,6 +517,33 @@
                     }
                 };
             }
+            //鍒濆鍖栦繚鍏昏鍒掑垪琛�
+            function Table3() {
+                //鐐规璁″垝
+                columns_plan = [
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, event: "qwe" }
+                    , { field: 'HPlanDate', title: '璁″垝鏃ユ湡' }
+                    , { field: 'HPlanBeginTime', title: '璁″垝寮�濮嬫椂闂寸偣' }
+                    , { field: 'HPlanEndTime', title: '璁″垝缁撴潫鏃堕棿鐐�' }
+                    , { field: 'HRelationFlag', title: '鍏宠仈鏍囪' }
+                    , { field: 'DiffDate', title: '鐩稿樊闂撮殧' }
+                ];
+                option_plan = {
+                    id: 'mainTable_plan'
+                    , elem: '#mainTable_plan'
+                    , toolbar: '#toolbarDemo'
+                    , page: true
+                    , limit: 500
+                    , limits: [50, 200, 500, 1000, 3000]
+                    , cellMinWidth: 120
+                    , height: 500
+                    , cols: [columns_plan]
+                    , done: function (res, curr, count) {
+
+                    }
+                };
+            }
             //鏃犳簮鍗曟柊澧�
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
@@ -545,8 +579,13 @@
                 set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
                 option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
                 table.render(option);
+
                 option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "0", "HRemark": "" }];
                 table.render(option1);
+
+                set_EditGrid_Plan(linterid);  //缂栬緫鑾峰彇琛ㄤ綋--鐐规璁″垝
+                option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HRelationFlag": "鏈偣妫�", "DiffDate": 0 }];
+                table.render(option_plan);
             }
             //缂栬緫鑾峰彇琛ㄥご
             function set_EditForm(linterid) {
@@ -669,6 +708,40 @@
                 })
             }
 
+            // 缂栬緫鑾峰彇琛ㄤ綋--鐐规璁″垝
+            function set_EditGrid_Plan(linterid) {
+                $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+                //缂栬緫鍔犺浇鏁版嵁
+                $.ajax({
+                    url: GetWEBURL() + 'Sb_EquipMaintainPlanBill/GetPlanList',
+                    type: "GET",
+                    data: { "sqlWhere": "and hmainid=" + linterid },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            var rowdata = [];
+                            var data = result.data;
+                            for (let i = 0; i < data.length; i++) {
+                                rowdata.push(
+                                    {
+                                        "HPlanDate": Pub_Format(data[i].璁″垝鏃ユ湡, "yyyy-MM-dd"), "HPlanBeginTime": Pub_Format(data[i].璁″垝寮�濮嬫椂闂寸偣, "yyyy-MM-dd hh:mm:ss"), "HPlanEndTime": Pub_Format(data[i].璁″垝缁撴潫鏃堕棿鐐�, "yyyy-MM-dd hh:mm:ss")
+                                        , "HRelationFlag": data[i].鍏宠仈鏍囪, "DiffDate": data[i].鐩稿樊闂撮殧
+                                    }
+                                )
+                            }
+
+                            option_plan.data = rowdata;
+                            table.render(option_plan);
+
+                        } 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),
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
index a79e066..5534b0f 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
@@ -242,12 +242,12 @@
                             layer.open({
                                 type: 2,
                                 skin: 'layui-layer-rim', //鍔犱笂杈规
-                                title: '鐗╂枡鍒楄〃',
+                                title: '鐐规椤圭洰鍒楄〃',
                                 closeBtn: 1,
                                 shift: 2,
                                 area: ['90%', '90%'],
                                 maxmin: true,
-                                content: ['../../PublicPage/CheckItemInformation.html', 'yes'],
+                                content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckList.html', 'yes'],
                                 btn: ['纭畾', '鍙栨秷']
                                 , btn1: function (index, layero) {
                                     //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -259,7 +259,7 @@
                                     //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
                                     obj.update({
                                         HDotCheckItemID: checkStatus.data[0].HItemID,
-                                        HDotCheckItem: checkStatus.data[0].HName
+                                        HDotCheckItem: checkStatus.data[0].鐐规椤圭洰鍚嶇О
                                     });
                                     layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                                 }
@@ -277,7 +277,7 @@
                             layer.open({
                                 type: 2,
                                 skin: 'layui-layer-rim', //鍔犱笂杈规
-                                title: '鐗╂枡鍒楄〃',
+                                title: '璐熻矗浜哄垪琛�',
                                 closeBtn: 1,
                                 shift: 2,
                                 area: ['90%', '90%'],
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index 1efd432..13fb9a4 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -797,25 +797,32 @@
                     type: "GET",
                     data: { "HInterID": linterid, "HEntryID": HICMOEntryID, "HBillType": HSouceBillType },
                     success: function (result) {
-                        var data = result.data[0];
-                        if (result.count == 1) {
-                            $("#HProcExchBillNo").val(data.HProcExchBillNo);
-                            $("#HProcExchInterID").val(data.HProcExchInterID);
-                            $("#HProcExchEntryID").val(data.HProcExchEntryID);
-                            $("#HProcExchQty").val(data.HProcExchQty);
-                            $("#HICMOBillNo").val(data.HICMOBillNo);
-                            $("#HICMOInterID").val(data.HICMOInterID);
-                            $("#HICMOQty").val(data.HICMOQty);
-                            $("#HSourceName").val(data.HSourceName);
-                            $("#HSourceID").val(data.HSourceID);
-                            $("#HMaterID").val(data.HMaterID);
-                            $("#HMainSourceBillNo").val("");
-                            $("#HMainSourceBillType").val(data.HBillType);
-                            $("#HMainSourceInterID").val(data.HInterID);
-                            $("#HICMOEntryID").val(HICMOEntryID);
-                        } else {
-                            layer.alert(result.Message, { icon: 5 });
-                        }
+                        if (result.code == 1) {
+                            var data = result.data[0];
+                            if (result.count == 1) {
+                                $("#HProcExchBillNo").val(data.HProcExchBillNo);
+                                $("#HProcExchInterID").val(data.HProcExchInterID);
+                                $("#HProcExchEntryID").val(data.HProcExchEntryID);
+                                $("#HProcExchQty").val(data.HProcExchQty);
+                                $("#HICMOBillNo").val(data.HICMOBillNo);
+                                $("#HICMOInterID").val(data.HICMOInterID);
+                                $("#HICMOQty").val(data.HICMOQty);
+                                $("#HSourceName").val(data.HSourceName);
+                                $("#HSourceID").val(data.HSourceID);
+                                $("#HMaterID").val(data.HMaterID);
+                                $("#HMainSourceBillNo").val("");
+                                $("#HMainSourceBillType").val(data.HBillType);
+                                $("#HMainSourceInterID").val(data.HInterID);
+                                $("#HICMOEntryID").val(HICMOEntryID);
+                                $("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�);
+                                $("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
+                                //鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
+                                get_CheckItem();
+                            } else {
+                                layer.alert(result.Message, { icon: 5 });
+                            }
+                        } 
+                        
                         layer.close(wait);
                     }, error: function () {
                         layer.close(wait);
@@ -1215,7 +1222,7 @@
                         return;
                     }
 
-                    if (sSubTable[i].HSampleSchemeID == '') {
+                    if (sSubTable[i].HSampleSchemeID == '' || sSubTable[i].HSampleSchemeID == null) {
                         sSubTable[i].HSampleSchemeID = 0
                     }
                     if (sSubTable[i].HSampleQty == '' || sSubTable[i].HSampleQty == null) {
@@ -3351,49 +3358,49 @@
 
             //妫�楠屽�间繚瀛�
             function set_SaveValue(dataindex) {
-                if (OperationType == 3) {
-                    EchoValue();
-                }
+                //if (OperationType == 3) {
+                //    EchoValue();
+                //}
 
-                for (let i = 0; i < table.cache['ValueTable'].length; i++) {
-                    if (table.cache['ValueTable'][i].HInSpectValueB == "" || table.cache['ValueTable'][i].HInSpectValueB == null) {
-                        table.cache['ValueTable'][i].HInSpectValueB = 0
-                    }
-                    if (table.cache['ValueTable'][i].HInSpectValueT == "" || table.cache['ValueTable'][i].HInSpectValueT == null) {
-                        table.cache['ValueTable'][i].HInSpectValueT = 0
-                    }
-                    if (table.cache['ValueTable'][i].HInSpectValue == "" || table.cache['ValueTable'][i].HInSpectValue == null) {
-                        table.cache['ValueTable'][i].HInSpectValue = 0
-                    }
-                }
-                var sValueTable = JSON.stringify(table.cache['ValueTable']);
-                var HInterID = $("#HInterID").val();
-                var HEntryID = dataindex;
+                //for (let i = 0; i < table.cache['ValueTable'].length; i++) {
+                //    if (table.cache['ValueTable'][i].HInSpectValueB == "" || table.cache['ValueTable'][i].HInSpectValueB == null) {
+                //        table.cache['ValueTable'][i].HInSpectValueB = 0
+                //    }
+                //    if (table.cache['ValueTable'][i].HInSpectValueT == "" || table.cache['ValueTable'][i].HInSpectValueT == null) {
+                //        table.cache['ValueTable'][i].HInSpectValueT = 0
+                //    }
+                //    if (table.cache['ValueTable'][i].HInSpectValue == "" || table.cache['ValueTable'][i].HInSpectValue == null) {
+                //        table.cache['ValueTable'][i].HInSpectValue = 0
+                //    }
+                //}
+                //var sValueTable = JSON.stringify(table.cache['ValueTable']);
+                //var HInterID = $("#HInterID").val();
+                //var HEntryID = dataindex;
 
-                var msg = sValueTable + ";" + HInterID + ";" + HEntryID
+                //var msg = sValueTable + ";" + HInterID + ";" + HEntryID
 
-                var index = layer.load();
-                $.ajax({
-                    type: "POST",
-                    url: GetWEBURL() + "/QC_ProcessCheckBill/set_SaveValue",
-                    async: true,
-                    data: { "msg": msg },
-                    dataType: "json",
-                    success: function (data) {
-                        if (data.count == 1) {
-                            layer.close(index);
-                            //$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳
-                        }
-                        else {
-                            layer.close(index);
-                            layer.msg("妫�楠屽�间繚瀛橀敊璇紒" + data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    },
-                    error: function (err) {
-                        layer.close(index);
-                        layer.msg("妫�楠屽�间繚瀛橀敊璇�:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    }
-                });
+                //var index = layer.load();
+                //$.ajax({
+                //    type: "POST",
+                //    url: GetWEBURL() + "/QC_ProcessCheckBill/set_SaveValue",
+                //    async: true,
+                //    data: { "msg": msg },
+                //    dataType: "json",
+                //    success: function (data) {
+                //        if (data.count == 1) {
+                //            layer.close(index);
+                //            //$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳
+                //        }
+                //        else {
+                //            layer.close(index);
+                //            layer.msg("妫�楠屽�间繚瀛橀敊璇紒" + data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //        }
+                //    },
+                //    error: function (err) {
+                //        layer.close(index);
+                //        layer.msg("妫�楠屽�间繚瀛橀敊璇�:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    }
+                //});
             }
 
             //#region銆愰殣钘忔娴嬪�煎瓧娈点��
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill - \345\244\215\345\210\266.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill - \345\244\215\345\210\266.html"
new file mode 100644
index 0000000..607530c
--- /dev/null
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill - \345\244\215\345\210\266.html"
@@ -0,0 +1,3705 @@
+锘�<!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/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/PubCustom.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>
+    <style>
+        .main-btn { /*澶撮儴涓绘寜閽�*/
+            padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+            height: 30px;
+            line-height: 30px;
+        }
+
+        .btn-title {
+            font-size: 16px;
+        }
+        /*.table-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }*/
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+                    <div style="padding: 10px;">
+                        <!--<button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                            <i class="layui-icon layui-icon-print layuiadmin-button-btn"><span class="btn-title">棰勮</span></i>
+                        </button>-->
+                        <!--<button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                            <i class="layui-icon layui-icon-edit layuiadmin-button-btn"><span class="btn-title">淇敼</span></i>
+                        </button>-->
+                        <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btn-AddNew" id="btn-AddNew">鏂板</button>
+                        <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+                        <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btn-Exit" id="btn-Exit">閫�鍑�</button>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <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" style="width: 85px;">鍗曟嵁鍙�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="date" class="layui-input" name="HDate" id="HDate" style="padding-left: 32px; width: 110%;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 100px;padding: 9px 18px;">鐢熶骇璧勬簮</label>
+                                            <div class="layui-input-block" style="margin-left: 92px;">
+                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchSource" id="btnSearchSource" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" name="HSourceID" id="HSourceID" value="0">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浠诲姟鍗曞彿</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMOBill" id="btnSearchICMOBill" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浠诲姟鍗曟暟閲�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline" style="display: none">
+                                            <label class="layui-form-label" style="width: 85px;">浠诲姟鍗曞唴鐮�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HICMOInterID" id="HICMOInterID" value="0" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" value="0">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline" id="hidediv1">
+                                            <label class="layui-form-label" style="width: 85px;">娴佽浆鍗℃暟閲�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HProcExchQty" id="HProcExchQty" style="background-color:#efefef4d;" readonly value="1">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline" id="hidediv2">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">娴佽浆鍗″彿</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProcExch" id="btnSearchProcExch" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline" id="hidediv1">
+                                            <label class="layui-form-label" style="width: 85px;">宸ュ簭</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HProcName" id="HProcName" style="background-color:#efefef4d;" readonly value="1">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline" style="display: none">
+                                            <label class="layui-form-label" style="width: 85px;">娴佽浆鍗D</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HProcExchInterID" id="HProcExchInterID" value="0" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline" style="display: none">
+                                            <label class="layui-form-label" style="width: 85px;">娴佽浆鍗″瓙ID</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HProcExchEntryID" id="HProcExchEntryID" value="0" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧鍚嶇О</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" name="HMaterName" id="HMaterName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="text" class="layui-input" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: none;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屽憳</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" name="HFirstCheckEmpName" id="HFirstCheckEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHFirstCheckEmp" id="btnSearchHFirstCheckEmp" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" name="HFirstCheckEmp" id="HFirstCheckEmp" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屾柟妗�</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" name="HQCSchemeName" id="HQCSchemeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchQCScheme" id="btnSearchQCScheme" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" name="HQCSchemeID" id="HQCSchemeID" value="0">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline" style="width: 50%;">
+                                            <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鍒ゆ柇缁撹</label>
+                                            <div class="layui-input-block">
+                                                <input type="radio" name="HLastResult" id="HLastResult" value="true" title="鍚堟牸" checked>
+                                                <input type="radio" name="HLastResult" id="HLastResult" value="false" title="涓嶅悎鏍�">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--鍒跺崟淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浣滃簾浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <!--<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>-->
+                    <div class="layui-tab layui-tab-card">
+                        <ul class="layui-tab-title">
+                            <li class="layui-this">妫�楠岄」鐩�</li>
+                            <li>鎶芥牱妫�楠�</li>
+                            <li>妫�娴嬪��</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item layui-show">
+                                <!--妫�楠岄」鐩�-->
+                                <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                            </div>
+                            <div class="layui-tab-item">
+                                <!--鎶芥牱妫�楠�-->
+                                <!--<div class="layui-row" style="margin-bottom:15px;margin-left:30px">
+                                    <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_FirstRow" id="btn_FirstRow"><span style="font-weight:bold">棣栬</span></button>
+                                    <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_PreviousRow" id="btn_PreviousRow"><i class="layui-icon layui-icon-prev"></i></button>
+                                    <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_NextRow" id="btn_NextRow"><i class="layui-icon layui-icon-next"></i></button>
+                                    <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_LastRow" id="btn_LastRow"><span style="font-weight:bold">鏈</span></button>
+                                </div>-->
+                                <div class="layui-row">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">椤圭洰搴忓彿</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="HEntryID" id="HEntryID" value="0" style="background-color:#efefef4d;" readonly>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠岄」鐩�</label>
+                                        <div class="layui-input-block" style="margin-left: 77px;">
+                                            <input type="text" class="layui-input" name="HQCCheckItemName" id="HQCCheckItemName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchCheckItemID" id="btnSearchCheckItemID" name="btnSearchCheckItemID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                            </button>
+                                            <input type="hidden" name="HQCCheckItemID" id="HQCCheckItemID" value="0">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-row" style="margin-top:5px;">
+                                    <div class="layui-inline" style="border-bottom:2px solid #9C9C9C;width:260px;margin-left:30px">
+                                        <label class="layui-form-label" style="width: 65px;height:5px;box-shadow:inset 95px 0px 5px 1px #9C9C9C;">
+                                            <span style="text-align:center;margin-right:2.8px;color:white">鎶芥牱鏂规</span>
+                                        </label>
+                                    </div>
+                                    <div class="layui-inline" style="border-bottom:2px solid #9C9C9C;width:260px;margin-left:70px">
+                                        <label class="layui-form-label" style="width: 65px;height:5px;box-shadow:inset 95px 0px 5px 1px #9C9C9C;">
+                                            <span style="text-align:center;margin-right:2.8px;color:white">鎶芥牱妫�楠�</span>
+                                        </label>
+                                    </div>
+                                </div>
+                                <div class="layui-row" style="margin-top:5px;">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鎶芥牱鏂规</label>
+                                        <div class="layui-input-block" style="margin-left: 77px;">
+                                            <input type="text" class="layui-input" name="HSampleSchemeName" id="HSampleSchemeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchCheckSampleScheme" id="btnSearchCheckSampleScheme" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                            </button>
+                                            <input type="hidden" name="HSampleSchemeID" id="HSampleSchemeID" value="0">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">鏍锋湰閲�</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="HSampleQty" id="HSampleQty" style="background-color:#efefef4d;" readonly>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">鏍锋湰鐮村潖鏁�</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="HSampleDamageQty" id="HSampleDamageQty" style="">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-row" style="margin-top:5px;">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">鎶芥牱绫诲瀷</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="HSamplingType" id="HSamplingType" style="background-color:#efefef4d;" readonly>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">鍏佽鏁�</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="HAcceptQty" id="HAcceptQty" style="background-color:#efefef4d;" value="0" readonly>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 70px;">妫�楠岀粨鏋�</label>
+                                        <div class="layui-input-block" style="margin-left: 100px;">
+                                            <input type="text" class="layui-input" name="HInspectResultToSee" id="HInspectResultToSee" value="" style="" readonly>
+                                        </div>
+                                    </div>
+                                    <!--<div class="layui-inline">
+                                        <label class="layui-form-label">妫�楠岀粨鏋�</label>
+                                        <div class="layui-input-block">
+                                            <select name="HResult" lay-filter="HResult" style="width:190px;">
+                                                <option value="鍚堟牸" selected="selected">鍚堟牸</option>
+                                                <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+                                            </select>
+                                        </div>
+                                    </div>-->
+                                </div>
+                                <div class="layui-row" style="margin-top:5px;">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">妫�楠屾按骞�</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="HInspectionLevel" id="HInspectionLevel" style="background-color:#efefef4d;" readonly>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">鎷掔粷鏁�</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="HRejectQty" id="HRejectQty" style="background-color:#efefef4d;" readonly>
+                                        </div>
+                                    </div>
+                                    <!--<div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">閲嶇偣妫�鏌�</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="checkbox" name="HKeyInspect" id="HKeyInspect" value="false" lay-skin="primary" lay-filter="HKeyInspect">
+                                        </div>
+                                    </div>-->
+                                </div>
+                                <div class="layui-row" style="margin-top:5px;">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">涓ユ牸搴�</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="HStrictness" id="HStrictness" style="background-color:#efefef4d;" readonly>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">鏍锋湰涓嶅悎鏍兼暟</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="HSampleUnRightQty" id="HSampleUnRightQty" style="" value="0">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-row" style="margin-top:5px;">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">AQL</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="HAQL" id="HAQL" style="background-color:#efefef4d;" readonly>
+                                        </div>
+                                    </div>
+                                </div>
+                                <!--<table class="layui-hide" id="samplingTable" lay-filter="samplingTable"></table>-->
+                            </div>
+                            <div class="layui-tab-item" style="height:590px">
+                                <!--妫�娴嬪��-->
+                                <!--<div class="layui-row" style="margin-bottom:15px;margin-left:30px">
+                                    <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_FirstRow" id="btn_FirstRow"><span style="font-weight:bold">棣栬</span></button>
+                                    <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_PreviousRow" id="btn_PreviousRow"><i class="layui-icon layui-icon-prev"></i></button>
+                                    <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_NextRow" id="btn_NextRow"><i class="layui-icon layui-icon-next"></i></button>
+                                    <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_LastRow" id="btn_LastRow"><span style="font-weight:bold">鏈</span></button>
+                                </div>-->
+                                <div class="left" style="width:50%;height:450px;float:left;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px;">椤圭洰搴忓彿</label>
+                                            <div class="layui-input-block" style="margin-left: 100px;">
+                                                <input type="text" class="layui-input" name="HEntryID" id="HEntryID" value="0" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px;">妫�楠岄」鐩�</label>
+                                            <div class="layui-input-block" style="margin-left: 45px;">
+                                                <input type="text" class="layui-input" name="HQCCheckItemName" id="HQCCheckItemName" style="background-color:#efefef4d;width: 53%;float:left;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchCheckItemID" id="btnSearchCheckItemID" name="btnSearchCheckItemID" style="float: left;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" name="HQCCheckItemID" id="HQCCheckItemID" value="0">
+                                            </div>
+                                        </div>                                        
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px;">鏍锋湰閲�</label>
+                                            <div class="layui-input-block" style="margin-left: 100px;">
+                                                <input type="text" class="layui-input" name="HSampleQty2" id="HSampleQty2" value="0" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px;">妫�楠岀粨鏋�</label>
+                                            <div class="layui-input-block" style="margin-left: 100px;">
+                                                <input type="text" class="layui-input" name="HInspectResultToSee2" id="HInspectResultToSee2" value="" style="" readonly>
+                                            </div>
+                                        </div>
+                                        <!--<div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px !important;">妫�楠岀粨鏋�</label>
+                                            <div class="layui-input-block" style="margin-left: 100px; width: 182px">
+                                                <select name="HInspectResult" lay-filter="HInspectResult">
+                                                    <option value="鍚堟牸" selected="selected">鍚堟牸</option>
+                                                    <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+                                                </select>
+                                            </div>
+                                        </div>-->
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px;">涓嶅悎鏍兼暟</label>
+                                            <div class="layui-input-block" style="margin-left: 100px;">
+                                                <input type="text" class="layui-input" name="HSampleUnRightQty2" id="HSampleUnRightQty2" value="0" style="">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px;">淇濈暀灏忔暟浣�</label>
+                                            <div class="layui-input-block" style="margin-left: 100px;">
+                                                <input type="text" class="layui-input" name="HResDec" id="HResDec" value="2" style="" onfocus="this.select();">
+                                            </div>
+                                        </div>
+                                        <!--<div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">閲嶇偣妫�鏌�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="checkbox" name="HKeyInspect" id="HKeyInspect2" value="false" lay-skin="primary" lay-filter="HKeyInspect">
+                                            </div>
+                                        </div>-->
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px;">
+                                        <div class="layui-inline" style="border-bottom:2px solid #9C9C9C;width:290px;margin-left:10px">
+                                            <label class="layui-form-label" style="width: 65px;height:5px;box-shadow:inset 95px 0px 5px 1px #9C9C9C;">
+                                                <span style="text-align:center;margin-right:2.8px;color:white">鎸囨爣</span>
+                                            </label>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px;">
+                                        <!--<div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px !important;">鍒嗘瀽鏂规硶</label>
+                                            <div class="layui-input-block" style="margin-left: 100px; width: 182px">
+                                                <select name="HAnalysisMethod" lay-filter="HAnalysisMethod">
+                                                    <option value="鍚堟牸" selected="selected">鍚堟牸</option>
+                                                    <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+                                                </select>
+                                            </div>
+                                        </div>-->
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px !important;">鐘舵��</label>
+                                            <div class="layui-input-block" style="margin-left: 100px; width: 182px">
+                                                <select name="HStatus" lay-filter="HStatus" id="HStatus">
+                                                    <option value="1" selected="selected">鍚堟牸</option>
+                                                    <option value="2">涓嶅悎鏍�</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px !important;">姣旇緝绗�</label>
+                                            <div class="layui-input-block" style="margin-left: 100px; width: 182px">
+                                                <select name="HComparator" lay-filter="HComparator" id="HComparator">
+                                                    <option value="=" selected="selected">=</option>
+                                                    <option value=">">></option>
+                                                    <option value=">=">>=</option>
+                                                    <option value="<"><</option>
+                                                    <option value="<="><=</option>
+                                                    <option value="<>"><></option>
+                                                    <option value="between">between</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px;">鍗曚綅</label>
+                                            <div class="layui-input-block" style="margin-left: 45px;">
+                                                <input type="text" class="layui-input" name="HUnit" id="HUnit" style="background-color:white;width: 53%;float:left;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchUnit" id="btnSearchUnit" style="float: left;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" name="HUnitID" id="HUnitID" value="0">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px;">妫�楠屽��</label>
+                                            <div class="layui-input-block" style="margin-left: 45px;">
+                                                <input type="text" class="layui-input" name="HInspectVal" id="HInspectVal" style="background-color:white;width: 53%;float:left;" onfocus="this.select();" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchInspectValB" id="btnSearchInspectValB" style="float: left;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" name="HInspectValB" id="HInspectValB" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px;">鐩爣鍊�</label>
+                                            <div class="layui-input-block" style="margin-left: 45px;">
+                                                <input type="text" class="layui-input" name="HTargetVal" id="HTargetVal" style="background-color:white;width: 53%;float:left;" onfocus="this.select();" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchTargetValB" id="btnSearchTargetValB" style="float: left;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" name="HTargetValB" id="HTargetValB" value="0">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px;">涓婇檺鍊�</label>
+                                            <div class="layui-input-block" style="margin-left: 100px;">
+                                                <input type="text" class="layui-input" name="HUpLimit" id="HUpLimit" value="0" style="background-color:#efefef4d;" onfocus="this.select();" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px;">涓嬮檺鍊�</label>
+                                            <div class="layui-input-block" style="margin-left: 100px;">
+                                                <input type="text" class="layui-input" name="HDownLimit" id="HDownLimit" value="0" style="background-color:#efefef4d;" onfocus="this.select();" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px;">涓婂亸宸�</label>
+                                            <div class="layui-input-block" style="margin-left: 100px;">
+                                                <input type="text" class="layui-input" name="HUpOffSet" id="HUpOffSet" value="0" style="background-color:#efefef4d;" onfocus="this.select();" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px;">涓嬪亸宸�</label>
+                                            <div class="layui-input-block" style="margin-left: 100px;">
+                                                <input type="text" class="layui-input" name="HDownOffSet" id="HDownOffSet" value="0" style="background-color:#efefef4d;" onfocus="this.select();" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="right" style="width:50%;height:450px;float:left;">
+                                    <table class="layui-hide" id="ValueTable" lay-filter="ValueTable"></table>
+                                </div>
+                            </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"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                        </div>
+                    </script>
+                    <!--闅愯棌瀛楁-->
+                    <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType">
+                    <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" value="0">
+                    <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" value="1">
+                    <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo">
+                </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 type="text/html" id="HResult">
+        <select name="HResult" lay-filter="HResult" id="HResult{{d.LAY_TABLE_INDEX+1}}">
+            <option value="">璇烽�夋嫨</option>
+            <option value="1">鍚堟牸</option>
+            <option value="2">涓嶅悎鏍�</option>
+        </select>
+    </script>
+    <!--琛屼笅鎷夐�夋嫨(妫�楠岀粨鏋�)-->
+    <script type="text/html" id="HInSpectResult">
+        <select name="HInSpectResult" lay-filter="HInSpectResult" id="HInSpectResult{{d.LAY_TABLE_INDEX+1}}">
+            <option value="">璇烽�夋嫨</option>
+            <option value="1">鍚堟牸</option>
+            <option value="2">涓嶅悎鏍�</option>
+        </select>
+    </script>
+    <!--琛屼笅鎷夐�夋嫨(鍒嗘瀽鏂规硶)-->
+    <script type="text/html" id="HAnalysisMethod">
+        <select name="HAnalysisMethod" lay-filter="HAnalysisMethod" id="HAnalysisMethod{{d.LAY_TABLE_INDEX+1}}">
+            <option value="">璇烽�夋嫨</option>
+            <option value="1">瀹氭�у垎鏋�</option>
+            <option value="2">瀹氶噺鍒嗘瀽</option>
+            <option value="3">鍏朵粬鍒嗘瀽</option>
+        </select>
+    </script>
+    <!--澶嶉�夋锛堥噸鐐规鏌ワ級-->
+    <script type="text/html" id="HKeyInspect">
+        <input type="checkbox" value="{{d.HKeyInspect}}" lay-skin="primary" id="HKeyInspect{{d.LAY_TABLE_INDEX+1}}" lay-filter="HKeyInspect" {{ d.HKeyInspect == 1 ? 'checked' : '' }}>
+    </script>
+    <script>
+        //鎬濊矾
+        //1.妫�楠岄」鐩〃浣撴暟鎹�煎瓨鍌紝鍊熺敤鐐瑰嚮琛屼簨浠讹紝褰撳垏鎹㈣鏃舵妸涓婃鎵�鍦ㄨ鐨勬暟鎹瓨鍒皁ption.data涓婏紱
+        //杩欎釜鎬濊矾浼氭湁涓棶棰橈紝鏈�鍚庝竴娆$偣鍑荤殑閭h鏁版嵁灏嗕笉浼氬湪鍘昏Е鍙戠偣鍑昏浜嬩欢瀛樺偍鍊硷紝鐩墠鎯冲埌鐨勬槸鍦ㄦ墽琛屼繚瀛樻柟娉曟椂鍦ㄦ妸鏈�鍚庣偣鍑荤殑閭d竴琛屾暟鎹瓨鍏ption.data涓�
+
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+            //鍏敤鍙橀噺
+            debugger;
+            var rowdata = [];
+            var option = [];
+
+            var rowdata_Value = [];
+            var option_Value = [];
+            var option_Check = [];//鐢ㄦ潵瀛樺偍妫�楠岄」鐩�
+            var Array = []; //鍏ㄥ眬鍙橀噺锛屾渶澶栭潰鐨勪竴灞傛暟缁�,瀛樺偍妫�娴嬪��
+            var checkobj = ""; //澶嶉�夋
+            var trindex = ""; //榛樿閫変腑琛屼笅鏍�
+            var SummaryIndex = []; //閫変腑琛屼笅鏍囨眹鎬�
+            var LastIndex = 0; //鏈�鍚庨�変腑涓�琛岀殑涓嬫爣
+            var isFristClick = true; //鏄惁棣栨鐐瑰嚮琛�
+            var isHavingCount = false; //妫�楠屽�艰〃鏍兼槸鍚︽湁鏁版嵁
+            var UnRightQty_isFied = 0; //鐢ㄤ簬鍒ゆ柇鏄惁鍚堟牸//妫�楠屽�艰〃鏍间笉鍚堟牸鏁伴噺姹囨��
+            var editIndex = 0;//缂栬緫涓嬫爣
+            var SampleNum = [];//鏍锋湰鏁伴噺
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            //if (sessionStorage.login != "login") {
+            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            //    }, function () { window.location.href = "../../user/login.html"; });
+            //}
+
+            var params = get_UrlVars();
+            if (typeof (params[params[0]]) == "undefined") {
+                var OperationType = 1;//鎿嶄綔绫诲瀷
+            } else {
+                var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+                var linterid = params[params[1]];//婧愬崟id
+                var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+                var HICMOEntryID = params[params[3]];//婧愬崟瀛恑d
+            }
+            /*鍥哄畾浠g爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
+            //////娴嬭瘯鐢ㄦ暟鎹�
+            //var OperationType = 2;
+            //var linterid = 11880;
+            //var HSouceBillType = 3722;
+            //var HICMOEntryID = 100027;
+            //鍒ゆ柇鏄惁鏂板
+            if (OperationType == 1) {
+                $("#HInterID").val("");
+                $("#HBillNo").val("");
+                //$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂淇濆瓨鎸夐挳绂佺敤
+                //鑾峰彇鏈�澶у崟鎹彿
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '7505' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+                        $("#HMaker").val(sessionStorage["HUserName"]);
+                    }
+                });
+            }
+            else if (OperationType == 2) {
+                $("#HInterID").val("");
+                $("#HBillNo").val("");
+                $('#btn-AddNew').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂鏂板鎸夐挳绂佺敤
+                $('#btnSearchSource').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂鐢熶骇璧勬簮鎸夐挳绂佺敤
+                $('#btnSearchICMOBill').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂浠诲姟鍗曞彿鎸夐挳绂佺敤
+                $('#btnSearchMater').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂浜у搧鍐呯爜鎸夐挳绂佺敤
+                $('#btnSearchProcExch').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂娴佽浆鍗″彿鎸夐挳绂佺敤
+                //鑾峰彇鏈�澶у崟鎹彿
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '7505' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                        $("#HMaker").val(sessionStorage["HUserName"]);
+                    }
+                });
+                //鎶ュ伐骞冲彴棣栨
+                if (HSouceBillType == 3722 || HSouceBillType == 4610) {
+                    //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
+                    LoadingInformation2();
+                }
+                //宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛ㄩ妫�
+                else if (HSouceBillType == 3790) {
+                    //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
+                    LoadingInformation_StationInBill();
+                }
+                //宸ュ簭濮斿鎺ユ敹鍗曞垪琛ㄩ妫�
+                else if (HSouceBillType == 3793) {
+                    //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
+                    LoadingInformation3();
+                }
+                //鐢熶骇璁㈠崟鍒楄〃棣栨
+                else if (HSouceBillType == 3710) {
+                    //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
+                    LoadingInformation_ICMO();
+                }
+                else {
+                    layer.alert("婧愬崟绫诲瀷鏃犳晥锛�", { icon: 5 });
+                }
+            }
+            else if (OperationType == 3) {
+                RoadBillMain(linterid);
+                //RoadBillSub(linterid);
+            }
+
+            $("[name='btnSearchCheckItemID']").addClass("layui-btn-disabled").attr("disabled", true);//绂佺敤妫�楠岄」鐩斁澶ч暅
+
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+
+            //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
+            function LoadingInformation_StationInBill() {
+                var wait = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/QC_FirstPieceCheckBill/get_StationInBill',
+                    type: "GET",
+                    data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        var data = result.data[0];
+                        if (result.count == 1) {
+                            $("#HProcExchBillNo").val(data.娴佽浆鍗″彿);
+                            $("#HProcExchInterID").val(data.HProcExchInterID);
+                            $("#HProcExchEntryID").val(data.HProcExchEntryID);
+                            $("#HProcExchQty").val(data.娴佽浆鍗℃暟閲�);
+                            $("#HICMOBillNo").val(data.浠诲姟鍗�);
+                            $("#HICMOInterID").val(data.HICMOInterID);
+                            $("#HICMOQty").val(data.HICMOQty);
+                            $("#HSourceName").val(data.鐢熶骇璧勬簮);
+                            $("#HSourceID").val(data.HSourceID);
+                            $("#HMaterID").val(data.HMaterID);
+                            $("#HMaterName").val(data.浜у搧鍚嶇О);
+                            $("#HMainSourceBillNo").val(data.鍗曟嵁鍙�);
+                            $("#HMainSourceBillType").val(data.HBillType);
+                            $("#HMainSourceInterID").val(data.HInterID);
+                            $("#HICMOEntryID").val(data.HICMOEntryID);
+                            $("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�);
+                            $("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
+                            $("#HProcName").val(data.褰撳墠宸ュ簭);
+                            //鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
+                            get_CheckItem();
+                        } else {
+                            layer.alert(result.Message, { icon: 5 });
+                        }
+                        layer.close(wait);
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅--鐢熶骇璁㈠崟
+            function LoadingInformation_ICMO() {
+                $("#hidediv1").attr({ "style": "display:none" });
+                $("#hidediv2").attr({ "style": "display:none" });
+
+                var wait = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
+                    type: "GET",
+                    data: { "sWhere": "and hmainid = " + linterid, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        var data = result.data[0];
+                        if (result.count == 1) {
+                            //$("#HProcExchBillNo").val(data.娴佽浆鍗″彿);
+                            //$("#HProcExchInterID").val(data.HProcExchInterID);
+                            //$("#HProcExchEntryID").val(data.HProcExchEntryID);
+                            //$("#HProcExchQty").val(data.娴佽浆鍗℃暟閲�);
+                            $("#HICMOBillNo").val(data.鍗曟嵁鍙�);
+                            $("#HICMOInterID").val(data.hmainid);
+                            $("#HICMOQty").val(data.鐢熶骇浠诲姟鍗曟暟閲�);
+                            $("#HSourceName").val(data.鐢熶骇璧勬簮);
+                            $("#HSourceID").val(data.HSourceID);
+                            $("#HMaterID").val(data.HMaterID);
+                            $("#HMaterName").val(data.浜у搧鍚嶇О);
+                            $("#HMainSourceBillNo").val(data.鍗曟嵁鍙�);
+                            $("#HMainSourceBillType").val(data.鍗曟嵁绫诲瀷);
+                            $("#HMainSourceInterID").val(data.hmainid);
+                            $("#HICMOEntryID").val(data.HEntryID);
+                        } else {
+                            layer.alert(result.Message, { icon: 5 });
+                        }
+                        layer.close(wait);
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅銆愭姤宸ュ彴妫�楠屻��
+            function LoadingInformation2() {
+                var wait = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "/QC_FirstPieceCheckBill/get_ICMOBillStatus_Tmp",
+                    type: "GET",
+                    data: { "HInterID": linterid, "HEntryID": HICMOEntryID, "HBillType": HSouceBillType },
+                    success: function (result) {
+                        var data = result.data[0];
+                        if (result.count == 1) {
+                            $("#HProcExchBillNo").val(data.HProcExchBillNo);
+                            $("#HProcExchInterID").val(data.HProcExchInterID);
+                            $("#HProcExchEntryID").val(data.HProcExchEntryID);
+                            $("#HProcExchQty").val(data.HProcExchQty);
+                            $("#HICMOBillNo").val(data.HICMOBillNo);
+                            $("#HICMOInterID").val(data.HICMOInterID);
+                            $("#HICMOQty").val(data.HICMOQty);
+                            $("#HSourceName").val(data.HSourceName);
+                            $("#HSourceID").val(data.HSourceID);
+                            $("#HMaterID").val(data.HMaterID);
+                            $("#HMaterName").val(data.HMaterName);
+                            $("#HMainSourceBillNo").val("");
+                            $("#HMainSourceBillType").val(data.HBillType);
+                            $("#HMainSourceInterID").val(data.HInterID);
+                            $("#HICMOEntryID").val(data.HICMOEntryID);
+                            $("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�);
+                            $("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
+
+                            //鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
+                            get_CheckItem();
+                        } else {
+                            layer.alert(result.Message, { icon: 5 });
+                        }
+                        layer.close(wait);
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
+            function LoadingInformation3() {
+                var wait = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Cj_StationEntrustOutBill/list',
+                    type: "GET",
+                    data: { "sWhere": "and HInterID = " + linterid },
+                    success: function (result) {
+                        var data = result.data[0];
+                        if (result.count == 1) {
+                            $("#HProcExchBillNo").val(data.娴佽浆鍗″彿);
+                            $("#HProcExchInterID").val(data.HProcExchInterID);
+                            $("#HProcExchEntryID").val(data.HProcExchEntryID);
+                            $("#HProcExchQty").val(data.娴佽浆鍗℃暟閲�);
+                            $("#HICMOBillNo").val(data.鐢熶骇璁㈠崟鍙�);
+                            $("#HICMOInterID").val(data.HICMOInterID);
+                            $("#HICMOQty").val(data.HICMOQty);
+                            $("#HSourceName").val(data.鐢熶骇璧勬簮);
+                            $("#HSourceID").val(data.HSourceID);
+                            $("#HMaterID").val(data.HMaterID);
+                            $("#HMaterName").val(data.浜у搧鍚嶇О);
+                            $("#HMainSourceBillNo").val(data.鍗曟嵁鍙�);
+                            $("#HMainSourceBillType").val(data.HBillType);
+                            $("#HMainSourceInterID").val(data.HInterID);
+                            $("#HICMOEntryID").val(data.HICMOEntryID);
+                        } else {
+                            layer.alert(result.Message, { icon: 5 });
+                        }
+                        layer.close(wait);
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                //鏂板琛岃〃鏍兼暟鎹�
+                var NewRow = {
+                    "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": "0", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
+                    "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
+                    "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
+                    "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
+                    "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
+                };
+
+                switch (obj.event) {
+                    case 'btn-AddLine':
+                        table.cache["mainTable"].push(NewRow);
+                        option.data = table.cache["mainTable"];
+                        table.render(option);
+                        for (var i = 1; i <= option.data.length; i++) {
+                            $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
+                            $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
+                        }
+                        form.render('select');
+                        break;
+                    case 'btn-CopyLine':
+                        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);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                            for (var i = 1; i <= option.data.length; i++) {
+                                $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
+                                $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
+                            }
+                            form.render('select');
+                        }
+                        break;
+                }
+            });
+
+            //閫�鍑烘寜閽�
+            form.on('submit(btn-Exit)', function (data) {
+                get_Exit();
+
+                sWhere = " and hmainid = " + $("#HInterID").val();
+                $.ajax({
+                    url: GetWEBURL() + "/QC_FirstPieceCheckBill/QC_FirstPieceCheckBillList",
+                    type: "GET",
+                    async: false,
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 0) {
+                            $.ajax({
+                                url: GetWEBURL() + "/DeltetQC_FirstPieceCheck",
+                                type: "GET",
+                                async: false,
+                                data: { "HInterID": $("#HInterID").val(), "user": sessionStorage["HUserName"] },
+                                success: function (result) {
+                                    if (result.count == 1) {
+                                        return;
+                                    } else {
+                                        layer.msg("鍒犻櫎妫�楠屽�煎け璐ワ紒" + result.Message, { icon: 5 });
+                                    }
+                                }
+                            })
+                        }
+                    }
+                })
+            });
+
+            //鏂板鎸夐挳
+            form.on('submit(btn-AddNew)', function (data) {
+                layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    location.replace('QC_Add_Edit_FirstPieceCheckBill.html?OperationType=1&linterid=&HSouceBillType=0&closeType=2');
+                });
+            });
+
+            //棣栬鎸夐挳
+            form.on('submit(btn_FirstRow)', function (data) {
+                if ($("#HEntryID").val() == 1) {
+                    layer.msg("褰撳墠宸叉槸棣栬");
+                }
+
+                if (option_Check.length > 0) {
+                    $("[name='HEntryID']").attr("value", 1);
+                    $("[name='HQCCheckItemID']").attr("value", option_Check[0].HQCCheckItemID);
+                    $("[name='HQCCheckItemName']").attr("value", option_Check[0].妫�楠岄」鐩�);
+                } else {
+                    layer.msg("褰撳墠宸叉槸棣栬");
+                }
+            });
+
+            //鏈鎸夐挳
+            form.on('submit(btn_LastRow)', function (data) {
+                if ($("#HEntryID").val() == option_Check.length) {
+                    layer.msg("褰撳墠宸叉槸鏈");
+                    return;
+                }
+
+                if (option_Check.length > 0) {
+                    $("[name='HEntryID']").attr("value", option_Check.length);
+                    $("[name='HQCCheckItemID']").attr("value", option_Check[option_Check.length - 1].HQCCheckItemID);
+                    $("[name='HQCCheckItemName']").attr("value", option_Check[option_Check.length - 1].妫�楠岄」鐩�);
+                } else {
+                    layer.msg("褰撳墠宸叉槸鏈");
+                    return;
+                }
+            });
+
+            //涓婁竴琛屾寜閽�
+            form.on('submit(btn_PreviousRow)', function (data) {
+                if ($("#HEntryID").val() == 1 || $("#HEntryID").val() == 0) {
+                    layer.msg("褰撳墠宸叉槸棣栬");
+                    return;
+                }
+
+                if (option_Check.length > 0) {
+                    $("[name='HEntryID']").attr("value", $("#HEntryID").val() - 1);
+                    $("[name='HQCCheckItemID']").attr("value", option_Check[$("#HEntryID").val() - 1].HQCCheckItemID);
+                    $("[name='HQCCheckItemName']").attr("value", option_Check[$("#HEntryID").val() - 1].妫�楠岄」鐩�);
+                }
+            });
+
+            //涓嬩竴琛屾寜閽�
+            form.on('submit(btn_NextRow)', function (data) {
+                if ($("#HEntryID").val() == option_Check.length) {
+                    layer.msg("褰撳墠宸叉槸鏈");
+                    return;
+                }
+
+                if (option_Check.length > 0) {
+                    $("[name='HEntryID']").attr("value", Number($("#HEntryID").val()) + 1);
+                    $("[name='HQCCheckItemID']").attr("value", option_Check[$("#HEntryID").val() - 1].HQCCheckItemID);
+                    $("[name='HQCCheckItemName']").attr("value", option_Check[$("#HEntryID").val() - 1].妫�楠岄」鐩�);
+                }
+            });
+
+            //閫�鍑�
+            function get_Exit() {
+                Pub_Close(1);
+            }
+
+            //琛屽唴浜嬩欢--妫�楠岄」鐩�
+            table.on('tool(mainTable)', function (obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'del') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                        console.log("绱㈠紩涓�:" + rowIndex);
+                        if (rowIndex === '0') {
+                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        } else {
+                            obj.del();
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.reload(option);
+                            layer.close(index);
+                        }
+                    });
+                }
+
+                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);
+                        }
+                    });
+                }
+
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        if (obj.event == 'HQCCheckItemID') {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '妫�楠岄」鐩垪琛�',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true,
+                                content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_QCCheckItemListView.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        妫�楠岄」鐩�: checkStatus.data[0].鍚嶇О
+                                        , HQCCheckItemID: checkStatus.data[0].HItemID
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        if (obj.event == 'HInspectInstruMentID') {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '妫�楠屼华鍣ㄥ垪琛�',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true,
+                                content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_InspectInstruMentList.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({
+                                        妫�楠屼华鍣�: checkStatus.data[0].妫�楠屼华鍣ㄥ悕绉�
+                                        , HInspectInstruMentID: checkStatus.data[0].HItemID
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+
+
+                        obj.event = "";
+                        return false;
+
+                    }
+                })
+            });
+
+            //琛屽唴浜嬩欢--妫�楠屽��
+            table.on('tool(ValueTable)', function (obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        if (obj.event == 'HInSpectValueB_Open') {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '妫�楠屽�煎垪琛�',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true,
+                                content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_InspectValueList.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({
+                                        HInSpectValueB: checkStatus.data[0].妫�楠屽�煎悕绉�
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                    var DXValue = checkStatus.data[0].妫�楠屽�煎悕绉�; //瀹氭�ф娴嬪��
+                                    var MBValue = $("#HTargetVal").val(); //鐩爣鍊�
+
+                                    if (Number(DXValue) == Number(MBValue)) { //瀹氭�ф娴嬪�� = 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                        obj.update({
+                                            HInSpectResult: 1
+                                        });
+                                        $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                                    } else {
+                                        obj.update({
+                                            HInSpectResult: 2
+                                        });
+                                        $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                                    }
+                                    form.render('select');
+
+                                    addUnRightQty();//缁熻涓嶅悎鏍兼暟閲�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+
+                        obj.event = "";
+                        return false;
+                    }
+                })
+            });
+
+            table.on('edit(ValueTable)', function (obj) { //娉細edit鏄浐瀹氫簨浠跺悕锛宼est鏄痶able鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+                var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+                    , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+                    , field = obj.field; //寰楀埌瀛楁
+
+                var MBValue = $("#HTargetVal").val();//鐩爣鍊�
+                var HComparator = $("#HComparator").val();//姣旇緝绗�
+
+                switch (field) {
+                    //瀹氭�ф娴�
+                    case "HInSpectValueB":
+
+                        break;
+                    //瀹氶噺妫�娴�
+                    case "HInSpectValue":
+                        Qualified_Value(HComparator, MBValue, value, obj);
+                        addUnRightQty();
+                        break;
+                    //鍏朵粬妫�娴�
+                    case "HInSpectValueT":
+                        if (Number(value) == Number(MBValue)) { //鍏朵粬妫�娴嬪�� = 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                            obj.update({
+                                HInSpectResult: 1
+                            });
+                            $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                        } else {
+                            obj.update({
+                                HInSpectResult: 2
+                            });
+                            $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                        }
+                        form.render('select');
+                        addUnRightQty();
+                        break;
+                }
+            });
+
+            //淇濆瓨鎸夐挳
+            form.on('submit(btnSave)', function (data) {
+                set_SaveBill(data);
+            });
+
+            //淇濆瓨
+            function set_SaveBill(data) {
+                //璧嬪�兼渶鍚庝竴涓�変腑琛岀殑鏁版嵁缁檕ption.data
+                Assignment(LastIndex, LastIndex);
+                //淇濆瓨鏈�鍚庝竴娆$偣鍑昏鐨勬楠屽��
+                set_SaveValue($("#HEntryID").val());
+
+                if ($("#HICMOQty").val() == "" || $("#HICMOQty").val() <= 0) {
+                    layer.msg("浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if ($("#HProcExchQty").val() == "" || $("#HProcExchQty").val() <= 0) {
+                    layer.msg("娴佽浆鍗℃暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if ($("#HFirstCheckEmp").val() == 0) {
+                    layer.msg("妫�楠屽憳鏈�夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                var sSubTable = table.cache['mainTable'];
+                for (var i = 0; i < sSubTable.length; i++) {
+                    if (!sSubTable[i].HQCCheckItemID) {
+                        var indexRow = i + 1;
+                        layer.msg("绗�" + indexRow + "琛岋紝妫�楠岄」鐩笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    }
+                    if (sSubTable[i].HSampleSchemeID == '') {
+                        sSubTable[i].HSampleSchemeID = 0
+                    }
+                    if (sSubTable[i].HSampleQty == '' || sSubTable[i].HSampleQty == null) {
+                        sSubTable[i].HSampleQty = 0
+                    }
+                    if (sSubTable[i].HSampleDamageQty == '' || sSubTable[i].HSampleDamageQty == null) {
+                        sSubTable[i].HSampleDamageQty = 0
+                    }
+                    if (sSubTable[i].HAcceptQty == '' || sSubTable[i].HAcceptQty == null) {
+                        sSubTable[i].HAcceptQty = 0
+                    }
+                    if (sSubTable[i].HRejectQty == '' || sSubTable[i].HRejectQty == null) {
+                        sSubTable[i].HRejectQty = 0
+                    }
+                    if (sSubTable[i].HSampleUnRightQty == '' || sSubTable[i].HSampleUnRightQty == null) {
+                        sSubTable[i].HSampleUnRightQty = 0
+                    }
+                    if (sSubTable[i].HUnitID == '') {
+                        sSubTable[i].HUnitID = 0
+                    }
+                }
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(table.cache['mainTable']);
+                var sSubValue = JSON.stringify(table.cache['ValueTable']);
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"] + ';' + sSubValue;
+
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/QC_FirstPieceCheckBill/set_SaveBill",
+                    async: true,
+                    data: { "sMainSub": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) {
+                            //layer.confirm(data.Message, {
+                            //    icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
+                            //    btn2: function () {
+                            //        //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
+                            //        //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
+                            //        parent.location.href = "../../../views/index.html"
+                            //    }//鍏抽棴
+                            //}, function () { window.location.reload(); });//鏂板
+                            layer.close(index);
+                            layer.msg("鎻愪氦鎴愬姛");
+                            $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+
+            //缂栬緫鏃跺姞杞借〃澶�
+            function RoadBillMain(linterid) {
+                var ajaxLoad = layer.load();
+                var sWhere = " and hmainid=" + linterid;
+                $.ajax({
+                    url: GetWEBURL() + "/QC_FirstPieceCheckBill/QC_FirstPieceCheckBillList",
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            //var data = result.data.h_v_QC_Edit_FirstPieceCheckBillList[0];
+                            var data = result.data[0];
+
+                            form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HInterID": data.hmainid
+                                , "HBillNo": data.鍗曟嵁鍙�
+                                , "HDate": formatDate(data.鏃ユ湡)
+                                , "HSourceID": data.HSourceID
+                                , "HSourceName": data.鐢熶骇璧勬簮鍚嶇О
+                                , "HICMOBillNo": data.浠诲姟鍗曞彿
+                                , "HICMOQty": data.浠诲姟鍗曟暟閲�
+                                , "HICMOInterID": data.HICMOInterID
+                                , "HICMOEntryID": data.HICMOEntryID
+                                , "HMaterID": data.HMaterID
+                                , "HMaterName": data.鐗╂枡鍚嶇О
+                                , "HProcExchQty": data.HProcExchQty
+                                , "HProcExchBillNo": data.HProcExchBillNo
+                                , "HProcExchInterID": data.HProcExchInterID
+                                , "HProcExchEntryID": data.HProcExchEntryID
+                                , "HFirstCheckEmp": data.HFirstCheckEmp
+                                , "HFirstCheckEmpName": data.璐ㄦ鍛樺悕绉�
+                                , "HQCSchemeID": data.妫�楠屾柟妗圛D
+                                , "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�
+                                //, "HQCSchemeID": data.HManagerID
+                                //, "HPSStyleID": data.HPSStyleID
+                                , "HRemark": data.琛ㄥご澶囨敞
+                                //, "HSSID": data.HSSID
+                                , "HMaker": data.鍒跺崟浜�
+                                , "HMakeDate": data.鍒跺崟鏃ユ湡
+                                , "HChecker": data.瀹℃牳浜�
+                                , "HCheckDate": data.瀹℃牳鏃ユ湡
+                                , "HCloseMan": data.鍏抽棴浜�
+                                , "HCloseDate": data.鍏抽棴鏃ユ湡
+                                , "HUpDateDate": data.淇敼鏃ユ湡
+                                , "HDeleteDate": data.浣滃簾鏃ユ湡
+                                , "HSampleSchemeID": data.HSampleSchemeID
+                                , "HSampleSchemeName": data.鎶芥牱鏂规鍚嶇О
+                                , "HSampleQty": data.鏍锋湰閲�
+                                , "HSampleQty2": data.鏍锋湰閲�
+                                , "HSampleDamageQty": data.鏍锋湰鐮村潖鏁�
+                                , "HSamplingType": data.鎶芥牱绫诲瀷
+                                , "HAcceptQty": data.鍏佽鏁�
+                                //, "HInspectResultToSee": data.浣滃簾鏃ユ湡 //妫�楠岀粨鏋�
+                                , "HInspectionLevel": data.妫�楠屾按骞�
+                                , "HRejectQty": data.鎷掔粷鏁�
+                                , "HStrictness": data.涓ユ牸搴�
+                                , "HSampleUnRightQty": data.鏍锋湰涓嶅悎鏍兼暟
+                                , "HSampleUnRightQty2": data.鏍锋湰涓嶅悎鏍兼暟
+                                , "HAQL": data.AQL
+                                , "HUnitID": data.HUnitID
+                                , "HUnit": data.鍗曚綅
+                                , "HInspectValB": data.妫�娴嬪�煎熀纭�璧勬枡
+                                , "HInspectVal": data.妫�娴嬪��
+                                , "HTargetValB": data.鐩爣鍊煎熀纭�璧勬枡
+                                , "HTargetVal": data.鐩爣鍊�
+                                , "HUpLimit": data.涓婇檺鍊�
+                                , "HDownLimit": data.涓嬮檺鍊�
+                                , "HUpOffSet": data.涓婂亸宸�
+                                , "HDownOffSet": data.涓嬪亸宸�
+                                , "HEntryID": data.hsubid
+                                , "HQCCheckItemName": data.妫�楠岄」鐩悕绉�
+                                , "HQCCheckItemID": data.HQCCheckItemID
+                            });
+                            data = result.data;
+                            //data = result.data.h_v_QC_Edit_FirstPieceCheckBillList;
+                            //瀛愯〃  璧嬪��
+                            var rowdata = [];
+                            for (var i = 0; i < data.length; i++) {
+                                rowdata.push(
+                                    {
+                                        "HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HInspectInstruMentID": data[i].HInspectInstruMentID, "妫�楠屼华鍣�": data[i].妫�楠屼华鍣�, "HQCStd": data[i].妫�楠屾爣鍑�,
+                                        "HUnit": data[i].鍗曚綅鍚嶇О, "HQCNote": data[i].妫�楠岃褰�, "HResult": data[i].缁撹,
+                                        "HMax": data[i].鏈�澶у��, "HMin": data[i].鏈�灏忓��, "HAvg": data[i].骞冲潎鍊�, "HRemark": data[i].琛ㄤ綋澶囨敞,
+                                        "HAnalysisMethod": data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ? 1 : (data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ? 2 : 3), "HKeyInspect": data[i].閲嶇偣妫�鏌� == "鍚�" ? false : true,
+                                        "HSampleSchemeID": data[i].HSampleSchemeID, "HUnitID": data[i].HUnitID,
+                                        "HInspectVal": data[i].妫�娴嬪��, "HTargetVal": data[i].鐩爣鍊�, "HUpLimit": data[i].涓婇檺鍊�, "HDownLimit": data[i].涓嬮檺鍊�, "HUpOffSet": data[i].涓婂亸宸�, "HDownOffSet": data[i].涓嬪亸宸�, "HSampleDamageQty": data[i].鏍锋湰鐮村潖鏁�,
+                                        "HSampleSchemeName": data[i].鎶芥牱鏂规鍚嶇О, "HSampleQty": data[i].鏍锋湰閲�, "HSampleDamageQty": data[i].鏍锋湰鐮村潖鏁�, "HAcceptQty": data[i].鍏佽鏁�, "HInspectionLevel": 0, "HRejectQty": data[i].鎷掔粷鏁�,
+                                        "HStrictness": 0, "HSampleUnRightQty": data[i].鏍锋湰涓嶅悎鏍兼暟, "HAQL": data[i].AQL, "HSamplingType": 0, "HSamplingType": data[i].鎶芥牱绫诲瀷, "HStrictness": data[i].涓ユ牸搴�
+
+                                    }
+                                )
+                                console.log(data[i].鐩爣鍊�);
+                                SummaryIndex.push(i.toString());
+                            }
+
+                            option.data = rowdata;
+                            table.render(option);
+                            for (let j = 0; j < data.length; j++) {
+                                $("#HResult" + (j + 1)).val(data[j].缁撹)
+                            }
+                            for (let j = 0; j < data.length; j++) {
+                                $("#HAnalysisMethod" + (j + 1)).val(data[j].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ? 1 : (data[j].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ? 2 : 3))
+                            }
+                            for (var i = 1; i <= data.length; i++) {
+                                $('#HKeyInspect' + i + '').find("option[value='" + (data[i - 1].閲嶇偣妫�鏌� == "鍚�" ? false : true) + "']").attr("selected", true);
+                            }
+                            form.render('select');
+
+                            //榛樿閫変腑鏈�鍚庝竴琛�
+                            $("tr[data-index = " + (option.data.length - 1) + "] .layui-form-checkbox").dblclick();
+                            //$("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").addClass('layui-form-checked');
+                            $("tr[data-index = " + (option.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });
+
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                })
+            }
+
+            //#region  鏃堕棿杞崲
+            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('-');
+            }
+            //#endregion
+
+            //琛ㄥご淇℃伅妫�楠屾柟妗堝脊绐�
+            form.on('submit(btnSearchQCScheme)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '妫�楠屾柟妗堝垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_QCCheckProjectListView.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HQCSchemeID").val(checkStatus.data[0].HItemID);
+                        $("#HQCSchemeName").val(checkStatus.data[0].鏂规鍚嶇О);
+                        get_CheckItem();
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //#region銆愯〃浣撴斁澶ч暅銆�
+            //琛ㄤ綋淇℃伅妫�楠岄」鐩脊绐�
+            form.on('submit(btnSearchCheckItemID)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '妫�楠岄」鐩垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HQCSchemeID").val(checkStatus.data[0].HItemID);
+                        $("#HQCSchemeName").val(checkStatus.data[0].鏂规鍚嶇О);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //琛ㄤ綋淇℃伅鍗曚綅寮圭獥
+            form.on('submit(btnSearchUnit)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鍗曚綅鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_UnitList.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HUnitID").val(checkStatus.data[0].HItemID);
+                        $("#HUnit").val(checkStatus.data[0].HName);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //琛ㄤ綋淇℃伅妫�楠屽�煎脊绐�
+            form.on('submit(btnSearchInspectValB)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '妫�楠屽�煎垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_InspectValueList.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HInspectValB").val(checkStatus.data[0].hmainid);
+                        $("#HInspectVal").val(checkStatus.data[0].妫�楠屽�煎悕绉�);
+
+                        //==================================鍒ゅ畾鏄惁鍚堟牸,鍙湁瀹氭�у垎鏋愬彲浠ラ�夋嫨妫�楠屽�笺�佺洰鏍囧��==================================
+                        var HComparator = $("#HComparator").val(); //姣旇緝绗�
+                        var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+                        var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+
+                        Qualified(HComparator, HEntryID, HAnalysisMethod);
+
+                        form.render('select');
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //琛ㄤ綋淇℃伅鐩爣鍊煎脊绐�
+            form.on('submit(btnSearchTargetValB)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鐩爣鍊煎垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_InspectValueList.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HTargetValB").val(checkStatus.data[0].hmainid);
+                        $("#HTargetVal").val(checkStatus.data[0].妫�楠屽�煎悕绉�);
+                        $("#HUpLimit").val(checkStatus.data[0].妫�楠屽�煎悕绉�);
+                        $("#HDownLimit").val(checkStatus.data[0].妫�楠屽�煎悕绉�);
+
+                        //==================================鍒ゅ畾鏄惁鍚堟牸,鍙湁瀹氭�у垎鏋愬彲浠ラ�夋嫨妫�楠屽�笺�佺洰鏍囧��==================================
+                        var HComparator = $("#HComparator").val(); //姣旇緝绗�
+                        var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+                        var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+
+                        Qualified(HComparator, HEntryID, HAnalysisMethod);
+
+                        form.render('select');
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //琛ㄤ綋淇℃伅鎶芥牱鏂规寮圭獥
+            form.on('submit(btnSearchCheckSampleScheme)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鎶芥牱鏂规鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_SampleSchemeListView.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSampleSchemeID").val(checkStatus.data[0].hmainid);
+                        $("#HSampleSchemeName").val(checkStatus.data[0].鎶芥牱鏂规鍚嶇О);
+                        $("#HSamplingType").val(checkStatus.data[0].鎶芥牱绫诲瀷);
+                        $("#HInspectionLevel").val(checkStatus.data[0].妫�楠屾按骞�);
+                        $("#HStrictness").val(checkStatus.data[0].涓ユ牸搴�);
+                        $("#HAQL").val(checkStatus.data[0].AQL);
+                        $("#HSampleQty").val(checkStatus.data[0].鏍锋湰閲�);
+                        $("#HSampleQty2").val(checkStatus.data[0].鏍锋湰閲�);
+                        $("#HAcceptQty").val(checkStatus.data[0].鍏佽鏁�);
+
+                        $("#HRejectQty").val(checkStatus.data[0].鎷掔粷鏁�);
+                        $("#HUpLimit").val(checkStatus.data[0].涓婇檺鍊�);
+                        $("#HDownLimit").val(checkStatus.data[0].涓嬮檺鍊�);
+
+                        option.data[$("#HEntryID").val() - 1].HSampleSchemeID = checkStatus.data[0].hmainid;
+                        option.data[$("#HEntryID").val() - 1].HSampleSchemeName = checkStatus.data[0].鎶芥牱鏂规鍚嶇О;
+                        option.data[$("#HEntryID").val() - 1].HSamplingType = checkStatus.data[0].鎶芥牱绫诲瀷;
+                        option.data[$("#HEntryID").val() - 1].HInspectionLevel = checkStatus.data[0].妫�楠屾按骞�;
+                        option.data[$("#HEntryID").val() - 1].HStrictness = checkStatus.data[0].涓ユ牸搴�;
+                        option.data[$("#HEntryID").val() - 1].HAQL = checkStatus.data[0].AQL;
+                        option.data[$("#HEntryID").val() - 1].HSampleQty = checkStatus.data[0].鏍锋湰閲�;
+                        option.data[$("#HEntryID").val() - 1].HSampleQty2 = checkStatus.data[0].鏍锋湰閲�;
+                        option.data[$("#HEntryID").val() - 1].HAcceptQty = checkStatus.data[0].鍏佽鏁�;
+                        option.data[$("#HEntryID").val() - 1].HRejectQty = checkStatus.data[0].鎷掔粷鏁�;
+                        option.data[$("#HEntryID").val() - 1].HUpLimit = checkStatus.data[0].涓婇檺鍊�;
+                        option.data[$("#HEntryID").val() - 1].HDownLimit = checkStatus.data[0].涓嬮檺鍊�;
+
+                        rowdata_Value = [];
+                        for (let i = 1; i <= checkStatus.data[0].鏍锋湰閲�; i++) {
+                            rowdata_Value.push({
+                                "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
+                            });
+                        }
+                        option_Value.data = rowdata_Value;
+                        table.render(option_Value);
+
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+            //#endregion
+
+            //#region銆愰�夋楠屾柟妗堣幏鍙栬〃浣撴楠岄」鐩俊鎭��
+            function get_CheckItem() {
+                var HBatchQty = $("#HProcExchQty").val();
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
+                    type: "GET",
+                    data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty },
+                    success: function (result) {
+                        if (result.code == 1) {
+                            var rowdata = [];
+                            var data = result.data;
+                            rowdata_Value = [];
+                            for (var i = 0; i < result.data.length; i++) {
+                                //瀛愯〃  璧嬪��
+                                rowdata.push(
+                                    {
+                                        "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣�": data[i]["妫�楠屼华鍣�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["鍗曚綅鍚嶇О"], "HQCNote": "", "HAnalysisMethod": data[i]["鍒嗘瀽鏂规硶"], "HResult": data[i]["HResult"],
+                                        "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
+                                        "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "",
+                                        "HSampleSchemeName": data[i].鎶芥牱鏂规鍚嶇О, "HSampleQty": data[i].鏍锋湰閲�, "HAcceptQty": data[i].鍏佽鏁�, "HInspectionLevel": data[i].妫�楠屾按骞�, "HRejectQty": data[i].鎷掔粷鏁�,
+                                        "HStrictness": data[i].涓ユ牸搴�, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].鎶芥牱绫诲瀷
+                                    }
+                                );
+                                SampleNum.push(data[i].鏍锋湰閲�);
+                            }
+
+                            //妫�楠岄」鐩�
+                            for (let j = 1; j <= data[data.length - 1].鏍锋湰閲�; j++) {
+                                rowdata_Value.push({
+                                    "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
+                                });
+                            }
+                            //妫�楠岄」鐩�
+                            option.data = rowdata;
+                            table.render(option);
+                            //妫�楠屽��
+                            option_Value.data = rowdata_Value;
+                            //console.log(JSON.stringify(option_Value.data));
+                            table.render(option_Value);
+                            //================================================
+                            for (var i = 1; i <= result.data.length; i++) {
+                                $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
+                                $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
+                            }
+                            form.render('select');
+
+                            option_Check = result.data;
+
+                            $("[name='HEntryID']").attr("value", result.data.length);
+                            $("[name='HQCCheckItemID']").attr("value", result.data[result.data.length - 1].HQCCheckItemID);
+                            $("[name='HQCCheckItemName']").attr("value", result.data[result.data.length - 1].妫�楠岄」鐩�);
+                            //榛樿閫変腑鏈�鍚庝竴琛�
+                            $("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").dblclick();
+                            //$("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").addClass('layui-form-checked');
+                            $("tr[data-index = " + (result.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });
+
+                            trindex = result.data.length - 1;
+                            $("#HEntryID").val() - 1
+                        }
+                    }
+                })
+            }
+            //#endregion
+
+            //#region銆愯〃澶存斁澶ч暅銆�
+            //琛ㄥご淇℃伅宸ュ簭娴佽浆鍗″脊绐�
+            form.on('submit(btnSearchProcExch)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '宸ュ簭娴佽浆鍗″垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ProcessExchangeBillListView.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HProcExchInterID").val(checkStatus.data[0].hmainid);
+                        $("#HProcExchEntryID").val(checkStatus.data[0].hsubid);
+                        $("#HProcExchBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //琛ㄥご淇℃伅鐢熶骇浠诲姟鍗曞脊绐�
+            form.on('submit(btnSearchICMOBill)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鐢熶骇浠诲姟鍗曞垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ICMOBillListView2.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HICMOInterID").val(checkStatus.data[0].hmainid);
+                        $("#HICMOEntryID").val(checkStatus.data[0].hsubid);
+                        $("#HICMOBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+                        $("#HICMOQty").val(checkStatus.data[0].璁″垝鐢熶骇鏁伴噺);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //琛ㄥご淇℃伅閫夋嫨妫�楠屽憳寮圭獥
+            form.on('submit(btnSearchHFirstCheckEmp)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '妫�楠屽憳鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/UserInformation.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HFirstCheckEmpName").val(checkStatus.data[0].HName);
+                        $("#HFirstCheckEmp").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(btnSearchSource)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '璧勬簮鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/SourceInformation.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSourceName").val(checkStatus.data[0].HName);
+                        $("#HSourceID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //琛ㄥご淇℃伅浜у搧寮圭獥
+            form.on('submit(btnSearchMater)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '浜у搧鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+                        $("#HMaterID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+            //#endregion
+
+            //閫�鍑�
+            form.on('submit(Cancel)', function () {
+                //sessionStorage["SourceFlag"] = false;
+                parent.location.href = "../../../views/index.html"
+                //window.close();//鍏抽棴褰撳墠椤�
+            })
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆琛ㄦ牸鏁版嵁
+                rowdata = [{
+                    "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": "0", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
+                    "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
+                    "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
+                    "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
+                    "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
+                }];
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                    , height: 'full-50'
+                    , cellMinWidth: 150
+                    , cols: [[ //琛ㄥご
+                        { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                        , { type: 'numbers', title: '搴忓彿', totalRow: true }
+                        , { field: 'HQCCheckItemID', title: 'HQCCheckItemID', hide: true }
+                        , { field: '妫�楠岄」鐩�', title: '妫�楠岄」鐩�', edit: 'text', event: 'HQCCheckItemID' }
+                        , { field: 'HInspectInstruMentID', title: 'HInspectInstruMentID', hide: true }
+                        , { field: '妫�楠屼华鍣�', title: '妫�楠屼华鍣�', edit: 'text', event: 'HInspectInstruMentID' }
+                        , { field: 'HResult', title: '缁撹', templet: '#HResult', event: 'HResult' }
+                        , { field: 'HAnalysisMethod', title: '鍒嗘瀽鏂规硶', templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
+                        , { field: 'HKeyInspect', title: '閲嶇偣妫�鏌�', templet: '#HKeyInspect', unresize: false }
+                        , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
+                        , { field: 'HUnit', title: '鍗曚綅', edit: 'text' }
+                        , { field: 'HQCNote', title: '妫�楠岃褰�', edit: 'text' }
+                        , { field: 'HMax', title: '鏈�澶у��', edit: 'text' }
+                        , { field: 'HMin', title: '鏈�灏忓��', edit: 'text' }
+                        , { field: 'HAvg', title: '骞冲潎鍊�', edit: 'text', totalRow: true }
+
+                        , { field: 'HSampleSchemeID', title: '鎶芥牱鏂规ID', edit: 'text', hide: true }
+                        , { field: 'HSampleSchemeName', title: '鎶芥牱鏂规', edit: 'text', hide: true }
+                        , { field: 'HSampleQty', title: '鏍锋湰閲�', edit: 'text', hide: true }
+                        , { field: 'HSampleDamageQty', title: '鏍锋湰鐮村潖鏁�', edit: 'text', hide: true }
+                        , { field: 'HSamplingType', title: '鎶芥牱绫诲瀷', edit: 'text', hide: true }
+                        , { field: 'HAcceptQty', title: '鍏佽鏁�', edit: 'text', hide: true }
+                        , { field: 'HInspectionLevel', title: '妫�楠屾按骞�', edit: 'text', hide: true }
+                        , { field: 'HRejectQty', title: '鎷掔粷鏁�', edit: 'text', hide: true }
+                        , { field: 'HStrictness', title: '涓ユ牸搴�', edit: 'text', hide: true }
+                        , { field: 'HSampleUnRightQty', title: '鏍锋湰涓嶅悎鏍兼暟', edit: 'text', hide: true }
+                        , { field: 'HAQL', title: 'AQL', edit: 'text', hide: true }
+                        , { field: 'HStatus', title: '鐘舵��', edit: 'text', hide: true }
+                        , { field: 'xxx', title: '姣旇緝绗�', edit: 'text', hide: true }
+                        , { field: 'HUnitID', title: '鍗曚綅ID', edit: 'text', hide: true }
+                        , { field: 'HUnit', title: '鍗曚綅', edit: 'text', hide: true }
+                        , { field: 'HInspectVal', title: '妫�楠屽��', edit: 'text', hide: true }
+                        , { field: 'HTargetVal', title: '鐩爣鍊�', edit: 'text', hide: true }
+                        , { field: 'HUpLimit', title: '涓婇檺鍊�', edit: 'text', hide: true }
+                        , { field: 'HDownLimit', title: '涓嬮檺鍊�', edit: 'text', hide: true }
+                        , { field: 'HUpOffSet', title: '涓婂亸宸�', edit: 'text', hide: true }
+                        , { field: 'HDownOffSet', title: '涓嬪亸宸�', edit: 'text', hide: true }
+                        , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 85 }
+                    ]]
+                    , done: function (res, curr, count) {
+                        option.data = res.data;
+                        //鍘绘帀涓嬫媺妗嗗け鐒︿簨浠跺惁鍒欏湪涓嬫媺妗嗛噷杈撳叆鍊�
+                        $('.layui-form-select').find('input').unbind("blur");
+                        //琛ㄦ牸閲嶈浇鍥炴樉涓嬫媺妗嗛噷鐨勬暟鎹�
+                        $('tr').each(function (e) {
+                            var $cr = $(this);
+                            var dataIndex = $cr.attr("data-index");
+                            $.each(option.data, function (index, value) {
+                                if (value.LAY_TNDEX == dataIndex) {
+                                    $cr.find('input').val(value.HResult);
+                                    $cr.find('input').val(value.HAnalysisMethod);
+                                }
+                            });
+                        });
+                    }
+                    , text: {
+                        none: '鏃犳暟鎹紒'
+                    }
+                };
+                //鍔犺浇绌鸿〃鏍�
+                option.data = rowdata;
+                table.render(option);
+
+                //鍒濆琛ㄦ牸鏁版嵁
+                rowdata_Value = [{
+                    "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
+                }];
+                option_Value = {
+                    elem: '#ValueTable'
+                    //, toolbar: '#toolbarDemo_Value'
+                    , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                    , height: 'full-50'
+                    , cellMinWidth: 150
+                    , cols: [[ //琛ㄥご
+                        { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                        , { field: 'HSEQ', title: '搴忓彿' }
+                        , { field: 'HInSpectResult', title: '妫�楠岀粨鏋�', templet: '#HInSpectResult' }
+                        , { field: 'HInSpectValueB', title: '妫�娴嬪�硷紙瀹氭�э級', edit: 'text', event: 'HInSpectValueB_Open' }
+                        , { field: 'HInSpectValue', title: '妫�娴嬪�硷紙瀹氶噺锛�', edit: 'text' }
+                        , { field: 'HInSpectValueT', title: '妫�娴嬪�硷紙鍏朵粬锛�', edit: 'text' }
+                        //, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                    ]]
+                    , done: function (res, curr, count) {
+                        option_Value.data = res.data;
+                        //鍘绘帀涓嬫媺妗嗗け鐒︿簨浠跺惁鍒欏湪涓嬫媺妗嗛噷杈撳叆鍊�
+                        $('.layui-form-select').find('input').unbind("blur");
+                        //琛ㄦ牸閲嶈浇鍥炴樉涓嬫媺妗嗛噷鐨勬暟鎹�
+                        $('tr').each(function (e) {
+                            var $cr = $(this);
+                            var dataIndex = $cr.attr("data-index");
+                            $.each(option_Value.data, function (index, value) {
+                                if (value.LAY_TNDEX == dataIndex) {
+                                    $cr.find('input').val(value.HInSpectResult);
+                                }
+                            });
+                        });
+                    }
+                    , text: {
+                        none: '鏃犳暟鎹紒'
+                    }
+                };
+                //鍔犺浇绌鸿〃鏍�
+                option_Value.data = rowdata_Value;
+                table.render(option_Value);
+            }
+
+            //琛岄�夋嫨澶勭悊锛堢粨璁猴級
+            form.on('select(HResult)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+
+                //閫夋嫨鐨剆elect瀵硅薄鍊硷紱
+                var selectValue = data.value;
+                if (selectValue == 1) {
+                    selectValue = "鍚堟牸"
+                    $("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                } else {
+                    selectValue = "涓嶅悎鏍�"
+                    $("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                }
+                $("#HInspectResultToSee").val(selectValue);
+                $("#HInspectResultToSee2").val(selectValue);
+                //$("#HInSpectResult" + Guid).val(selectValue);
+                //$("[name='HResult']").val(selectValue);
+
+                //$("[name='HInspectResult']").val(selectValue);
+                form.render('select');
+
+                LastResult();
+            });
+
+
+            //鍒ゆ柇琛ㄥご鍒ゆ柇缁撹鏄惁鍚堟牸
+            function LastResult() {
+                var HQty = 0;//琛ㄤ綋琛屼笉鍚堟牸鏁伴噺
+                for (let i = 0; i < table.cache['mainTable'].length; i++) {
+                    if (table.cache['mainTable'][i].HResult == 2) {
+                        HQty++;
+                    }
+                }
+                if (HQty > 0) {
+                    document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+                    $("input:radio[name=HLastResult][value=" + false + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+                } else {
+                    document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+                    $("input:radio[name=HLastResult][value=" + true + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+                }
+                form.render('radio');
+            }
+
+            ////琛岄�夋嫨澶勭悊锛堟楠岀粨鏋滐級-- 澶囦唤
+            //form.on('select(HInSpectResult)', function (data) {
+            //    //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+            //    var elem = data.othis.parents('tr');
+            //    var dataindex = elem.attr("data-index");
+            //    $.each(option_Value.data, function (index, value) {
+            //        if (value.LAY_TABLE_INDEX == dataindex) {
+            //            value.HInSpectResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+            //        }
+            //    });
+            //});
+
+            //琛岄�夋嫨澶勭悊锛堟楠岀粨鏋滐級
+            form.on('select(HInSpectResult)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option_Value.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HInSpectResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+
+                //寰幆妫�楠屽�艰〃鏍兼暟鎹紝鑾峰彇涓嶅悎鏍兼暟閲�
+                var HValueTable = table.cache["ValueTable"];
+                var UnRightQty = 0;//妫�楠屽�艰〃鏍间笉鍚堟牸鏁伴噺姹囨��
+
+                for (let i = 0; i < HValueTable.length; i++) {
+                    if (HValueTable[i].HInSpectResult == 2) {
+                        UnRightQty++;
+                    }
+                }
+                UnRightQty_isFied = UnRightQty;
+                $("#HSampleUnRightQty").val(UnRightQty);
+                $("#HSampleUnRightQty2").val(UnRightQty);
+                var HAcceptQty = $("#HAcceptQty").val();//鍏佽鏁�
+                var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+                if (UnRightQty > HAcceptQty) {
+                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                    $("#HInspectResultToSee").val('涓嶅悎鏍�');
+                    $("#HInspectResultToSee2").val('涓嶅悎鏍�');
+                    $("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                } else {
+                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                    $("#HInspectResultToSee").val('鍚堟牸');
+                    $("#HInspectResultToSee2").val('鍚堟牸');
+                    $("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                }
+                form.render('select');
+                LastResult();
+            });
+
+            //琛岄�夋嫨澶勭悊锛堝垎鏋愭柟娉曪級
+            form.on('select(HAnalysisMethod)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HAnalysisMethod = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+                //闅愯棌妫�娴嬪�煎瓧娈�
+                IsHide(data.value);
+            });
+
+            //琛岄�夋嫨澶勭悊锛堢姸鎬侊級
+            form.on('select(HStatus)', function (data) {
+                var HComparator = $("#HComparator").val(); //姣旇緝绗�
+                var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+                var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+
+                Qualified(HComparator, HEntryID, HAnalysisMethod)
+            });
+
+            ////鐩戝惉涓嬫媺妗嗙紪杈�
+            //form.on('select(HInspectResult)', function (data) {
+            //    //鑾峰彇褰撳墠琛宼r瀵硅薄
+            //    var elem = data.othis.parents('tr');
+            //    //绗竴鍒楃殑鍊兼槸Guid锛屽彇guid鏉ュ垽鏂�
+            //    var Guid = elem.first().find('td').eq(1).text();
+            //    //閫夋嫨鐨剆elect瀵硅薄鍊硷紱
+            //    var selectValue = data.value;
+            //    //$("#HInSpectResult" + Guid).val(selectValue);
+            //    $("[name='HResult']").val(selectValue);
+            //    form.render('select');
+            //})
+
+            //鐩戝惉涓嬫媺妗嗙紪杈�--姣旇緝绗�
+            form.on('select(HComparator)', function (data) {
+                //鑾峰彇褰撳墠琛宼r瀵硅薄
+                var elem = data.othis.parents('tr');
+                //绗竴鍒楃殑鍊兼槸Guid锛屽彇guid鏉ュ垽鏂�
+                var Guid = elem.first().find('td').eq(1).text();
+                //閫夋嫨鐨剆elect瀵硅薄鍊硷紱
+                var selectValue = data.value;
+
+                var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+                var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+                //鍒ゅ畾濡傛灉鏄畾閲忓垎鏋�
+                if (HAnalysisMethod == 2) {
+                    if (selectValue.toString() != '=' && selectValue.toString() != 'between') {
+                        $("#HUpLimit").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓婇檺鍊艰緭鍏ユ鑳屾櫙棰滆壊
+                        $("#HDownLimit").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓嬮檺鍊艰緭鍏ユ鑳屾櫙棰滆壊
+                        $("#HUpOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓婂亸宸緭鍏ユ鑳屾櫙棰滆壊
+                        $("#HDownOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓嬪亸宸緭鍏ユ鑳屾櫙棰滆壊
+                    } else if (selectValue.toString() == 'between') {
+                        $("#HUpOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓婂亸宸緭鍏ユ鑳屾櫙棰滆壊
+                        $("#HDownOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓嬪亸宸緭鍏ユ鑳屾櫙棰滆壊
+                        $("#HTargetVal").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉鐩爣鍊艰緭鍏ユ鑳屾櫙棰滆壊
+                        $("#HUpLimit").attr("readOnly", false).css("background-color", ""); //涓婇檺鍊兼敼涓哄彲缂栬緫
+                        $("#HDownLimit").attr("readOnly", false).css("background-color", ""); //涓嬮檺鍊兼敼涓哄彲缂栬緫
+                    } else if (selectValue.toString() == '=') {
+                        $("#HUpLimit").attr("readOnly", false).css("background-color", ""); //涓婇檺鍊兼敼涓哄彲缂栬緫
+                        $("#HDownLimit").attr("readOnly", false).css("background-color", ""); //涓嬮檺鍊兼敼涓哄彲缂栬緫
+                        $("#HUpOffSet").attr("readOnly", false).css("background-color", ""); //涓婂亸宸敼涓哄彲缂栬緫
+                        $("#HDownOffSet").attr("readOnly", false).css("background-color", ""); //涓嬪亸宸敼涓哄彲缂栬緫
+                        $("#HInspectVal").attr("readOnly", false).css("background-color", ""); //妫�楠屽�兼敼涓哄彲缂栬緫
+                        $("#HTargetVal").attr("readOnly", false).css("background-color", ""); //鐩爣鍊兼敼涓哄彲缂栬緫
+                        $('#btnSearchInspectValB').addClass("layui-btn-disabled").attr("disabled", true);//妫�楠屽�兼寜閽�
+                        $('#btnSearchTargetValB').addClass("layui-btn-disabled").attr("disabled", true);//鐩爣鍊兼寜閽�
+                        $("#HComparator").attr("disabled", false); //姣旇緝绗︽敼涓哄彲缂栬緫
+                        form.render("select");
+                    }
+                }
+
+
+                form.render('select');
+            })
+
+            //鏄惁閲嶇偣妫�鏌�
+            form.on('checkbox(HKeyInspect)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HKeyInspect = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+            });
+
+            //#region銆愬弻鍑绘楠岄」鐩浜嬩欢銆�
+            table.on('rowDouble(mainTable)', function (obj) {
+                $("#HInspectResultToSee").css("background-color", "");//鍘婚櫎妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                $("#HInspectResultToSee2").css("background-color", "");//鍘婚櫎妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+
+                //鑾峰彇涓婃鎵�鍦ㄨ涓嬫爣
+                var dataindex = $("#HEntryID").val() - 1;
+
+                //鑾峰彇褰撳墠鐐瑰嚮琛屼笅鏍�
+                var nowindex = $(obj.tr).attr("data-index");
+                editIndex = Number(nowindex) + Number(1);
+                LastIndex = nowindex;
+
+                $("[name='HEntryID']").attr("value", Number(nowindex) + Number(1));
+                //$("[name='HQCCheckItemID']").attr("value", option_Check[nowindex].HQCCheckItemID);
+                //$("[name='HQCCheckItemName']").attr("value", option_Check[nowindex].妫�楠岄」鐩�);
+
+                //閫変腑琛屾敼鍙橀鑹�
+                check_row(obj);
+                //鑾峰彇褰撳墠閫変腑琛屽彿
+                var rowIndex = Number($(obj.tr).attr("data-index")) + Number(1);
+                //鎶婃楠屽�兼暟鎹瓨鍒版暟缁�
+                //createArr(rowIndex);
+
+                //鑾峰彇鍗曞厓鏍兼楠屽�兼暟鎹�
+                var table_value = table.cache['ValueTable'];
+
+                if (OperationType == 3) {
+                    set_SaveValue(Number(nowindex) + Number(1));
+                } else {
+                    set_SaveValue(dataindex + 1);
+                }
+                //璧嬪�间笌鍥炴樉
+                Assignment(nowindex, dataindex);
+                if (isHavingCount == false && OperationType != 3) {
+                    var row_value = [];
+                    for (let i = 0; i < SampleNum[nowindex]; i++) {
+                        row_value.push({
+                            "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
+                        });
+                    }
+                    //鍒锋柊妫�楠屽�艰〃鏍�
+                    option_Value.data = row_value;
+                    table.render(option_Value);
+                }
+                if (isFristClick != true) {
+                    //if ($(this).parents('.layui-table').prevObject.context.cells[5].getAttribute('data-field') == 'HAnalysisMethod') {
+                    //console.log('aaa');
+
+                    //    return;
+                    //}
+                    //淇濆瓨妫�楠屽��
+                } else {
+                    isFristClick = false;
+                }
+
+            });
+            //#endregion
+
+
+            //#region銆愭枃鏈鐩戝惉锛屽厜鏍囩Щ寮�鏃惰Е鍙戙��
+
+            //[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--妫�楠屽��
+            $("#HInspectVal").blur(function () {
+                var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+
+                option.data[HEntryID].HInspectVal = $("#HInspectVal").val();
+
+                var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+                var HComparator = $("#HComparator").val(); //姣旇緝绗�
+                //瀹氶噺鍒嗘瀽
+                if (HAnalysisMethod == 2) {
+                    Qualified(HComparator, HEntryID, HAnalysisMethod);  //鍒ゆ柇鏄惁鍚堟牸
+                }
+                //鍏朵粬鍒嗘瀽
+                if (HAnalysisMethod == 3) {
+                    Qualified(HComparator, HEntryID, HAnalysisMethod);  //鍒ゆ柇鏄惁鍚堟牸
+                }
+            })
+
+            //[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--鐩爣鍊�
+            $("#HTargetVal").blur(function () {
+                var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+
+                option.data[HEntryID].HTargetVal = $("#HTargetVal").val();
+
+                var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+                var HComparator = $("#HComparator").val(); //姣旇緝绗�
+                //====================璧嬪��/浼犲��===========================
+                var HTargetVal = $("#HTargetVal").val();//鐩爣鍊�
+
+                //瀹氶噺鍒嗘瀽
+                if (HAnalysisMethod == 2) {
+                    $("#HUpLimit").val(HTargetVal) //涓婇檺鍊�
+                    $("#HDownLimit").val(HTargetVal) //涓嬮檺鍊�
+                    Qualified(HComparator, HEntryID, HAnalysisMethod);  //鍒ゆ柇鏄惁鍚堟牸
+                }
+                //鍏朵粬鍒嗘瀽
+                if (HAnalysisMethod == 3) {
+                    Qualified(HComparator, HEntryID, HAnalysisMethod);  //鍒ゆ柇鏄惁鍚堟牸
+                }
+            })
+
+            //[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--涓婇檺鍊�
+            $("#HUpLimit").blur(function () {
+                var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+
+                option.data[HEntryID].HUpLimit = $("#HUpLimit").val();
+
+                var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+                var HComparator = $("#HComparator").val(); //姣旇緝绗�
+                var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
+                //====================璧嬪��/浼犲��===========================
+                var HTargetVal = $("#HTargetVal").val();//鐩爣鍊�
+                var HUpLimit = $("#HUpLimit").val();//涓婇檺鍊�
+
+                //瀹氶噺鍒嗘瀽
+                if (HAnalysisMethod == 2) {
+                    $("#HUpOffSet").val((Number(HUpLimit) - Number(HTargetVal)).toFixed(HResDec)) //涓婂亸宸�
+                    Qualified(HComparator, HEntryID, HAnalysisMethod);  //鍒ゆ柇鏄惁鍚堟牸
+                }
+            })
+
+            //[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--涓嬮檺鍊�
+            $("#HDownLimit").blur(function () {
+                var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+
+                option.data[HEntryID].HDownLimit = $("#HDownLimit").val();
+
+                var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+                var HComparator = $("#HComparator").val(); //姣旇緝绗�
+                var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
+                //====================璧嬪��/浼犲��===========================
+                var HTargetVal = $("#HTargetVal").val();//鐩爣鍊�
+                var HDownLimit = $("#HDownLimit").val();//涓嬮檺鍊�
+
+                //瀹氶噺鍒嗘瀽
+                if (HAnalysisMethod == 2) {
+                    $("#HDownOffSet").val((Number(HDownLimit) - Number(HTargetVal)).toFixed(HResDec)) //涓嬪亸宸�
+                    Qualified(HComparator, HEntryID, HAnalysisMethod);  //鍒ゆ柇鏄惁鍚堟牸
+                }
+            })
+
+            //[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--涓婂亸宸�
+            $("#HUpOffSet").blur(function () {
+                var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+
+                option.data[HEntryID].HUpOffSet = $("#HUpOffSet").val();
+
+                var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+                var HComparator = $("#HComparator").val(); //姣旇緝绗�
+                var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
+                //====================璧嬪��/浼犲��===========================
+                var HTargetVal = $("#HTargetVal").val();//鐩爣鍊�
+                var HUpOffSet = $("#HUpOffSet").val();//涓婂亸宸�
+
+                //瀹氶噺鍒嗘瀽
+                if (HAnalysisMethod == 2) {
+                    $("#HUpLimit").val((Number(HUpOffSet) + Number(HTargetVal)).toFixed(HResDec)) //涓婇檺鍊�
+                    Qualified(HComparator, HEntryID, HAnalysisMethod);  //鍒ゆ柇鏄惁鍚堟牸
+                }
+            })
+
+            //[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--涓嬪亸宸�
+            $("#HDownOffSet").blur(function () {
+                var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+
+                option.data[HEntryID].HDownOffSet = $("#HDownOffSet").val();
+
+                var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+                var HComparator = $("#HComparator").val(); //姣旇緝绗�
+                var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
+                //====================璧嬪��/浼犲��===========================
+                var HTargetVal = $("#HTargetVal").val();//鐩爣鍊�
+                var HDownOffSet = $("#HDownOffSet").val();//涓嬪亸宸�
+
+                //瀹氶噺鍒嗘瀽
+                if (HAnalysisMethod == 2) {
+                    Qualified(HComparator, HEntryID, HAnalysisMethod);  //鍒ゆ柇鏄惁鍚堟牸
+                    $("#HDownLimit").val((Number(HDownOffSet) + Number(HTargetVal)).toFixed(HResDec)) //涓嬮檺鍊�
+                }
+            })
+
+            //#endregion
+
+            //#region銆愬垽鏂槸鍚﹀悎鏍兼柟娉曘��
+            function Qualified(HComparator, HEntryID, HAnalysisMethod) {
+                var HInspectVal = $("#HInspectVal").val(); //妫�楠屽��
+                var HTargetVal = $("#HTargetVal").val(); //鐩爣鍊�
+                var HUpLimit = $("#HUpLimit").val() //涓婇檺鍊�
+                var HDownLimit = $("#HDownLimit").val() //涓嬮檺鍊�
+                var HUpOffSet = $("#HUpOffSet").val() //涓婂亸宸�
+                var HDownOffSet = $("#HDownOffSet").val() //涓嬪亸宸�
+                var HStatus = $("#HStatus").val() //鐘舵��
+                var HAcceptQty = $("#HAcceptQty").val();//鍏佽鏁�
+
+                //#region銆愬畾鎬у垎鏋愭柟娉曘��
+                if (HAnalysisMethod == 1) {
+                    //鐘舵�佷负鍚堟牸
+                    if (HStatus == 1) {
+                        switch (HComparator) {
+                            //瀹氭�у垎鏋�:閫氳繃妫�楠屽�煎拰鐩爣鍊艰繘琛屽垽瀹氾紝1.涓や釜鍊奸兘鐩哥瓑锛屽苟涓旂姸鎬佹槸鍚堟牸鍒欏垽瀹氬悎鏍硷紱2.涓や釜鍊奸兘鐩哥瓑锛屼絾鐘舵�佷负涓嶅悎鏍煎垯鍒ゅ畾涓嶅悎鏍硷紱
+                            case '=':
+                                if (HInspectVal == HTargetVal && Number(HAcceptQty) >= Number(UnRightQty_isFied)) { //鍒ゆ柇妫�楠屽�硷紝鐩爣鍊兼槸鍚︾浉绛�
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                }
+                                break;
+                            default: break;
+                        }
+                    }
+                    else {
+                        switch (HComparator) {
+                            //瀹氭�у垎鏋�:閫氳繃妫�楠屽�煎拰鐩爣鍊艰繘琛屽垽瀹氾紝1.涓や釜鍊奸兘鐩哥瓑锛屽苟涓旂姸鎬佹槸鍚堟牸鍒欏垽瀹氬悎鏍硷紱2.涓や釜鍊奸兘鐩哥瓑锛屼絾鐘舵�佷负涓嶅悎鏍煎垯鍒ゅ畾涓嶅悎鏍硷紱
+                            case '=':
+                                if (HInspectVal == HTargetVal && Number(HAcceptQty) >= Number(UnRightQty_isFied)) { //鍒ゆ柇妫�楠屽�硷紝鐩爣鍊兼槸鍚︾浉绛�
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                }
+                                break;
+                            default: break;
+                        }
+                    }
+                }
+                //#endregion
+                //#region銆愬畾閲忓垎鏋愭柟娉曘��
+                else if (HAnalysisMethod == 2) {
+                    //鐘舵�佷负鍚堟牸
+                    if (HStatus == 1) {
+                        switch (HComparator) {
+                            case '=':
+                                //姣旇緝绗︿负'='涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��<=涓婇檺鍊兼椂鎴栬�呮楠屽��=鐩爣鍊兼椂鍒ゅ畾鍚堟牸锛�
+                                //涓婇檺鍊间负0鏃讹紝妫�楠屽��=鐩爣鍊煎垽瀹氬悎鏍硷紝
+                                //涓婇檺鍊间笉涓�0锛屾楠屽��=鐩爣鍊�&&涓婇檺鍊�>=鐩爣鍊�&&涓嬮檺鍊�<=鐩爣鍊� 鍒ゅ畾鍚堟牸
+                                if (((Number(HInspectVal) <= Number(HUpLimit) && Number(HInspectVal) >= Number(HDownLimit)) || Number(HUpLimit) == 0) && Number(HInspectVal) == Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                }
+                                break;
+                            case '>':
+                                //姣旇緝绗︿负'>'涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��>涓婇檺鍊煎垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
+                                if (Number(HInspectVal) > Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                }
+                                break;
+                            case '>=':
+                                //姣旇緝绗︿负'>='涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��>=涓婇檺鍊煎垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
+                                if (Number(HInspectVal) >= Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                }
+                                break;
+                            case '<':
+                                //姣旇緝绗︿负'<'涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��<涓婇檺鍊煎垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
+                                if (Number(HInspectVal) < Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                }
+                                break;
+                            case '<=':
+                                //姣旇緝绗︿负'<='涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��<=涓婇檺鍊煎垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
+                                if (Number(HInspectVal) <= Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                }
+                                break
+                            case '<>':
+                                //姣旇緝绗︿负'<>'涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��<>涓婇檺鍊煎垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
+                                if ((Number(HInspectVal) < Number(HTargetVal) || Number(HInspectVal) > Number(HTargetVal)) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                }
+                                break;
+                            case 'between':
+                                //姣旇緝绗︿负'between'涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽�煎湪涓嬮檺鍊间笌涓婇檺鍊间箣闂村垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
+                                if ((Number(HInspectVal) >= Number(HDownLimit) || Number(HInspectVal) <= Number(HUpLimit)) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                }
+                                break;
+                            default: break;
+                        }
+                    }
+                    else { //鐘舵�佷负涓嶅悎鏍�
+                        switch (HComparator) {
+                            case '=':
+                                //姣旇緝绗︿负'='涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��<=涓婇檺鍊兼椂鎴栬�呮楠屽��=鐩爣鍊兼椂鍒ゅ畾涓嶅悎鏍硷紝
+                                //涓婇檺鍊间负0鏃讹紝妫�楠屽��=鐩爣鍊煎垽瀹氫笉鍚堟牸锛�
+                                //涓婇檺鍊间笉涓�0锛屾楠屽��=鐩爣鍊�&&涓婇檺鍊�>=鐩爣鍊�&&涓嬮檺鍊�<=鐩爣鍊� 鍒ゅ畾涓嶅悎鏍�
+                                if (((Number(HInspectVal) <= Number(HUpLimit) && Number(HInspectVal) >= Number(HDownLimit)) || Number(HUpLimit) == 0) && Number(HInspectVal) == Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                }
+                                break;
+                            case '>':
+                                //姣旇緝绗︿负'>'涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��>涓婇檺鍊煎垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
+                                if (Number(HInspectVal) > Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                }
+                                break;
+                            case '>=':
+                                //姣旇緝绗︿负'>='涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��>=涓婇檺鍊煎垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
+                                if (Number(HInspectVal) >= Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                }
+                                break;
+                            case '<':
+                                //姣旇緝绗︿负'<'涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��<涓婇檺鍊煎垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
+                                if (Number(HInspectVal) < Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                }
+                                break;
+                            case '<=':
+                                //姣旇緝绗︿负'<='涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��<=涓婇檺鍊煎垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
+                                if (Number(HInspectVal) <= Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                }
+                                break
+                            case '<>':
+                                //姣旇緝绗︿负'<>'涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��<>涓婇檺鍊煎垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
+                                if ((Number(HInspectVal) < Number(HTargetVal) || Number(HInspectVal) > Number(HTargetVal)) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                }
+                                break;
+                            case 'between':
+                                //姣旇緝绗︿负'between'涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽�煎湪涓嬮檺鍊间笌涓婇檺鍊间箣闂村垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
+                                if ((Number(HInspectVal) >= Number(HDownLimit) || Number(HInspectVal) <= Number(HUpLimit)) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                }
+                                break;
+                            default: break;
+                        }
+                    }
+                }
+                //#endregion
+                //#region銆愬叾浠栧垎鏋愭柟娉曘��
+                else if (HAnalysisMethod == 3) {
+                    //鐘舵�佷负鍚堟牸
+                    if (HStatus == 1) {
+                        switch (HComparator) {
+                            case '=':
+                                //姣旇緝绗︿负'='涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽�煎唴瀹逛笌鐩爣鍊煎唴瀹逛竴鑷村垽瀹氬悎鏍硷紝
+                                if (HInspectVal.toString() == HTargetVal.toString() && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                }
+                                break;
+                            default: break;
+                        }
+                    }
+                    else { //鐘舵�佷负涓嶅悎鏍�
+                        switch (HComparator) {
+                            case '=':
+                                //姣旇緝绗︿负'='涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽�煎唴瀹逛笌鐩爣鍊煎唴瀹逛竴鑷村垽瀹氫笉鍚堟牸锛�
+                                if (HInspectVal.toString() == HTargetVal.toString() && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                }
+                                break;
+                            default: break;
+                        }
+                    }
+                }
+                //#endregion
+
+                form.render('select');
+                //鑾峰彇琛ㄤ綋缁撹鏁版嵁璧嬪�肩粰妫�楠岀粨鏋�
+                var HEntryID = $('#HEntryID').val();
+                var HInspectResultToSee = $("#HResult" + HEntryID).val()
+                if (HInspectResultToSee == 1) {
+                    HInspectResultToSee = "鍚堟牸"
+                    $("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                } else {
+                    HInspectResultToSee = "涓嶅悎鏍�"
+                    $("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                }
+                $("#HInspectResultToSee").val(HInspectResultToSee);
+                $("#HInspectResultToSee2").val(HInspectResultToSee);
+                LastResult();
+            };
+            //#endregion
+
+            //#region銆愯祴鍊间笌鍥炴樉銆�
+            function Assignment(nowindex, dataindex) {
+                console.log(JSON.stringify(option.data));
+                if (SummaryIndex.indexOf(nowindex) == -1 && option.data[0].HSampleSchemeID == 0) {
+                    var dataobj = {
+                        HEntryID: $("#HEntryID").val(), //琛屽彿
+                        HStatus: $("#HStatus").val(), //鐘舵��
+                        HSampleSchemeID: $("#HSampleSchemeID").val(), //鎶芥牱鏂规ID
+                        HSampleSchemeName: $("#HSampleSchemeName").val(), //鎶芥牱鏂规
+                        //xxx: $("#xxx").val(),
+                        HUnitID: $("#HUnitID").val(), //鍗曚綅ID
+                        HUnit: $("#HUnit").val(), //鍗曚綅
+                        HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
+                        HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
+                        HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
+                        HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
+                        HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
+                        HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
+                        HSampleDamageQty: $("#HSampleDamageQty").val(), //鏍锋湰鐮村潖鏁�
+                        HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
+                        HAcceptQty: $("#HAcceptQty").val(), //鍏佽鏁�
+                        HInspectionLevel: $("#HInspectionLevel").val(), //妫�楠屾按骞�
+                        HRejectQty: $("#HRejectQty").val(), //鎷掔粷鏁�
+                        HStrictness: $("#HStrictness").val(), //涓ユ牸搴�
+                        HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
+                        HAQL: $("#HAQL").val(), //AQL
+                        HSamplingType: $("#HSamplingType").val(),
+
+                        HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
+                        HInspectResultToSee: $("#HInspectResultToSee").val(), //妫�楠岀粨鏋�
+                        HInspectResultToSee2: $("#HInspectResultToSee2").val(), //妫�楠岀粨鏋�2
+                        HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
+                        HUnitID: $("#HUnitID").val(), //鍗曚綅ID
+                        HUnitName: $("#HUnitName").val(), //鍗曚綅
+                        HInspectValB: $("#HInspectValB").val(), //妫�楠屽�糏D
+                        HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
+                        HTargetValB: $("#HTargetValB").val(), //鐩爣鍊糏D
+                        HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
+                        HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
+                        HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
+                        HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
+                        HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
+                    };
+
+                    //鑾峰彇鏂囨湰妗嗗��
+                    var maindata = table.cache['mainTable'];
+                    //璧嬪�硷紝鍌ㄥ瓨鏁版嵁
+                    maindata[dataindex].HStatus = dataobj.HStatus;
+                    maindata[dataindex].HSampleSchemeID = dataobj.HSampleSchemeID;
+                    maindata[dataindex].HUnitID = dataobj.HUnitID;
+                    maindata[dataindex].HInspectVal = dataobj.HInspectVal;
+                    maindata[dataindex].HTargetVal = dataobj.HTargetVal;
+                    maindata[dataindex].HUpLimit = dataobj.HUpLimit;
+                    maindata[dataindex].HDownLimit = dataobj.HDownLimit;
+                    maindata[dataindex].HUpOffSet = dataobj.HUpOffSet;
+                    maindata[dataindex].HDownOffSet = dataobj.HDownOffSet;
+                    maindata[dataindex].HSampleDamageQty = dataobj.HSampleDamageQty;
+                    maindata[dataindex].HSampleSchemeName = dataobj.HSampleSchemeName;
+                    maindata[dataindex].HUnit = dataobj.HUnit;
+                    maindata[dataindex].HSampleQty = dataobj.HSampleQty;
+                    maindata[dataindex].HAcceptQty = dataobj.HAcceptQty;
+                    maindata[dataindex].HInspectionLevel = dataobj.HInspectionLevel;
+                    maindata[dataindex].HRejectQty = dataobj.HRejectQty;
+                    maindata[dataindex].HStrictness = dataobj.HStrictness;
+                    maindata[dataindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
+                    maindata[dataindex].HAQL = dataobj.HAQL;
+                    maindata[dataindex].HSamplingType = dataobj.HSamplingType;
+
+                    maindata[dataindex].HSampleQty = dataobj.HSampleQty;
+                    maindata[dataindex].HInspectResultToSee = dataobj.HInspectResultToSee;
+                    maindata[dataindex].HInspectResultToSee2 = dataobj.HInspectResultToSee2;
+                    maindata[dataindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
+                    maindata[dataindex].HUnitID = dataobj.HUnitID;
+                    maindata[dataindex].HUnitName = dataobj.HUnitName;
+                    maindata[dataindex].HInspectValB = dataobj.HInspectValB;
+                    maindata[dataindex].HInspectVal = dataobj.HInspectVal;
+                    maindata[dataindex].HTargetValB = dataobj.HTargetValB;
+                    maindata[dataindex].HTargetVal = dataobj.HTargetVal;
+                    maindata[dataindex].HUpLimit = dataobj.HUpLimit;
+                    maindata[dataindex].HDownLimit = dataobj.HDownLimit;
+                    maindata[dataindex].HUpOffSet = dataobj.HUpOffSet;
+                    maindata[dataindex].HDownOffSet = dataobj.HDownOffSet;
+
+                    SummaryIndex.push(nowindex);
+
+                    $("#HSampleSchemeID").val(0);
+                    $("#HSampleSchemeName").val("");
+                    //xxx: $("#xxx").val();
+                    $("#HUnitID").val(0);
+                    $("#HUnit").val("");
+                    $("#HInspectVal").val("");
+                    $("#HTargetVal").val("");
+                    $("#HUpLimit").val(0);
+                    $("#HDownLimit").val(0);
+                    $("#HUpOffSet").val(0);
+                    $("#HDownOffSet").val(0);
+                    $("#HSampleDamageQty").val("")
+                    $("#HSampleQty").val("")
+                    $("#HSampleQty2").val("")
+                    $("#HAcceptQty").val("0")
+                    $("#HInspectionLevel").val("")
+                    $("#HRejectQty").val("")
+                    $("#HStrictness").val("")
+                    $("#HSampleUnRightQty").val("")
+                    $("#HSampleUnRightQty2").val("")
+                    $("#HAQL").val("")
+                    $("#HSamplingType").val("")
+                    $("#HSampleQty").val("")
+                    $("#HInspectResultToSee").val("")
+                    $("#HInspectResultToSee2").val("")
+                    $("#HSampleUnRightQty").val("")
+                    $("#HUnitID").val("0")
+                    $("#HUnitName").val("")
+                    $("#HInspectValB").val("0")
+                    $("#HInspectVal").val("")
+                    $("#HTargetValB").val("0")
+                    $("#HTargetVal").val("")
+                    $("#HUpLimit").val("0")
+                    $("#HDownLimit").val("0")
+                    $("#HUpOffSet").val("0")
+                    $("#HDownOffSet").val("0")
+
+                } else { //琛ㄤ綋鏂囨湰妗嗗�煎洖鏄�
+                    //鑾峰彇鏂囨湰妗嗗��
+                    var maindata = table.cache['mainTable'];
+
+                    if (OperationType == 3) {
+                        $("[name='HEntryID']").val(Number(nowindex) + Number(1));
+                        $("[name='HQCCheckItemName']").val(option.data[nowindex].妫�楠岄」鐩�);
+
+                        var dataobj = {
+                            HEntryID: $("#HEntryID").val(), //琛屽彿
+                            HStatus: $("#HStatus").val(), //鐘舵��
+                            HSampleSchemeID: option.data[nowindex].HSampleSchemeID, //鎶芥牱鏂规ID
+                            HSampleSchemeName: option.data[nowindex].HSampleSchemeName, //鎶芥牱鏂规
+                            //xxx: $("#xxx").val(),
+                            HUnitID: option.data[nowindex].HUnitID, //鍗曚綅ID
+                            HUnit: option.data[nowindex].HUnit,//鍗曚綅
+                            HInspectVal: option.data[nowindex].HInspectVal, //妫�楠屽��
+                            HTargetVal: option.data[nowindex].HTargetVal, //鐩爣鍊�
+                            HUpLimit: option.data[nowindex].HUpLimit, //涓婇檺鍊�
+                            HDownLimit: option.data[nowindex].HDownLimit, //涓嬮檺鍊�
+                            HUpOffSet: option.data[nowindex].HUpOffSet, //涓婂亸宸�
+                            HDownOffSet: option.data[nowindex].HDownOffSet, //涓嬪亸宸�
+                            HSampleDamageQty: option.data[nowindex].HSampleDamageQty, //鏍锋湰鐮村潖鏁�
+                            HSampleQty: option.data[nowindex].HSampleQty, //鏍锋湰閲�
+                            HAcceptQty: option.data[nowindex].HAcceptQty,//鍏佽鏁�
+                            HInspectionLevel: option.data[nowindex].HInspectionLevel, //妫�楠屾按骞�
+                            HRejectQty: option.data[nowindex].HRejectQty, //鎷掔粷鏁�
+                            HStrictness: option.data[nowindex].HStrictness, //涓ユ牸搴�
+                            HSampleUnRightQty: option.data[nowindex].HSampleUnRightQty, //鏍锋湰涓嶅悎鏍兼暟
+                            HAQL: option.data[nowindex].HAQL, //AQL
+                            HSamplingType: option.data[nowindex].HSamplingType,
+
+                            HSampleQty: option.data[nowindex].HSampleQty, //鏍锋湰閲�
+                            HInspectResultToSee: '', //妫�楠岀粨鏋�
+                            HInspectResultToSee2: '', //妫�楠岀粨鏋�2
+                            HSampleUnRightQty: option.data[nowindex].HSampleUnRightQty,//鏍锋湰涓嶅悎鏍兼暟
+                            HUnitID: option.data[nowindex].HUnitID, //鍗曚綅ID
+                            HUnitName: option.data[nowindex].HUnit, //鍗曚綅
+                            HInspectValB: option.data[nowindex].HInspectValB,//妫�楠屽�糏D
+                            HInspectVal: option.data[nowindex].HInspectVal, //妫�楠屽��
+                            HTargetValB: option.data[nowindex].HTargetValB, //鐩爣鍊糏D
+                            HTargetVal: option.data[nowindex].HTargetVal,//鐩爣鍊�
+                            HUpLimit: option.data[nowindex].HUpLimit, //涓婇檺鍊�
+                            HDownLimit: option.data[nowindex].HDownLimit, //涓嬮檺鍊�
+                            HUpOffSet: option.data[nowindex].HUpOffSet, //涓婂亸宸�
+                            HDownOffSet: option.data[nowindex].HDownOffSet, //涓嬪亸宸�
+                        };
+                    } else {
+                        //var dataobj = {
+                        //    HEntryID: $("#HEntryID").val(), //琛屽彿
+                        //    HStatus: $("#HStatus").val(), //鐘舵��
+                        //    HSampleSchemeID: $("#HSampleSchemeID").val(), //鎶芥牱鏂规ID
+                        //    HSampleSchemeName: $("#HSampleSchemeName").val(), //鎶芥牱鏂规
+                        //    //xxx: $("#xxx").val(),
+                        //    HUnitID: $("#HUnitID").val(), //鍗曚綅ID
+                        //    HUnit: $("#HUnit").val(), //鍗曚綅
+                        //    HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
+                        //    HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
+                        //    HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
+                        //    HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
+                        //    HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
+                        //    HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
+                        //    HSampleDamageQty: $("#HSampleDamageQty").val(), //鏍锋湰鐮村潖鏁�
+                        //    HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
+                        //    HAcceptQty: $("#HAcceptQty").val(), //鍏佽鏁�
+                        //    HInspectionLevel: $("#HInspectionLevel").val(), //妫�楠屾按骞�
+                        //    HRejectQty: $("#HRejectQty").val(), //鎷掔粷鏁�
+                        //    HStrictness: $("#HStrictness").val(), //涓ユ牸搴�
+                        //    HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
+                        //    HAQL: $("#HAQL").val(), //AQL
+                        //    HSamplingType: $("#HSamplingType").val(),
+
+                        //    HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
+                        //    HInspectResultToSee: $("#HInspectResultToSee").val(), //妫�楠岀粨鏋�
+                        //    HInspectResultToSee2: $("#HInspectResultToSee2").val(), //妫�楠岀粨鏋�2
+                        //    HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
+                        //    HUnitID: $("#HUnitID").val(), //鍗曚綅ID
+                        //    HUnitName: $("#HUnitName").val(), //鍗曚綅
+                        //    HInspectValB: $("#HInspectValB").val(), //妫�楠屽�糏D
+                        //    HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
+                        //    HTargetValB: $("#HTargetValB").val(), //鐩爣鍊糏D
+                        //    HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
+                        //    HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
+                        //    HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
+                        //    HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
+                        //    HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
+                        //};
+
+                        var dataobj = {
+                            HEntryID: $("#HEntryID").val(), //琛屽彿
+                            HStatus: $("#HStatus").val(), //鐘舵��
+                            HSampleSchemeID: option.data[nowindex].HSampleSchemeID, //鎶芥牱鏂规ID
+                            HSampleSchemeName: option.data[nowindex].HSampleSchemeName, //鎶芥牱鏂规
+                            //xxx: $("#xxx").val(),
+                            HUnitID: option.data[nowindex].HUnitID, //鍗曚綅ID
+                            HUnit: option.data[nowindex].HUnit,//鍗曚綅
+                            HInspectVal: option.data[nowindex].HInspectVal, //妫�楠屽��
+                            HTargetVal: option.data[nowindex].HTargetVal, //鐩爣鍊�
+                            HUpLimit: option.data[nowindex].HUpLimit, //涓婇檺鍊�
+                            HDownLimit: option.data[nowindex].HDownLimit, //涓嬮檺鍊�
+                            HUpOffSet: option.data[nowindex].HUpOffSet, //涓婂亸宸�
+                            HDownOffSet: option.data[nowindex].HDownOffSet, //涓嬪亸宸�
+                            HSampleDamageQty: option.data[nowindex].HSampleDamageQty, //鏍锋湰鐮村潖鏁�
+                            HSampleQty: option.data[nowindex].HSampleQty, //鏍锋湰閲�
+                            HAcceptQty: option.data[nowindex].HAcceptQty,//鍏佽鏁�
+                            HInspectionLevel: option.data[nowindex].HInspectionLevel, //妫�楠屾按骞�
+                            HRejectQty: option.data[nowindex].HRejectQty, //鎷掔粷鏁�
+                            HStrictness: option.data[nowindex].HStrictness, //涓ユ牸搴�
+                            HSampleUnRightQty: option.data[nowindex].HSampleUnRightQty, //鏍锋湰涓嶅悎鏍兼暟
+                            HAQL: option.data[nowindex].HAQL, //AQL
+                            HSamplingType: option.data[nowindex].HSamplingType,
+
+                            HSampleQty: option.data[nowindex].HSampleQty, //鏍锋湰閲�
+                            HInspectResultToSee: '', //妫�楠岀粨鏋�
+                            HInspectResultToSee2: '', //妫�楠岀粨鏋�2
+                            HSampleUnRightQty: option.data[nowindex].HSampleUnRightQty,//鏍锋湰涓嶅悎鏍兼暟
+                            HUnitID: option.data[nowindex].HUnitID, //鍗曚綅ID
+                            HUnitName: option.data[nowindex].HUnit, //鍗曚綅
+                            HInspectValB: option.data[nowindex].HInspectValB,//妫�楠屽�糏D
+                            HInspectVal: option.data[nowindex].HInspectVal, //妫�楠屽��
+                            HTargetValB: option.data[nowindex].HTargetValB, //鐩爣鍊糏D
+                            HTargetVal: option.data[nowindex].HTargetVal,//鐩爣鍊�
+                            HUpLimit: option.data[nowindex].HUpLimit, //涓婇檺鍊�
+                            HDownLimit: option.data[nowindex].HDownLimit, //涓嬮檺鍊�
+                            HUpOffSet: option.data[nowindex].HUpOffSet, //涓婂亸宸�
+                            HDownOffSet: option.data[nowindex].HDownOffSet, //涓嬪亸宸�
+                        };
+                    }
+                    //if (option.data[0].HSampleSchemeID == 0) {
+                    //璧嬪�硷紝鍌ㄥ瓨鏁版嵁
+                    maindata[nowindex].HStatus = dataobj.HStatus;
+                    maindata[nowindex].HSampleSchemeID = dataobj.HSampleSchemeID;
+                    maindata[nowindex].HUnitID = dataobj.HUnitID;
+                    maindata[nowindex].HInspectVal = dataobj.HInspectVal;
+                    maindata[nowindex].HTargetVal = dataobj.HTargetVal;
+                    maindata[nowindex].HUpLimit = dataobj.HUpLimit;
+                    maindata[nowindex].HDownLimit = dataobj.HDownLimit;
+                    maindata[nowindex].HUpOffSet = dataobj.HUpOffSet;
+                    maindata[nowindex].HDownOffSet = dataobj.HDownOffSet;
+                    maindata[nowindex].HSampleDamageQty = dataobj.HSampleDamageQty;
+                    maindata[nowindex].HSampleSchemeName = dataobj.HSampleSchemeName;
+                    maindata[nowindex].HUnit = dataobj.HUnit;
+                    maindata[nowindex].HSampleQty = dataobj.HSampleQty;
+                    maindata[nowindex].HAcceptQty = dataobj.HAcceptQty;
+                    maindata[nowindex].HInspectionLevel = dataobj.HInspectionLevel;
+                    maindata[nowindex].HRejectQty = dataobj.HRejectQty;
+                    maindata[nowindex].HStrictness = dataobj.HStrictness;
+                    maindata[nowindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
+                    maindata[nowindex].HAQL = dataobj.HAQL;
+                    maindata[nowindex].HSamplingType = dataobj.HSamplingType;
+
+                    maindata[nowindex].HSampleQty = dataobj.HSampleQty;
+                    maindata[nowindex].HInspectResultToSee = dataobj.HInspectResultToSee;
+                    maindata[nowindex].HInspectResultToSee2 = dataobj.HInspectResultToSee2;
+                    maindata[nowindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
+                    maindata[nowindex].HUnitID = dataobj.HUnitID;
+                    maindata[nowindex].HUnitName = dataobj.HUnitName;
+                    maindata[nowindex].HInspectValB = dataobj.HInspectValB;
+                    maindata[nowindex].HInspectVal = dataobj.HInspectVal;
+                    maindata[nowindex].HTargetValB = dataobj.HTargetValB;
+                    maindata[nowindex].HTargetVal = dataobj.HTargetVal;
+                    maindata[nowindex].HUpLimit = dataobj.HUpLimit;
+                    maindata[nowindex].HDownLimit = dataobj.HDownLimit;
+                    maindata[nowindex].HUpOffSet = dataobj.HUpOffSet;
+                    maindata[nowindex].HDownOffSet = dataobj.HDownOffSet;
+                    //}
+
+
+                    //鍥炴樉
+                    $("#HSampleSchemeID").val(maindata[nowindex].HSampleSchemeID);
+                    $("#HSampleSchemeName").val(maindata[nowindex].HSampleSchemeName);
+                    //xxx: $("#xxx").val();
+                    $("#HUnitID").val(maindata[nowindex].HUnitID);
+                    $("#HUnit").val(maindata[nowindex].HUnit);
+                    $("#HInspectVal").val(maindata[nowindex].HInspectVal);
+                    $("#HTargetVal").val(maindata[nowindex].HTargetVal);
+                    $("#HUpLimit").val(maindata[nowindex].HUpLimit);
+                    $("#HDownLimit").val(maindata[nowindex].HDownLimit);
+                    $("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
+                    $("#HDownOffSet").val(maindata[nowindex].HDownOffSet);
+                    $("#HSampleDamageQty").val(maindata[nowindex].HSampleDamageQty);
+                    $("#HSampleQty").val(maindata[nowindex].HSampleQty);
+                    $("#HSampleQty2").val(maindata[nowindex].HSampleQty);
+                    $("#HAcceptQty").val(maindata[nowindex].HAcceptQty);
+                    $("#HInspectionLevel").val(maindata[nowindex].HInspectionLevel);
+                    $("#HRejectQty").val(maindata[nowindex].HRejectQty);
+                    $("#HStrictness").val(maindata[nowindex].HStrictness);
+                    $("#HSampleUnRightQty").val(maindata[nowindex].HSampleUnRightQty);
+                    $("#HSampleUnRightQty2").val(maindata[nowindex].HSampleUnRightQty);
+                    $("#HAQL").val(maindata[nowindex].HAQL);
+                    $("#HSamplingType").val(maindata[nowindex].HSamplingType);
+                    $("#HSampleQty").val(maindata[nowindex].HSampleQty);
+                    $("#HInspectResultToSee").val(maindata[nowindex].HInspectResultToSee);
+                    $("#HInspectResultToSee2").val(maindata[nowindex].HInspectResultToSee2);
+                    $("#HSampleUnRightQty").val(maindata[nowindex].HSampleUnRightQty);
+                    $("#HUnitID").val(maindata[nowindex].HUnitID);
+                    $("#HUnitName").val(maindata[nowindex].HUnitName);
+                    $("#HInspectValB").val(maindata[nowindex].HInspectValB);
+                    $("#HInspectVal").val(maindata[nowindex].HInspectVal);
+                    $("#HTargetValB").val(maindata[nowindex].HTargetValB);
+                    $("#HTargetVal").val(maindata[nowindex].HTargetVal);
+                    $("#HUpLimit").val(maindata[nowindex].HUpLimit);
+                    $("#HDownLimit").val(maindata[nowindex].HDownLimit);
+                    $("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
+                    $("#HDownOffSet").val(maindata[nowindex].HDownOffSet);
+
+                    if (maindata[nowindex].HInspectResultToSee == "鍚堟牸") {
+                        $("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                        $("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                    } else {
+                        $("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                        $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                    }
+
+                    //鍥炴樉妫�楠屽��
+                    EchoValue();
+                }
+            }
+            //#endregion
+
+            //鍥炴樉妫�楠屽��
+            function EchoValue() {
+                var HInterID = $("#HInterID").val();
+                var HEntryID = OperationType == 3 ? editIndex : $("#HEntryID").val();
+                isHavingCount = false;
+                //鍥炴樉妫�楠屽��
+                $.ajax({
+                    url: GetWEBURL() + "/QC_ValueTable/getValueList",
+                    type: "GET",
+                    async: false,
+                    data: { "HInterID": HInterID, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            isHavingCount = true
+
+                            var data = result.data;
+
+                            var rowdata = [];
+                            for (var i = 0; i < result.data.length; i++) {
+                                //瀛欒〃  璧嬪��
+                                rowdata.push({
+                                    "HSEQ": data[i]["HSEQ"], "HInSpectResult": data[i]["HInSpectResult"], "HInSpectValueB": data[i]["HInSpectValueB"] == '' ? 0 : data[i]["HInSpectValueB"], "HInSpectValueT": data[i]["HInSpectValueT"] == '' ? 0 : data[i]["HInSpectValueT"], "HInSpectValue": data[i]["HInSpectValue"] == '' ? 0 : data[i]["HInSpectValue"]
+                                });
+                            }
+
+                            option_Value.data = rowdata;
+                            table.render(option_Value);
+                            for (var i = 0; i < result.data.length; i++) {
+                                $('#HInSpectResult' + (i + 1)).find("option[value='" + result.data[i].HInSpectResult + "']").attr("selected", true);
+                            }
+
+                            IsHide(table.cache["mainTable"][HEntryID - 1].HAnalysisMethod); //闅愯棌妫�娴嬪�煎瓧娈�
+                            form.render('select');
+                        } else {
+                            option_Value.data = [{
+                                "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
+                            }];
+                            table.render(option_Value);
+                            //layer.msg(result.code + result.Message, { icon: 5 });
+                        }
+                    }
+                })
+            }
+
+            //鑾峰彇涓嶅悎鏍兼暟鎬绘暟
+            function addUnRightQty() {
+                //寰幆妫�楠屽�艰〃鏍兼暟鎹紝鑾峰彇涓嶅悎鏍兼暟閲�
+                var HValueTable = table.cache["ValueTable"];
+                var UnRightQty = 0;//妫�楠屽�艰〃鏍间笉鍚堟牸鏁伴噺姹囨��
+
+                for (let i = 0; i < HValueTable.length; i++) {
+                    if (HValueTable[i].HInSpectResult == 2) {
+                        UnRightQty++;
+                    }
+                }
+                UnRightQty_isFied = UnRightQty;
+                $("#HSampleUnRightQty").val(UnRightQty);
+                $("#HSampleUnRightQty2").val(UnRightQty);
+                var HAcceptQty = $("#HAcceptQty").val();//鍏佽鏁�
+                var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+                if (UnRightQty > HAcceptQty) {
+                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                    $("#HInspectResultToSee").val('涓嶅悎鏍�');
+                    $("#HInspectResultToSee2").val('涓嶅悎鏍�');
+                    $("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                } else {
+                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                    $("#HInspectResultToSee").val('鍚堟牸');
+                    $("#HInspectResultToSee2").val('鍚堟牸');
+                    $("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                }
+                form.render('select');
+                LastResult();
+            }
+
+            //妫�楠屽�艰嚜鍔ㄥ垽鏂槸鍚﹀悎鏍�
+            function Qualified_Value(HComparator, MBValue, value, obj) {
+                var HUpLimit = $("#HUpLimit").val(); //涓婇檺鍊�
+                var HDownLimit = $("#HDownLimit").val(); //涓嬮檺鍊�
+                var HStatus = $("#HStatus").val() //鐘舵��
+
+                if (HStatus == 1) {
+                    switch (HComparator) {
+                        case "=":
+                            if (Number(value) == Number(MBValue)) { //鍏朵粬妫�娴嬪�� = 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            }
+                            break;
+                        case ">":
+                            if (Number(value) > Number(MBValue)) { //鍏朵粬妫�娴嬪�� > 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            }
+                            break;
+                        case ">=":
+                            if (Number(value) >= Number(MBValue)) { //鍏朵粬妫�娴嬪�� >= 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            }
+                            break;
+                        case "<":
+                            if (Number(value) < Number(MBValue)) { //鍏朵粬妫�娴嬪�� < 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            }
+                            break;
+                        case "<=":
+                            if (Number(value) <= Number(MBValue)) { //鍏朵粬妫�娴嬪�� <= 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            }
+                            break;
+                        case "<>":
+                            if (Number(value) < Number(MBValue) || Number(value) > Number(MBValue)) { //鍏朵粬妫�娴嬪�� <> 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            }
+                            break;
+                        case "between":
+                            if (Number(value) >= Number(HDownLimit) && Number(value) <= Number(HUpLimit)) { //鍏朵粬妫�娴嬪�� between 涓婁笅闄愬�硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            }
+                            break;
+                    }
+                } else {
+                    switch (HComparator) {
+                        case "=":
+                            if (Number(value) == Number(MBValue)) { //鍏朵粬妫�娴嬪�� = 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            }
+                            break;
+                        case ">":
+                            if (Number(value) > Number(MBValue)) { //鍏朵粬妫�娴嬪�� > 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            }
+                            break;
+                        case ">=":
+                            if (Number(value) >= Number(MBValue)) { //鍏朵粬妫�娴嬪�� >= 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            }
+                            break;
+                        case "<":
+                            if (Number(value) < Number(MBValue)) { //鍏朵粬妫�娴嬪�� < 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            }
+                            break;
+                        case "<=":
+                            if (Number(value) <= Number(MBValue)) { //鍏朵粬妫�娴嬪�� <= 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            }
+                            break;
+                        case "<>":
+                            if (Number(value) < Number(MBValue) || Number(value) > Number(MBValue)) { //鍏朵粬妫�娴嬪�� <> 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            }
+                            break;
+                        case "between":
+                            if (Number(value) >= Number(HDownLimit) && Number(value) <= Number(HUpLimit)) { //鍏朵粬妫�娴嬪�� between 涓婁笅闄愬�硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            }
+                            break;
+                    }
+                }
+
+
+                form.render('select');
+            }
+
+            //妫�楠屽�间繚瀛�
+            function set_SaveValue(dataindex) {
+                if (OperationType == 3) {
+                    EchoValue();
+                }
+                for (let i = 0; i < table.cache['ValueTable'].length; i++) {
+                    if (table.cache['ValueTable'][i].HInSpectValueB == "" || table.cache['ValueTable'][i].HInSpectValueB == null) {
+                        table.cache['ValueTable'][i].HInSpectValueB = 0
+                    }
+                    if (table.cache['ValueTable'][i].HInSpectValueT == "" || table.cache['ValueTable'][i].HInSpectValueT == null) {
+                        table.cache['ValueTable'][i].HInSpectValueT = 0
+                    }
+                    if (table.cache['ValueTable'][i].HInSpectValue == "" || table.cache['ValueTable'][i].HInSpectValue == null) {
+                        table.cache['ValueTable'][i].HInSpectValue = 0
+                    }
+                }
+                var sValueTable = JSON.stringify(table.cache['ValueTable']);
+                var HInterID = $("#HInterID").val();
+                var HEntryID = dataindex;
+                var msg = sValueTable + ";" + HInterID + ";" + HEntryID
+
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/QC_FirstPieceCheckBill/set_SaveValue",
+                    async: true,
+                    data: { "msg": msg },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) {
+                            layer.close(index);
+                            //$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg("妫�楠屽�间繚瀛橀敊璇紒" + data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("妫�楠屽�间繚瀛橀敊璇�:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+
+            //#region銆愰殣钘忔娴嬪�煎瓧娈点��
+            function IsHide(HAnalysisMethod_Value) {
+                if (HAnalysisMethod_Value == 1) { //濡傛灉閫変腑銆愬畾鎬у垎鏋愩�戯紝鍒欓殣钘忓畾閲忋�佸叾浠栧垎鏋�
+                    option_Value.cols[0][3].hide = false; //瀹氭��
+                    option_Value.cols[0][4].hide = true;  //瀹氶噺
+                    option_Value.cols[0][5].hide = true;  //鍏朵粬
+
+                    $("#HComparator").attr("disabled", true); //姣旇緝绗︽敼涓轰笉鍙紪杈�
+                    $("#HUpLimit").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓婇檺鍊艰緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HDownLimit").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓嬮檺鍊艰緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HUpOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓婂亸宸緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HDownOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓嬪亸宸緭鍏ユ鑳屾櫙棰滆壊
+
+                    $('#btnSearchInspectValB').removeClass("layui-btn-disabled").attr("disabled", false);//妫�楠屽�兼寜閽惎鐢�
+                    $('#btnSearchTargetValB').removeClass("layui-btn-disabled").attr("disabled", false);//鐩爣鍊兼寜閽惎鐢�
+
+                } else if (HAnalysisMethod_Value == 2) { //濡傛灉閫変腑銆愬畾閲忓垎鏋愩�戯紝鍒欓殣钘忓畾鎬с�佸叾浠栧垎鏋�
+                    option_Value.cols[0][4].hide = false;  //瀹氶噺
+                    option_Value.cols[0][3].hide = true;  //瀹氭��
+                    option_Value.cols[0][5].hide = true;  //鍏朵粬
+
+                    $("#HUpLimit").attr("readOnly", false).css("background-color", ""); //涓婇檺鍊兼敼涓哄彲缂栬緫
+                    $("#HDownLimit").attr("readOnly", false).css("background-color", ""); //涓嬮檺鍊兼敼涓哄彲缂栬緫
+                    $("#HUpOffSet").attr("readOnly", false).css("background-color", ""); //涓婂亸宸敼涓哄彲缂栬緫
+                    $("#HDownOffSet").attr("readOnly", false).css("background-color", ""); //涓嬪亸宸敼涓哄彲缂栬緫
+                    $("#HInspectVal").attr("readOnly", false).css("background-color", ""); //妫�楠屽�兼敼涓哄彲缂栬緫
+                    $("#HTargetVal").attr("readOnly", false).css("background-color", ""); //鐩爣鍊兼敼涓哄彲缂栬緫
+                    $('#btnSearchInspectValB').addClass("layui-btn-disabled").attr("disabled", true);//妫�楠屽�兼寜閽�
+                    $('#btnSearchTargetValB').addClass("layui-btn-disabled").attr("disabled", true);//鐩爣鍊兼寜閽�
+                    $("#HComparator").attr("disabled", false); //姣旇緝绗︽敼涓哄彲缂栬緫
+
+
+                } else if (HAnalysisMethod_Value == 3) { //濡傛灉閫変腑銆愬叾浠栧垎鏋愩�戯紝鍒欓殣钘忓畾閲忋�佸畾鎬у垎鏋�
+                    option_Value.cols[0][5].hide = false;  //鍏朵粬
+                    option_Value.cols[0][3].hide = true;  //瀹氭��
+                    option_Value.cols[0][4].hide = true;  //瀹氶噺
+
+                    $('#btnSearchInspectValB').addClass("layui-btn-disabled").attr("disabled", true);//妫�楠屽�兼寜閽�
+                    $('#btnSearchTargetValB').addClass("layui-btn-disabled").attr("disabled", true);//鐩爣鍊兼寜閽�
+                    $("#HUpOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓婂亸宸緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HDownOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓嬪亸宸緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HUpLimit").attr("readOnly", false).css("background-color", ""); //涓婇檺鍊兼敼涓哄彲缂栬緫
+                    $("#HDownLimit").attr("readOnly", false).css("background-color", ""); //涓嬮檺鍊兼敼涓哄彲缂栬緫
+                    $("#HInspectVal").attr("readOnly", false).css("background-color", ""); //妫�楠屽�兼敼涓哄彲缂栬緫
+                    $("#HTargetVal").attr("readOnly", false).css("background-color", ""); //鐩爣鍊兼敼涓哄彲缂栬緫
+                    $('#btnSearchInspectValB').addClass("layui-btn-disabled").attr("disabled", true);//妫�楠屽�兼寜閽�
+                    $('#btnSearchTargetValB').addClass("layui-btn-disabled").attr("disabled", true);//鐩爣鍊兼寜閽�
+                    $("#HComparator").attr("disabled", true); //姣旇緝绗︽敼涓轰笉鍙紪杈�
+
+                }
+                //閲嶆柊娓叉煋琛ㄦ牸
+                table.render(option_Value);
+                //涓嬫媺妗嗗洖鏄�
+                for (var i = 0; i < option_Value.data.length; i++) {
+                    $('#HInSpectResult' + (i + 1)).find("option[value='" + option_Value.data[i].HInSpectResult + "']").attr("selected", true);
+                }
+                form.render("select");
+            }
+            //#endregion
+
+            //#region銆愭敼鍙橀�変腑琛岄鑹层��
+            function check_row(obj) {
+                if (trindex != "") {
+                    $("tr[data-index = " + (trindex) + "] ").attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                    trindex = "";
+                }
+
+                if (checkobj != "") {
+                    checkobj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    checkobj.tr.find(':checkbox:first').prop('checked', false);//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(checkobj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //$('#HKeyInspect2').attr("checked", false);
+                var num = [];
+                for (var i = 0; i < option.data.length; i++) {
+                    var a = $('#HKeyInspect' + (i + 1)).prop("checked");
+                    num.push(a);
+                }
+
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                    checkobj = obj;
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    } else {
+                        l.LAY_CHECKED = false;
+                    }
+                });
+                for (var i = 0; i < option.data.length; i++) {
+
+                    if (num[i]) {
+                        $('#HKeyInspect' + (i + 1)).prop("checked", true);
+                    } else {
+                        $('#HKeyInspect' + (i + 1)).prop("checked", false);
+                    }
+                }
+                form.render('checkbox');
+            }
+            //#endregion
+
+            //#region 銆愬簾寮冧唬鐮併��
+            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);
+
+                var HInspectVal = $("#HInspectVal").val(); //妫�楠屽��
+                var HTargetVal = $("#HTargetVal").val(); //鐩爣鍊�
+                var HComparator = $("#HComparator").val(); //姣旇緝绗�
+                var HEntryID = $("#HEntryID").val() - 1;
+                var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+                console.log(HAnalysisMethod);
+                switch (field) {
+                    case "HInspectVal":  //妫�楠屽��
+                        value = isNaN(value) ? 0 : value;
+                        if (HInspectVal) {
+
+                        }
+
+                        break;
+                    case "HTargetVal":  //鐩爣鍊�
+                        value = isNaN(value) ? 0 : value;
+
+
+                        break;
+                    default:
+                }
+            });
+
+            function createArr(rowIndex) {
+                var arr_value = table.cache['ValueTable']; //鑾峰彇妫�娴嬪�煎崟鍏冩牸鏁版嵁
+
+                arr_value_add = []; //鏂板琛屽彿瀛楁
+                arr_value.map((item, index) => {
+                    arr_value_add.push(Object.assign({}, item, { rowNum: rowIndex }))
+                })
+
+                if (Array.length > 0) {//濡傛灉鏁扮粍涓嶄负绌哄垯閬嶅巻鏁扮粍
+                    var whetherAdd = false; //鏄惁宸茬粡娣诲姞杩囧綋鍓嶈鍙风殑鏁扮粍
+                    //閬嶅巻鏁扮粍
+                    Array.some(item => {
+                        if (item[0].rowNum == rowIndex) {
+                            whetherAdd = true;
+                            return true;//璺冲嚭閬嶅巻
+                        } else {
+                            whetherAdd = false;
+                        }
+                    })
+                    //娌℃湁娣诲姞杩囧綋鍓嶈鍙风殑鏁扮粍鍒欐坊鍔犺繘鍘�
+                    if (whetherAdd == false) {
+                        Array.push(arr_value_add);
+                    }
+                } else {
+                    Array.push(arr_value_add);//鏁扮粍涓虹┖鍒欎笉鍋氬垽鏂紝鐩存帴鎶婃暟鎹坊鍔犺繘鏁扮粍
+                }
+            }
+            //#endregion
+
+            //浠ヤ笂涓簂ayui妯″潡
+        });
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index 228c98e..32a4944 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -867,7 +867,7 @@
                 });
             }
 
-            //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
+            //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅銆愭姤宸ュ彴妫�楠屻��
             function LoadingInformation2() {
                 var wait = layer.load();
                 $.ajax({
@@ -892,6 +892,11 @@
                             $("#HMainSourceBillType").val(data.HBillType);
                             $("#HMainSourceInterID").val(data.HInterID);
                             $("#HICMOEntryID").val(data.HICMOEntryID);
+                            $("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�);
+                            $("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
+
+                            //鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
+                            get_CheckItem();
                         } else {
                             layer.alert(result.Message, { icon: 5 });
                         }
@@ -1342,7 +1347,7 @@
                         layer.msg("绗�" + indexRow + "琛岋紝妫�楠岄」鐩笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         return;
                     }
-                    if (sSubTable[i].HSampleSchemeID == '') {
+                    if (sSubTable[i].HSampleSchemeID == '' || sSubTable[i].HSampleSchemeID == null) {
                         sSubTable[i].HSampleSchemeID = 0
                     }
                     if (sSubTable[i].HSampleQty == '' || sSubTable[i].HSampleQty == null) {
@@ -1849,11 +1854,11 @@
                                         "HStrictness": data[i].涓ユ牸搴�, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].鎶芥牱绫诲瀷
                                     }
                                 );
-                                SampleNum.push(data[i].鏍锋湰閲�);
+                                SampleNum.push(5);
                             }
 
                             //妫�楠岄」鐩�
-                            for (let j = 1; j <= data[data.length - 1].鏍锋湰閲�; j++) {
+                            for (let j = 1; j <= 5; j++) {
                                 rowdata_Value.push({
                                     "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                                 });
@@ -3479,47 +3484,47 @@
 
             //妫�楠屽�间繚瀛�
             function set_SaveValue(dataindex) {
-                if (OperationType == 3) {
-                    EchoValue();
-                }
-                for (let i = 0; i < table.cache['ValueTable'].length; i++) {
-                    if (table.cache['ValueTable'][i].HInSpectValueB == "" || table.cache['ValueTable'][i].HInSpectValueB == null) {
-                        table.cache['ValueTable'][i].HInSpectValueB = 0
-                    }
-                    if (table.cache['ValueTable'][i].HInSpectValueT == "" || table.cache['ValueTable'][i].HInSpectValueT == null) {
-                        table.cache['ValueTable'][i].HInSpectValueT = 0
-                    }
-                    if (table.cache['ValueTable'][i].HInSpectValue == "" || table.cache['ValueTable'][i].HInSpectValue == null) {
-                        table.cache['ValueTable'][i].HInSpectValue = 0
-                    }
-                }
-                var sValueTable = JSON.stringify(table.cache['ValueTable']);
-                var HInterID = $("#HInterID").val();
-                var HEntryID = dataindex;
-                var msg = sValueTable + ";" + HInterID + ";" + HEntryID
+                //if (OperationType == 3) {
+                //    EchoValue();
+                //}
+                //for (let i = 0; i < table.cache['ValueTable'].length; i++) {
+                //    if (table.cache['ValueTable'][i].HInSpectValueB == "" || table.cache['ValueTable'][i].HInSpectValueB == null) {
+                //        table.cache['ValueTable'][i].HInSpectValueB = 0
+                //    }
+                //    if (table.cache['ValueTable'][i].HInSpectValueT == "" || table.cache['ValueTable'][i].HInSpectValueT == null) {
+                //        table.cache['ValueTable'][i].HInSpectValueT = 0
+                //    }
+                //    if (table.cache['ValueTable'][i].HInSpectValue == "" || table.cache['ValueTable'][i].HInSpectValue == null) {
+                //        table.cache['ValueTable'][i].HInSpectValue = 0
+                //    }
+                //}
+                //var sValueTable = JSON.stringify(table.cache['ValueTable']);
+                //var HInterID = $("#HInterID").val();
+                //var HEntryID = dataindex;
+                //var msg = sValueTable + ";" + HInterID + ";" + HEntryID
 
-                var index = layer.load();
-                $.ajax({
-                    type: "POST",
-                    url: GetWEBURL() + "/QC_FirstPieceCheckBill/set_SaveValue",
-                    async: true,
-                    data: { "msg": msg },
-                    dataType: "json",
-                    success: function (data) {
-                        if (data.count == 1) {
-                            layer.close(index);
-                            //$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳
-                        }
-                        else {
-                            layer.close(index);
-                            layer.msg("妫�楠屽�间繚瀛橀敊璇紒" + data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    },
-                    error: function (err) {
-                        layer.close(index);
-                        layer.msg("妫�楠屽�间繚瀛橀敊璇�:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    }
-                });
+                //var index = layer.load();
+                //$.ajax({
+                //    type: "POST",
+                //    url: GetWEBURL() + "/QC_FirstPieceCheckBill/set_SaveValue",
+                //    async: true,
+                //    data: { "msg": msg },
+                //    dataType: "json",
+                //    success: function (data) {
+                //        if (data.count == 1) {
+                //            layer.close(index);
+                //            //$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳
+                //        }
+                //        else {
+                //            layer.close(index);
+                //            layer.msg("妫�楠屽�间繚瀛橀敊璇紒" + data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //        }
+                //    },
+                //    error: function (err) {
+                //        layer.close(index);
+                //        layer.msg("妫�楠屽�间繚瀛橀敊璇�:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    }
+                //});
             }
 
             //#region銆愰殣钘忔娴嬪�煎瓧娈点��
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/BadQueryReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/BadQueryReport.html"
new file mode 100644
index 0000000..768eeff
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/BadQueryReport.html"
@@ -0,0 +1,398 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>涓嶈壇杩芥函鏌ヨ鎶ヨ〃</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/scripts/jquery-1.4.1.min.js"></script>
+    <script src="../../../layuiadmin/pubcustom.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/soulTable.slim.js"></script>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鐢熶骇璁㈠崟鍙�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" value="">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 76px;">浜у搧鏉$爜</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HBardCode" id="HBardCode" value="">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">娴佽浆鍗″彿</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" value="">
+                                    </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" style="padding: 0px; margin-left: 6%;">
+                                    <div class="layui-row" style="margin-top:10px;margin-left:5%;">
+
+                                    </div>
+                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+                                        </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="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script>
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index', //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], 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
+            , soulTable = layui.soulTable
+        var sWhere = "";
+        var option = [];
+        var HModName = "BadQueryReport";
+        var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID", "HSourceEntryID"];//瀛愯〃涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鍒濆鍖栬〃鏍�
+        DisPlay_HideColumn();
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        // 澶村伐鍏锋爮浜嬩欢
+        table.on('toolbar(mainTable)', function (obj) {
+            switch (obj.event) {
+                //鍒楄缃�
+                case 'set_HideColumn': get_HideColumn();
+                    break;
+            };
+        });
+
+        //鏌ヨ鎸夐挳
+        form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+            get_FastQuery();
+        });
+
+        //#endregion
+
+        //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+        // 鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            //鏌ヨ
+            get_FastQuery();
+        }
+
+        // 鏌ヨ
+        function get_Display(sWhere) {
+
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + '/Cj_SingleStation/BadQueryReport',
+                type: "GET",
+                data: { "HBardCode": $("#HBardCode").val(), "HProcExchBillNo": $("#HProcExchBillNo").val(), "HICMOBillNo": $("#HICMOBillNo").val(), "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        var data = [];
+                        var col = [];
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in data1.list) {
+                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                        }
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'checkbox', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                            if ($.inArray(data[i].name, titleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 180 });
+                                        break;
+                                    default:
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 150 });
+                                }
+                            }
+                        }
+
+                        //鍔ㄦ�佹樉绀哄垪鍚�
+                        option = {
+                            elem: '#mainTable'
+                            , toolbar: '#toolbarDemo'
+                            , cols: [col]
+                            , data: data1.data
+                            , height: 800
+                            , page: true
+                            , totalRow: true
+                            , cellMinWidth: 90
+                            , limit: 50
+                            , limits: [50, 500, 5000, 20000]
+                            , done: function (res, curr, count) {
+                                soulTable.render(this);
+                            }
+                        }
+                        table.render(option);
+
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+
+                        if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                            ColFilter();
+                        }
+
+                        layer.close(ajaxLoad);
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+
+        // 蹇�熻繃婊�
+        function get_FastQuery() {
+            var ColName = $("#ColName").val();//澶嶉�夋
+            var Comparator = $("#Comparator").val()
+            var ColContent = $("#ColContent").val();
+
+            var com = "";
+            if (ColName != 0 && Comparator != 0) {
+                switch (Comparator) {
+                    case "7":
+                        com = "like ''%" + ColContent + "%''";
+                        break;
+                    case "8":
+                        com = "like ''%" + ColContent + "''";
+                        break;
+                    case "9":
+                        com = "like ''" + ColContent + "%''";
+                        break;
+                    case "10":
+                        com = "not like ''%" + ColContent + "%''";
+                        break;
+                    default:
+                        com = "" + Comparator + " ''" + ColContent + "''";
+                        break;
+                }
+                com = " and (" + ColName + " " + com + ")";
+            }
+
+            get_Display(sWhere);
+            sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+        }
+
+        //闅愯棌鍒楄缃�
+        function get_HideColumn() {
+            var colName = "";
+            var contentUrl = "";
+            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                colName += option.cols[0][i]["title"] + ",";
+            }
+            var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+            var urlLen = urlStr.split('/');
+            for (var i = 0; i < urlLen.length - 4; i++) {
+                contentUrl += "../";
+            }
+            colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+            contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+            layer.open({
+                type: 2
+                , skin: "layui-layer-rim" //鍔犱笂杈规
+                , title: "闅愯棌鍒楄缃�"  //鏍囬
+                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                , area: ["50%", "90%"] //绐椾綋澶у皬
+                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                , content: [contentUrl, "yes"]
+                , btn: ["纭畾", "鍙栨秷"]
+                , btn1: function (index, laero) {
+                    //鍒锋柊琛ㄦ牸鏁版嵁
+                    DisPlay_HideColumn();
+                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                    layer.close(index);//鍏抽棴寮圭獥
+                }
+            })
+        }
+
+        //鏄剧ず鍒楁暟鎹�
+        function DisPlay_HideColumn() {
+            $.ajax({
+                url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                type: "GET",
+                data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                success: function (data1) {
+                    if (data1.data.length != 0) {
+
+
+                        var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+
+
+                        dataCol = data1.data[0].HGridString.split(',');
+
+                        for (var i = 0; i < option.cols[0].length - 2; i++) {
+                            var dataCols = dataCol[i].split('|');
+                            //闅愯棌鍒�
+                            if (dataCols[1] == 1) {
+                                option.cols[0][i + 1]["hide"] = true;
+                            }
+                            //璁剧疆鍒楀
+                            if (dataCols[3] > 0) {
+                                option.cols[0][i + 1]["width"] = dataCols[3];
+                            }
+                            //璁剧疆鍐呭瀛椾綋澶у皬
+                            if (data1.data[0].HFontSize != 0) {
+                                option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                            } else {
+                                option.cols[0][i + 1]["style"] = "font-size:100%";
+                            }
+                            //璁剧疆鍒楀
+                            //if (data1.data[0].HColumnWidth != 0) {
+                            //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                            //} else {
+                            //    option.cols[0][i + 1]["width"] = "";
+                            //}
+                            //鏄剧ず鍒�
+                            if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                option.cols[0][i + 1]["hide"] = false;
+                            }
+                            //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                            switch (dataCols[2]) {
+                                case "L":
+                                    option.cols[0][i + 1]["align"] = "left";
+                                    break;
+                                case "M":
+                                    option.cols[0][i + 1]["align"] = "center";
+                                    break;
+                                case "R":
+                                    option.cols[0][i + 1]["align"] = "right";
+                                    break;
+                            }
+                        }
+
+                        //鍙栨秷鍐荤粨鍒�
+                        for (var i = 1; i < option.cols[0].length - 1; i++) {
+                            if (option.cols[0][i]["fixed"] != null) {
+                                option.cols[0][i]["fixed"] = null;
+                            }
+                            else {
+                                break;
+                            }
+                        }
+                        //鍐荤粨鍒�
+                        if (data1.data[0].HFixCols != 0) {
+                            for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                    data1.data[0].HFixCols += 1;
+                                }
+                                option.cols[0][i + 1]["fixed"] = "left";
+                            }
+                        }
+                        table.render(option);
+                    } else {
+                        table.render(option);
+                    }
+                }, error: function () {
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            })
+        }
+
+        // 鍒楁槑鏄剧ず涓嬫媺妗�
+        function ColFilter() {
+            var Organization = '<option  value="0" selected="selected" ></option>';
+            for (var i = 1; i < option.cols[0].length; i++) {
+                if (option.cols[0][i].hide != true) {
+                    Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+                }
+            }
+            $("#ColName").empty();
+            $("#ColName").append(Organization);
+            form.render('select');
+        }
+        //#endregion
+
+        //浠ヤ笂鏄痩ayui妯″潡
+    });
+
+
+
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_CollectionOfSingleProductDefects.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_CollectionOfSingleProductDefects.html"
index 351b414..ce66e1a 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_CollectionOfSingleProductDefects.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_CollectionOfSingleProductDefects.html"
@@ -1,7 +1,10 @@
 锘�<!DOCTYPE html>
 <html>
 <head>
-    <meta charset="utf-8" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <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">
     <title>宸ュ簭鍗曞搧涓嶈壇閲囬泦</title>
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
@@ -10,7 +13,8 @@
     <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/PubCustom.js"></script>-->
+    <script src="../../CreateControl.js"></script>
 </head>
 <body>
     <div class="layui-fluid" style="padding: 0;">
@@ -36,7 +40,7 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鏉″舰鐮�</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HBarCodeSN" lay-verify="HBarCodeSN" id="HBarCodeSN" style="width:500px;">
+                                                <input type="text" class="layui-input" name="HBarCodeSN" autocomplete="off" lay-verify="HBarCodeSN" id="HBarCodeSN" style="width:500px;">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -354,6 +358,16 @@
                 if (!HBarCode) {
                     layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
                     return;
+                } else {
+                    if (HBarCode.length != 29) {
+                        layer.alert("瀛愪欢鏉$爜闀垮害涓嶄负29浣�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        return;
+                    }
+
+                    if (HBarCode.match(/[^\x00-\xff]/g) != null) {
+                        layer.alert("蹇呴』鏄崐瑙掑瓧绗�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        return;
+                    }
                 }
                 txtHBarCode_KeyDown(HBarCode);
             }
@@ -479,12 +493,21 @@
                             success: function (data1) {
                                 if (data1.count == 1) {
                                     layer.close(index);
+
+                                    var numHProcess = 0;
+                                    for (var i = 0; i < data1.data.length; i++) {
+                                        if (data1.data[i]["HProcID"] == $("#HProcID").val()) {
+                                            numHProcess = data1.data[i]["HProcExchEntryID"];
+                                            break;
+                                        }
+                                    }
+
                                     $("#HICMOBillNo").val(data1.data[0]["鐢熶骇璁㈠崟"]);
                                     $("#HICMOInterID").val(data1.data[0]["HICMOInterID"]);
                                     $("#HICMOEntryID").val(data1.data[0]["HICMOEntryID"]);
                                     $("#HProcExchBillNo").val(data1.data[0]["宸ュ簭娴佽浆鍗�"]);
                                     $("#HProcExchInterID").val(data1.data[0]["HSourceInterID"]);
-                                    $("#HProcExchEntryID").val(data1.data[0]["HProcExchEntryID"]);
+                                    $("#HProcExchEntryID").val(numHProcess);
                                     $("#HMaterNumber").val(data1.data[0]["鐗╂枡缂栫爜"]);
                                     $("#HMaterID").val(data1.data[0]["HMaterID"]);
                                     $("#HMaterName").val(data1.data[0]["鐗╂枡鍚嶇О"]);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html"
index b7df8e6..a39144b 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html"
@@ -1,7 +1,10 @@
 锘�<!DOCTYPE html>
 <html>
 <head>
-    <meta charset="utf-8" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <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">
     <title>宸ュ簭鍗曞搧杩斾慨鍙�</title>
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
@@ -10,11 +13,12 @@
     <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/PubCustom.js"></script>-->
     <script type="text/javascript" src="../../../layuiadmin/lib/extend/echarts.min.js"></script>
+    <script src="../../CreateControl.js"></script>
     <style>
-        .tr1-1{
-          /*  margin-left: 3%;
+        .tr1-1 {
+            /*  margin-left: 3%;
             margin-top: 4%;*/
             height: 360px;
             /*background-color: #99f6a733;*/
@@ -165,7 +169,7 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label" style="width: 85px;">鏉″舰鐮�</label>
                                                 <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
-                                                    <input type="text" class="layui-input" lay-verify="HBarCodeSN" name="HBarCodeSN" id="HBarCodeSN">
+                                                    <input type="text" class="layui-input" lay-verify="HBarCodeSN" autocomplete="off" name="HBarCodeSN" id="HBarCodeSN">
                                                 </div>
                                             </div>
                                         </div>
@@ -219,7 +223,7 @@
                                                     </button>
                                                 </div>
                                             </div>
-                                            <div class="layui-inline" style="width:300px;">
+                                            <!--<div class="layui-inline" style="width:300px;">
                                                 <label class="layui-form-label" style="width: 85px;">缁翠慨缁撴灉</label>
                                                 <div class="layui-input-block" style="margin-left: 120px; width: 180px;">
                                                     <select name="HRepairResult" id="HRepairResult" lay-filter="HRepairResult" style="width: 180px;">
@@ -227,7 +231,7 @@
                                                         <option style="color:blue;" value="NG">NG</option>
                                                     </select>
                                                 </div>
-                                            </div>
+                                            </div>-->
                                         </div>
                                         <div class="layui-row">
                                             <div class="layui-inline">
@@ -348,6 +352,16 @@
                     if (!HBarCode) {
                         layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
                         return;
+                    } else {
+                        if (HBarCode.length != 29) {
+                            layer.alert("瀛愪欢鏉$爜闀垮害涓嶄负29浣�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                            return;
+                        }
+
+                        if (HBarCode.match(/[^\x00-\xff]/g) != null) {
+                            layer.alert("蹇呴』鏄崐瑙掑瓧绗�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                            return;
+                        }
                     }
                     txtHBarCode_KeyDown(HBarCode);
                     
@@ -568,10 +582,10 @@
                             var option = {
                                 elem: '#mainTable'
                                 //, toolbar: '#toolbarDemo'
-                                , async: true
                                 , page: false
                                 //, totalRow: true
                                 , cellMinWidth: 120
+                                , limit: 50
                                 , height: 300
                             }
 
@@ -643,12 +657,20 @@
                     success: function (data1) {
                         if (data1.count == 1) {
                             layer.close(index);
+                            var numHProcess = 0;
+                            for (var i = 0; i < data1.data.length; i++) {
+                                if (data1.data[i]["HProcID"] == $("#HProcess").val()) {
+                                    numHProcess = data1.data[i]["HProcExchEntryID"];
+                                    break;
+                                }
+                            }
+
                             $("#HICMOBillNo").val(data1.data[0]["鐢熶骇璁㈠崟"]);
                             $("#HICMOInterID").val(data1.data[0]["HICMOInterID"]);
                             $("#HICMOEntryID").val(data1.data[0]["HICMOEntryID"]);
                             $("#HProcExchBillNo").val(data1.data[0]["宸ュ簭娴佽浆鍗�"]);
                             $("#HProcExchInterID").val(data1.data[0]["HSourceInterID"]);
-                            $("#HProcExchEntryID").val(data1.data[0]["HProcExchEntryID"]);
+                            $("#HProcExchEntryID").val(numHProcess);
                             $("#HUnitID").val(data1.data[0]["HUnitID"]);
                             $("#HUnitName").val(data1.data[0]["鍗曚綅"]);
                             $("#HOrgName").val(data1.data[0]["缁勭粐"]);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA_PJGH.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA_PJGH.html"
index 070d666..d77e530 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA_PJGH.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA_PJGH.html"
@@ -1,7 +1,10 @@
 锘�<!DOCTYPE html>
 <html>
 <head>
-    <meta charset="utf-8" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <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">
     <title>宸ュ簭鍗曞搧杩斾慨鍙�(閰嶄欢鏇存崲)</title>
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
@@ -10,7 +13,8 @@
     <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/PubCustom.js"></script>-->
+    <script src="../../CreateControl.js"></script>
 </head>
 <body>
     <div class="layui-fluid" style="padding: 0;">
@@ -34,7 +38,7 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鏉″舰鐮�:</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HBarCode" lay-verify="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HBarCode" style="width: 500px;">
+                                                <input type="text" class="layui-input" name="HBarCode" lay-verify="HBarCode" autocomplete="off" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HBarCode" style="width: 500px;">
                                             </div>
                                         </div>
                                     </div>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html"
index 58f206b..fb84450 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html"
@@ -1,8 +1,11 @@
 锘�<!DOCTYPE html>
 <html>
 <head>
-    <meta charset="utf-8" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>宸ュ簭鍗曞搧杩囩珯骞冲彴</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, 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/zgqCustom/zgqCustom.js"></script>
@@ -10,7 +13,8 @@
     <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/PubCustom.js"></script>-->
+    <script src="../../CreateControl.js"></script>
 </head>
 <body>
     <div class="layui-fluid" style="padding: 0;">
@@ -30,7 +34,7 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鏉″舰鐮�:</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HBarCodeSN" lay-verify="HBarCodeSN" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HBarCodeSN" style="width: 500px;">
+                                                <input type="text" class="layui-input" name="HBarCodeSN" lay-verify="HBarCodeSN"  autocomplete="off" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HBarCodeSN" style="width: 500px;">
                                             </div>
                                         </div>
                                     </div>
@@ -111,7 +115,7 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">宸ュ簭娴佽浆鍗�</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HProcExchBillNo" lay-verify="HProcExchBillNo" id="HProcExchBillNo" value="" style="background-color:#efefef4d;">
+                                                <input type="text" class="layui-input" name="HProcExchBillNo"  lay-verify="HProcExchBillNo" id="HProcExchBillNo" value="" style="background-color:#efefef4d;">
                                                 <input type="hidden" class="layui-input" name="HProcExchInterID" lay-verify="HProcExchInterID" id="HProcExchInterID" value="0">
                                                 <input type="hidden" class="layui-input" name="HProcExchEntryID" lay-verify="HProcExchEntryID" id="HProcExchEntryID" value="0">
                                             </div>
@@ -174,7 +178,7 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鎬诲悎鏍兼暟</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" lay-verify="HMaterModel" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" lay-verify="HQualifiedCount" name="HQualifiedCount" id="HQualifiedCount" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                     </div>
@@ -182,8 +186,7 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鎬讳笉鑹暟</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+                                                <input type="text" class="layui-input" name="HBadCount" lay-verify="HBadCount" id="HBadCount" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                     </div>
@@ -211,13 +214,13 @@
                                 <div class="layui-inline">
                                     <label class="layui-form-label" style="width: 85px;">娴佽浆鍗�:</label>
                                     <div class="layui-input-block" style="margin-left: 120px;">
-                                        <input type="text" class="layui-input" name="HBardCodeProcExchBillNo" lay-verify="HBardCodeProcExchBillNo" id="HBardCodeProcExchBillNo">
+                                        <input type="text" class="layui-input" name="HBardCodeProcExchBillNo" autocomplete="off" lay-verify="HBardCodeProcExchBillNo" id="HBardCodeProcExchBillNo">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
                                     <label class="layui-form-label" style="width: 85px;">閰嶄欢鐮�:</label>
                                     <div class="layui-input-block" style="margin-left: 120px;">
-                                        <input type="text" class="layui-input" name="HBardCodeMater" lay-verify="HBardCodeMater" id="HBardCodeMater">
+                                        <input type="text" class="layui-input" name="HBardCodeMater" autocomplete="off" lay-verify="HBardCodeMater" id="HBardCodeMater">
                                     </div>
                                 </div>
                             </div>
@@ -332,6 +335,16 @@
                     if (!HBarCode) {
                         layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
                         return;
+                    } else {
+                        if (HBarCode.length != 29) {
+                            layer.alert("瀛愪欢鏉$爜闀垮害涓嶄负29浣�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                            return;
+                        }
+
+                        if (HBarCode.match(/[^\x00-\xff]/g) != null) {
+                            layer.alert("蹇呴』鏄崐瑙掑瓧绗�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                            return;
+                        }
                     }
                 }
                 for (var i = 0; i < option.data.length; i++) {
@@ -448,7 +461,7 @@
         function set_ClearBill() {
             //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ祦杞崱涓�
             $("#HBardCodeProcExchBillNo").focus();
-            createBillNo();
+          
             get_Display();
             get_CriticalPartsList();//鍏抽敭浠舵竻鍗� 涓嶈壇璁板綍  鍚堟牸璁板綍
           
@@ -456,14 +469,28 @@
 
         // 鐢熸垚鍗曟嵁鍙�
         function createBillNo() {
+            var sql = "select * from Sc_StationOutBillMain  where HProcExchBillNo='" + $("#HProcExchBillNo").val() + "' and HProcID=" + $("#HProcID").val()
             $.ajax({
-                url: GetWEBURL() + "/Web/GetMAXNum",
+                url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList",
                 async: false,
                 type: "GET",
-                data: { "HBillType": '3791' },
-                success: function (d) {
-                    $("#HInterID").val(d.data[0].HInterID);
-                    $("#HBillNo").val(d.data[0].HBillNo);
+                data: { "sWhere": sql },
+                success: function (data) {
+                    if (data.data.length > 0) {
+                        $("#HInterID").val(data.data[0].HInterID);
+                        $("#HBillNo").val(data.data[0].HBillNo);
+                    } else {
+                        $.ajax({
+                            url: GetWEBURL() + "/Web/GetMAXNum",
+                            async: false,
+                            type: "GET",
+                            data: { "HBillType": '3791' },
+                            success: function (d) {
+                                $("#HInterID").val(d.data[0].HInterID);
+                                $("#HBillNo").val(d.data[0].HBillNo);
+                            }
+                        });
+                    }
                 }
             });
         }
@@ -512,12 +539,12 @@
             option= {
                 elem: '#mainTable2'
                 //, toolbar: '#toolbarDemo'
-                , async: true
                 , page: false
                 //, totalRow: true
                 , cellMinWidth: 120
                 , data: []
                 , height: 185
+                , limit: Number.MAX_VALUE
                 , cols: [[
                     { type: 'numbers', title: '搴忓彿' }
                     , { field: '鏃ユ湡', title: '鏃ユ湡' }
@@ -540,10 +567,10 @@
             option2 = {
                 elem: '#mainTable3'
                 //, toolbar: '#toolbarDemo'
-                , async: true
                 , page: false
                 //, totalRow: true
                 , cellMinWidth: 120
+                , limit: Number.MAX_VALUE
                 , data: []
                 , height: 325
                 , cols: [[
@@ -563,10 +590,10 @@
             option3 = {
                 elem: '#mainTable'
                 //, toolbar: '#toolbarDemo'
-                , async: true
                 , page: false
                 //, totalRow: true
                 , cellMinWidth: 120
+                , limit: Number.MAX_VALUE
                 , data: []
                 , height: 370
                 , cols: [[
@@ -609,6 +636,7 @@
                     if (data1.count == 1) {
                         option2.data = data1.data;
                         table.render(option2);
+                        $("#HBadCount").val(data1.data.length);
                         layer.close(ajaxLoad);
                     } else {
                         layer.close(ajaxLoad);
@@ -638,6 +666,7 @@
                     if (data1.count == 1) {
                         option3.data = data1.data;
                         table.render(option3);
+                        $("#HQualifiedCount").val(data1.data.length);
                         layer.close(ajaxLoad);
                     } else {
                         layer.close(ajaxLoad);
@@ -693,8 +722,10 @@
                     }
                     else {
                         layer.close(indexs);
-                        layer.msg(data1.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        layer.msg(data1.Message);
                     }
+                    //鍏夋爣璺宠浆鍒癝N鏉$爜鏂囨湰妗嗕笂
+                    //$("#HBarCodeSN").focus();
                     $("#HBarCodeSN").val("");
                 },
                 error: function (err) {
@@ -801,10 +832,35 @@
                         $("#HPieceQty").val(data1.data[0]["HPieceQty"]);
                         $("#HICMOQty").val(data1.data[0]["HICMOQty"]);
 
+                        createBillNo();
+
                         option.data = data1.data;
                         table.render(option)
                     }
-                    else {
+                    else if (data1.count == 2) {
+                        layer.close(index);
+
+                        $("#HBardCodeProcExchBillNo").attr("readonly", "readonly");//娴佽浆鍗″彧璇�
+                        $("#HBardCodeProcExchBillNo").css("background-color", "#efefef4d");//娴佽浆鍗$伆鑹�
+                        //鍏夋爣璺宠浆鍒癝N鏉$爜鏂囨湰妗嗕笂
+                        $("#HBarCodeSN").focus();
+
+                        $("#HMaterNumber").val(data1.data[0]["HMainMaterNumber"]);
+                        $("#HMaterID").val(data1.data[0]["HMainMaterID"]);
+                        $("#HMaterName").val(data1.data[0]["HMainMaterName"]);
+                        $("#HMaterModel").val(data1.data[0]["HMainModel"]);
+                        $("#HProcExchInterID").val(data1.data[0]["HProcExchInterID"]);
+                        $("#HProcExchEntryID").val(data1.data[0]["HProcExchEntryID"]);
+                        $("#HProcExchBillNo").val(data1.data[0]["HProcExchBillNo"]);
+                        $("#HICMOBillNo").val(data1.data[0]["HICMOBillNo"]);
+                        $("#HICMOInterID").val(data1.data[0]["HICMOInterID"]);
+                        $("#HICMOEntryID").val(data1.data[0]["HICMOEntryID"]);
+                        $("#HProcNo").val(data1.data[0]["HProcNo"]);
+                        $("#HPieceQty").val(data1.data[0]["HPieceQty"]);
+                        $("#HICMOQty").val(data1.data[0]["HICMOQty"]);
+
+                        createBillNo();
+                    } else {
                         layer.close(index);
                         layer.msg(data1.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     }
@@ -893,7 +949,7 @@
                     }
                     else {
                         layer.close(index);
-                        layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        layer.msg(data.Message);
                     }
                 },
                 error: function (err) {
@@ -1059,9 +1115,9 @@
 
         //涓嶈壇姹囨姤
         function BadReport() {
-            var HBarCode_P = $("#HBarCode_P").val();
+            var len = option3.data.length;
 
-            if (HBarCode_P != "") {
+            if (len != 0) {
                 layer.open({
                     type: 2//寮圭獥绫诲瀷
                     , skin: 'layui-layer-rim' //鍔犱笂杈规
@@ -1099,6 +1155,8 @@
                         //$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
                         layer.close(index);
                         layer.msg("鎻愪氦鎴愬姛");
+                        //鍏夋爣璺宠浆鍒癝N鏉$爜鏂囨湰妗嗕笂
+                        $("#HBarCodeSN").focus();
                         //淇濆瓨鍒颁复鏃惰〃
                         get_AddBomTempList();
                         var HBardCodeProcExchBillNo = $("#HBardCodeProcExchBillNo").val();
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/RetrospectiveQueryReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/RetrospectiveQueryReport.html"
new file mode 100644
index 0000000..83dbed4
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/RetrospectiveQueryReport.html"
@@ -0,0 +1,398 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鍚堟牸杩芥函鏌ヨ鎶ヨ〃</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/scripts/jquery-1.4.1.min.js"></script>
+    <script src="../../../layuiadmin/pubcustom.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/soulTable.slim.js"></script>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鐢熶骇璁㈠崟鍙�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo"  value="">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 76px;">浜у搧鏉$爜</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HBardCode" id="HBardCode" value="">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">娴佽浆鍗″彿</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo"  value="">
+                                    </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" style="padding: 0px; margin-left: 6%;">
+                                    <div class="layui-row" style="margin-top:10px;margin-left:5%;">
+                                       
+                                    </div>
+                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+                                        </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="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script>
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index', //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], 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
+            , soulTable = layui.soulTable
+        var sWhere = "";
+        var option = [];
+        var HModName = "RetrospectiveQueryReport";
+        var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID", "HSourceEntryID"];//瀛愯〃涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鍒濆鍖栬〃鏍�
+        DisPlay_HideColumn();
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        // 澶村伐鍏锋爮浜嬩欢
+        table.on('toolbar(mainTable)', function (obj) {
+            switch (obj.event) {
+                //鍒楄缃�
+                case 'set_HideColumn': get_HideColumn();
+                    break;
+            };
+        });
+
+        //鏌ヨ鎸夐挳
+        form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+            get_FastQuery();
+        });
+
+        //#endregion
+
+        //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+        // 鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            //鏌ヨ
+            get_FastQuery();
+        }
+
+        // 鏌ヨ
+        function get_Display(sWhere) {
+
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + '/Cj_SingleStation/RetrospectiveQueryReport',
+                type: "GET",
+                data: { "HBardCode": $("#HBardCode").val(), "HProcExchBillNo": $("#HProcExchBillNo").val(), "HICMOBillNo": $("#HICMOBillNo").val(), "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        var data = [];
+                        var col = [];
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in data1.list) {
+                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                        }
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'checkbox', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                            if ($.inArray(data[i].name, titleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 180 });
+                                        break;
+                                    default:
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 150 });
+                                }
+                            }
+                        }
+
+                        //鍔ㄦ�佹樉绀哄垪鍚�
+                        option = {
+                            elem: '#mainTable'
+                            , toolbar: '#toolbarDemo'
+                            , cols: [col]
+                            , data: data1.data
+                            , height: 800
+                            , page: true
+                            , totalRow: true
+                            , cellMinWidth: 90
+                            , limit: 50
+                            , limits: [50, 500, 5000, 20000]
+                            , done: function (res, curr, count) {
+                                soulTable.render(this);
+                            }
+                        }
+                        table.render(option);
+
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+
+                        if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                            ColFilter();
+                        }
+
+                        layer.close(ajaxLoad);
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+
+        // 蹇�熻繃婊�
+        function get_FastQuery() {
+            var ColName = $("#ColName").val();//澶嶉�夋
+            var Comparator = $("#Comparator").val()
+            var ColContent = $("#ColContent").val();
+
+            var com = "";
+            if (ColName != 0 && Comparator != 0) {
+                switch (Comparator) {
+                    case "7":
+                        com = "like ''%" + ColContent + "%''";
+                        break;
+                    case "8":
+                        com = "like ''%" + ColContent + "''";
+                        break;
+                    case "9":
+                        com = "like ''" + ColContent + "%''";
+                        break;
+                    case "10":
+                        com = "not like ''%" + ColContent + "%''";
+                        break;
+                    default:
+                        com = "" + Comparator + " ''" + ColContent + "''";
+                        break;
+                }
+                com = " and (" + ColName + " " + com + ")";
+            }
+
+            get_Display(sWhere);
+            sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+        }
+
+        //闅愯棌鍒楄缃�
+        function get_HideColumn() {
+            var colName = "";
+            var contentUrl = "";
+            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                colName += option.cols[0][i]["title"] + ",";
+            }
+            var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+            var urlLen = urlStr.split('/');
+            for (var i = 0; i < urlLen.length - 4; i++) {
+                contentUrl += "../";
+            }
+            colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+            contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+            layer.open({
+                type: 2
+                , skin: "layui-layer-rim" //鍔犱笂杈规
+                , title: "闅愯棌鍒楄缃�"  //鏍囬
+                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                , area: ["50%", "90%"] //绐椾綋澶у皬
+                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                , content: [contentUrl, "yes"]
+                , btn: ["纭畾", "鍙栨秷"]
+                , btn1: function (index, laero) {
+                    //鍒锋柊琛ㄦ牸鏁版嵁
+                    DisPlay_HideColumn();
+                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                    layer.close(index);//鍏抽棴寮圭獥
+                }
+            })
+        }
+
+        //鏄剧ず鍒楁暟鎹�
+        function DisPlay_HideColumn() {
+            $.ajax({
+                url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                type: "GET",
+                data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                success: function (data1) {
+                    if (data1.data.length != 0) {
+
+
+                        var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+
+
+                        dataCol = data1.data[0].HGridString.split(',');
+
+                        for (var i = 0; i < option.cols[0].length - 2; i++) {
+                            var dataCols = dataCol[i].split('|');
+                            //闅愯棌鍒�
+                            if (dataCols[1] == 1) {
+                                option.cols[0][i + 1]["hide"] = true;
+                            }
+                            //璁剧疆鍒楀
+                            if (dataCols[3] > 0) {
+                                option.cols[0][i + 1]["width"] = dataCols[3];
+                            }
+                            //璁剧疆鍐呭瀛椾綋澶у皬
+                            if (data1.data[0].HFontSize != 0) {
+                                option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                            } else {
+                                option.cols[0][i + 1]["style"] = "font-size:100%";
+                            }
+                            //璁剧疆鍒楀
+                            //if (data1.data[0].HColumnWidth != 0) {
+                            //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                            //} else {
+                            //    option.cols[0][i + 1]["width"] = "";
+                            //}
+                            //鏄剧ず鍒�
+                            if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                option.cols[0][i + 1]["hide"] = false;
+                            }
+                            //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                            switch (dataCols[2]) {
+                                case "L":
+                                    option.cols[0][i + 1]["align"] = "left";
+                                    break;
+                                case "M":
+                                    option.cols[0][i + 1]["align"] = "center";
+                                    break;
+                                case "R":
+                                    option.cols[0][i + 1]["align"] = "right";
+                                    break;
+                            }
+                        }
+
+                        //鍙栨秷鍐荤粨鍒�
+                        for (var i = 1; i < option.cols[0].length - 1; i++) {
+                            if (option.cols[0][i]["fixed"] != null) {
+                                option.cols[0][i]["fixed"] = null;
+                            }
+                            else {
+                                break;
+                            }
+                        }
+                        //鍐荤粨鍒�
+                        if (data1.data[0].HFixCols != 0) {
+                            for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                    data1.data[0].HFixCols += 1;
+                                }
+                                option.cols[0][i + 1]["fixed"] = "left";
+                            }
+                        }
+                        table.render(option);
+                    } else {
+                        table.render(option);
+                    }
+                }, error: function () {
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            })
+        }
+
+        // 鍒楁槑鏄剧ず涓嬫媺妗�
+        function ColFilter() {
+            var Organization = '<option  value="0" selected="selected" ></option>';
+            for (var i = 1; i < option.cols[0].length; i++) {
+                if (option.cols[0][i].hide != true) {
+                    Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+                }
+            }
+            $("#ColName").empty();
+            $("#ColName").append(Organization);
+            form.render('select');
+        }
+        //#endregion
+
+        //浠ヤ笂鏄痩ayui妯″潡
+    });
+
+
+
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Sc_SourceLineRepairBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Sc_SourceLineRepairBillList.html"
new file mode 100644
index 0000000..5c1554a
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Sc_SourceLineRepairBillList.html"
@@ -0,0 +1,668 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>杩斾慨璁板綍鍒楄〃</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script type="text/javascript" src="../../../layuiadmin/lib/extend/echarts.min.js"></script>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 76px;">浜у搧鏉$爜</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HBardCode" id="HBardCode">
+                                    </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" style="padding: 0px; margin-left: 6%;">
+                                    <div class="layui-row" style="margin-top:10px;margin-left:5%;">
+
+                                    </div>
+                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+                                        </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="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script>
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index', //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], 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
+            , soulTable = layui.soulTable
+        //var sWhere = " 浜у搧浠g爜 = 'BX0002'";
+        var sWhere = "";
+        var option = [];
+        var ins;                        //鐢ㄤ簬瀵煎嚭excel
+        var HModName = "Sc_SourceLineRepairBillList";
+        var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID", "HSourceEntryID"];//瀛愯〃涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鍒濆鍖栬〃鏍�
+        DisPlay_HideColumn();
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        //#region 澶村伐鍏锋爮浜嬩欢
+        table.on('toolbar(mainTable)', function (obj) {
+            switch (obj.event) {
+                //鏂板
+                case 'set_AddNew': set_AddNew();
+                    break;
+                //缂栬緫
+                case 'set_ShowBill': set_ShowBill();
+                    break;
+                //鍒犻櫎
+                case 'set_DeleteBill': set_DeleteBill();
+                    break;
+                //澶嶅埗
+                case 'set_Copy': set_Copy();
+                    break;
+                //娴忚
+                case 'get_PrintReport': get_PrintReport();
+                    break;
+                //鍒锋柊
+                case 'get_Refresh': get_Refresh();
+                    break;
+                //瀹℃牳
+                case 'set_CheckBill': set_CheckBill(1);
+                    break;
+                //鍙嶅鏍�
+                case 'set_AbandonCheck': set_CheckBill(2);
+                    break;
+                //鍏抽棴
+                case 'set_CloseBill': set_CloseBill(1);
+                    break;
+                //鍙嶅叧闂�
+                case 'set_CancelCloseBill': set_CloseBill(2);
+                    break;
+                //閫�鍑烘寜閽�
+                case 'get_Exit': Pub_Close(2);
+                    break;
+                //鍒楄缃�
+                case 'set_HideColumn': get_HideColumn();
+                    break;
+            };
+        });
+
+        //#endregion
+
+        //#region 鏌ヨ鎸夐挳
+        form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+            get_FastQuery(2);
+        });
+        //#endregion
+
+        //鐗╂枡
+        form.on('submit(btnHMaterID)', function (data) {//閫夋嫨浠撲綅
+
+            get_btnHMaterID();
+        });
+
+        //閲嶇疆鎸夐挳
+        form.on('submit(btnReSearch)', function (data) {
+
+            set_ClearQuery();
+        });
+        //#endregion
+
+        //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+        //#region 鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            //鏌ヨ
+            get_FastQuery();
+        }
+        //#endregion
+
+        //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+        function set_ClearQuery() {
+            $("#HBardCode").val("");
+            $("#ColContent").val("");
+            $("#ColName").val("0");
+            $("#Comparator").val("0");
+            form.render('select');
+            sWhere = "";
+        }
+        //#endregion
+
+
+        //鐗╂枡
+        function get_btnHMaterID() {
+            layer.open({
+                type: 2
+                , area: ['80%', '80%']
+                , title: '鐗╂枡'
+                , shade: 0.6 //閬僵閫忔槑搴�
+                //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.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('璇烽�夋嫨鏁版嵁');
+                    }
+                    $("#HMaterID").val(checkStatus.data[0].HItemID);
+                    $("#HMaterName").val(checkStatus.data[0].HName);
+                    $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+            })
+        }
+
+        //#region 鏌ヨ
+        function get_Display(sWhere) {
+
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + '/Cj_SingleStation/ProcessItemRepair',
+                type: "GET",
+                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        var data = [];
+                        var col = [];
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in data1.list) {
+                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                        }
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'checkbox', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                            if ($.inArray(data[i].name, titleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+                                        break;
+                                    default:
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                }
+                            }
+                        }
+
+                        //鍔ㄦ�佹樉绀哄垪鍚�
+                        option = {
+                            elem: '#mainTable'
+                            , toolbar: '#toolbarDemo'
+                            , cols: [col]
+                            , data: data1.data
+                            , height: 800
+                            , page: true
+                            , totalRow: true
+                            , cellMinWidth: 90
+                            , limit: 50
+                            , limits: [50, 500, 5000, 20000]
+                            , done: function (res, curr, count) {
+                                soulTable.render(this);
+                            }
+                        }
+                        table.render(option);
+
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+
+                        if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                            ColFilter();
+                        }
+
+                        layer.close(ajaxLoad);
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+        //#endregion
+
+        //#region 蹇�熻繃婊�
+        function get_FastQuery() {
+            //var HMaterID = $("#HMaterID").val();
+            var HBardCode = $("#HBardCode").val();//浜у搧鏉$爜
+            var ColName = $("#ColName").val();//澶嶉�夋
+            var Comparator = $("#Comparator").val()
+            var ColContent = $("#ColContent").val();
+
+            if (ColName != 0 && Comparator != 0) {
+                var com = "";
+                switch (Comparator) {
+                    case "7":
+                        com = "like'%" + ColContent + "%'";
+                        break;
+                    case "8":
+                        com = "like'%" + ColContent + "'";
+                        break;
+                    case "9":
+                        com = "like'" + ColContent + "%'";
+                        break;
+                    case "10":
+                        com = "not like'%" + ColContent + "%'";
+                        break;
+                    default:
+                        com = "" + Comparator + "'" + ColContent + "'";
+                        break;
+                }
+                sWhere += " and " + ColName + " " + com;
+            }
+
+            if (HBardCode) {
+                sWhere += " and SN鐮� like '%" + HBardCode + "%'";
+            }
+            get_Display(sWhere);
+            sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+        }
+        //#endregion
+
+        //#region 鏂板
+        function set_AddNew() {
+            layer.open({
+                type: 2
+                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                , area: ['100%', '100%']
+                , title: '宸ヨ壓璺嚎-鏂板'
+                , shift: 0//寮瑰嚭鍔ㄧ敾
+                , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
+                , end: function () {
+                    //鍒锋柊椤甸潰,
+                    location.reload();
+                }
+            })
+        }
+        //#endregion
+
+        //#region 缂栬緫
+        function set_ShowBill() {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                var linterid = data[0].HItemID;
+                //var linteridSub = data[0].hsubid;
+
+                //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '宸ヨ壓璺嚎-缂栬緫'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                    , end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    }
+                })
+            } else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+            }
+        }
+        //#endregion
+
+        //#region 鍒犻櫎
+        function set_DeleteBill() {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                var hmainid = data[0].hmainid;
+                layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                    var wait = layer.load();
+                    //閫昏緫鍒犻櫎鏂规硶
+                    $.ajax({
+                        url: GetWEBURL() + '/LEMS/DeltetGy_RoutingBillSub',
+                        type: "GET",
+                        data: { "lngBillKey": hmainid, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            console.log('gouba' + result);
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(wait);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    window.location.reload();
+                                });
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                                layer.close(wait);
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            layer.close(wait);
+                        }
+                    });
+                })
+
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+            }
+
+        }
+        //#endregion
+
+        //澶嶅埗
+        function set_Copy() {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                var linterid = data[0].HItemID;
+
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '宸ヨ壓璺嚎-缂栬緫'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+                    , end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    }
+                })
+            } else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+            }
+        }
+
+        //#region 鍒锋柊
+        function get_Refresh() {
+            set_ClearQuery();
+            get_Display(sWhere);
+        }
+
+        //瀹℃牳   [1 瀹℃牳銆�2 鍙嶅鏍竇
+        function set_CheckBill(num) {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+
+            if (data.length == 1) {
+                layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+                    var wait = layer.load();
+                    var HInterID = data[0].hmainid;
+                    $.ajax({
+                        url: GetWEBURL() + '/Gy_RoutingBill/CheckGy_RoutingBill',
+                        type: "GET",
+                        data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                get_FastQuery();
+                                layer.msg(result.Message, { icon: 1 });
+                                layer.close(wait);
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                                layer.close(wait);
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            layer.close(wait);
+                        }
+                    });
+                })
+            } else {
+                layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+            }
+        }
+
+
+        //鍏抽棴  [1 鍏抽棴銆�2 鍙嶅叧闂璢
+        function set_CloseBill(num) {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+
+            if (data.length == 1) {
+                layer.confirm("纭瑕佸叧闂悧?", function (index) {
+                    var wait = layer.load();
+                    var HInterID = data[0].hmainid;
+                    $.ajax({
+                        url: GetWEBURL() + '/Gy_RoutingBill/CloseGy_RoutingBill_1',
+                        type: "GET",
+                        data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { icon: 1 });
+                                layer.close(wait);
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                                layer.close(wait);
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            layer.close(wait);
+                        }
+                    });
+                })
+            }
+            else {
+                layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+            }
+        }
+
+
+        //#endregion
+        //闅愯棌鍒楄缃�
+        function get_HideColumn() {
+            var colName = "";
+            var contentUrl = "";
+            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                colName += option.cols[0][i]["title"] + ",";
+            }
+            var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+            var urlLen = urlStr.split('/');
+            for (var i = 0; i < urlLen.length - 4; i++) {
+                contentUrl += "../";
+            }
+            colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+            contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+            layer.open({
+                type: 2
+                , skin: "layui-layer-rim" //鍔犱笂杈规
+                , title: "闅愯棌鍒楄缃�"  //鏍囬
+                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                , area: ["50%", "90%"] //绐椾綋澶у皬
+                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                , content: [contentUrl, "yes"]
+                , btn: ["纭畾", "鍙栨秷"]
+                , btn1: function (index, laero) {
+                    //鍒锋柊琛ㄦ牸鏁版嵁
+                    DisPlay_HideColumn();
+                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                    layer.close(index);//鍏抽棴寮圭獥
+                }
+            })
+        }
+
+        //鏄剧ず鍒楁暟鎹�
+        function DisPlay_HideColumn() {
+            $.ajax({
+                url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                type: "GET",
+                data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                success: function (data1) {
+                    if (data1.data.length != 0) {
+
+
+                        var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+
+
+                        dataCol = data1.data[0].HGridString.split(',');
+
+                        for (var i = 0; i < option.cols[0].length - 2; i++) {
+                            var dataCols = dataCol[i].split('|');
+                            //闅愯棌鍒�
+                            if (dataCols[1] == 1) {
+                                option.cols[0][i + 1]["hide"] = true;
+                            }
+                            //璁剧疆鍒楀
+                            if (dataCols[3] > 0) {
+                                option.cols[0][i + 1]["width"] = dataCols[3];
+                            }
+                            //璁剧疆鍐呭瀛椾綋澶у皬
+                            if (data1.data[0].HFontSize != 0) {
+                                option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                            } else {
+                                option.cols[0][i + 1]["style"] = "font-size:100%";
+                            }
+                            //璁剧疆鍒楀
+                            //if (data1.data[0].HColumnWidth != 0) {
+                            //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                            //} else {
+                            //    option.cols[0][i + 1]["width"] = "";
+                            //}
+                            //鏄剧ず鍒�
+                            if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                option.cols[0][i + 1]["hide"] = false;
+                            }
+                            //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                            switch (dataCols[2]) {
+                                case "L":
+                                    option.cols[0][i + 1]["align"] = "left";
+                                    break;
+                                case "M":
+                                    option.cols[0][i + 1]["align"] = "center";
+                                    break;
+                                case "R":
+                                    option.cols[0][i + 1]["align"] = "right";
+                                    break;
+                            }
+                        }
+
+                        //鍙栨秷鍐荤粨鍒�
+                        for (var i = 1; i < option.cols[0].length - 1; i++) {
+                            if (option.cols[0][i]["fixed"] != null) {
+                                option.cols[0][i]["fixed"] = null;
+                            }
+                            else {
+                                break;
+                            }
+                        }
+                        //鍐荤粨鍒�
+                        if (data1.data[0].HFixCols != 0) {
+                            for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                    data1.data[0].HFixCols += 1;
+                                }
+                                option.cols[0][i + 1]["fixed"] = "left";
+                            }
+                        }
+                        table.render(option);
+                    } else {
+                        table.render(option);
+                    }
+                }, error: function () {
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            })
+        }
+
+        //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+        function ColFilter() {
+            var Organization = '<option  value="0" selected="selected" ></option>';
+            for (var i = 1; i < option.cols[0].length; i++) {
+                if (option.cols[0][i].hide != true) {
+                    Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+                }
+            }
+            $("#ColName").empty();
+            $("#ColName").append(Organization);
+            form.render('select');
+        }
+        //#endregion
+        //#endregion
+
+        //浠ヤ笂鏄痩ayui妯″潡
+    });
+
+
+
+
+</script>
\ No newline at end of file

--
Gitblit v1.9.1