From e990eee1e8814915059a91f73543c35c6de68744 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 28 二月 2025 15:32:39 +0800
Subject: [PATCH] 班次 计划停机时间 单品过站 关于 不良明细 oee报表优化 spc中心线列表

---
 WebTM/views/车间管理/单品过站/Cj_ProcessItemBGA.html                   |    6 
 WebTM/views/质量管理/基础建模/QC_SpcCenterlineList.html                | 1234 ++++++++++++++++++++++++++++
 WebTM/views/车间管理/报表分析/Sc_OEEReport_WorkShift.html              |  182 ++-
 WebTM/views/生产管理/班次开班单/Sc_ShiftsBeginInfoBill_Add_Edit.html    |   12 
 WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html         |   22 
 WebTM/views/生产管理/生产物料清单/sc_Gy_ICBomBillEdit.html               |  869 +++++++++++++++++++
 WebTM/views/生产管理/生产物料清单/sc_Gy_ICBomBillMainList.html           |  146 ++
 WebTM/views/车间管理/单品过站/Cj_CollectionOfSingleProductDefects.html |    9 
 WebTM/views/基础资料/生产基础资料/Gy_WorkShiftEdit.html                  |   12 
 WebTM/views/生产管理/生产投料单/Sc_PPBomBillList.html                   |    5 
 WebTM/views/车间管理/产线/MES_ProductionLinePackagingList.html       |   96 +
 WebTM/views/index.html                                         |    2 
 WebTM/WebTM.csproj                                             |    2 
 13 files changed, 2,431 insertions(+), 166 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 507f1c3..05a2a83 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -562,6 +562,7 @@
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇鎶ヨ〃\Sc_NutInspectionCCDPassRate.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇鎶ヨ〃\Sc_QualityReportBillMonth.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇鎶ヨ〃\Sc_QualityReportBillDay.html" />
+    <Content Include="views\鐢熶骇绠$悊\鐢熶骇鐗╂枡娓呭崟\sc_Gy_ICBomBillEdit.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇璁″垝骞冲彴\JIT_DayPlanPlatForm_TK.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇璁″垝骞冲彴\JIT_DayPlanPlatForm_BCP.html" />
     <Content Include="views\鐢熶骇绠$悊\璁㈠崟鐘舵�佸垎甯僜Sc_EquipmentProcessList.html" />
@@ -612,6 +613,7 @@
     <Content Include="views\璁惧绠$悊\璁惧瑙勭▼鍗昞Sb_EquipMaintainRuleBill_Excel.html" />
     <Content Include="views\璐ㄩ噺绠$悊\鍩虹寤烘ā\Gy_ErrMsgBackType_Excel.html" />
     <Content Include="views\璐ㄩ噺绠$悊\鍩虹寤烘ā\Gy_ErrType_Excel.html" />
+    <Content Include="views\璐ㄩ噺绠$悊\鍩虹寤烘ā\QC_SpcCenterlineList.html" />
     <Content Include="views\璐ㄩ噺绠$悊\寮傚父鍙嶉\OA_ErrMsgBackSelfQuery_BGT.html" />
     <Content Include="views\璐ㄩ噺绠$悊\鐜妫�娴嬪崟\QC_EnvironmentTestDotCheckBillEdit.html" />
     <Content Include="views\璐ㄩ噺绠$悊\鐜妫�娴嬪崟\QC_EnvironmentTestDotCheckBillList.html" />
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 19049ec..6e20292 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -660,6 +660,7 @@
                                         <dd><a lay-href="璐ㄩ噺绠$悊/妫�楠屾柟妗堝崟/QC_Add_CheckProject.html">妫�楠屾柟妗�</a></dd>
                                         <dd><a lay-href="璐ㄩ噺绠$悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html">妫�楠屾柟妗堢淮鎶�</a></dd>
                                         <dd><a lay-href="璐ㄩ噺绠$悊/鍩虹寤烘ā/Gy_ErrType.html">寮傚父绫诲瀷鍒楄〃</a></dd>
+                                        <dd><a lay-href="璐ㄩ噺绠$悊/鍩虹寤烘ā/QC_SpcCenterlineList.html">SPC涓績绾垮垪琛�</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
@@ -716,6 +717,7 @@
                                     <a>璐ㄩ噺鎶ヨ〃</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="璐ㄩ噺绠$悊/璐ㄩ噺鎶ヨ〃/QC_InspectionFormReport.html">SPC妫�楠屽崟鍒嗘瀽</a></dd>
+   
                                         <dd><a lay-href="璐ㄩ噺绠$悊/璐ㄩ噺鎶ヨ〃/QC_QualityStatisticsDailyReport.html">鐢熶骇璐ㄩ噺缁熻鏃ユ姤</a></dd>
                                         <dd><a lay-href="璐ㄩ噺绠$悊/璐ㄩ噺鎶ヨ〃/QC_MoistureContentDataLedger.html">鍚按鐜囨暟鎹彴璐�</a></dd>
                                         <dd><a lay-href="璐ㄩ噺绠$悊/璐ㄩ噺鎶ヨ〃/QC_PerformanceScrapLedger.html">鎬ц兘鎶ュ簾鍙拌处</a></dd>
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_WorkShiftEdit.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_WorkShiftEdit.html"
index 1f06d46..eda5a56 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_WorkShiftEdit.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_WorkShiftEdit.html"
@@ -94,6 +94,17 @@
                                         </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" name="HPlanShutdownTimes" id="HPlanShutdownTimes" lay-verify="HPlanShutdownTimes" onkeyup="if(!this.value.match(/^[\+\-]?\d*?\.?\d*?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 30px;">灏忔椂</label>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
                                         <div class="layui-inline" style="width: 965px;">
                                             <label class="layui-form-label" style="width: 85px;">鐝鎻忚堪</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
@@ -234,6 +245,7 @@
                                 , "HNote": data.鐝鎻忚堪                                
                                 , "HWorkTimes": data.宸ヤ綔鏃堕棿
                                 , "HRemark": data.澶囨敞
+                                , "HPlanShutdownTimes": data.璁″垝鍋滃伐鏃堕暱
                             });
                             $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囪 == "true" ? true : false);//true:閫変腑 false:涓嶉�変腑
                             var rowdata = [];
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\217\255\346\254\241\345\274\200\347\217\255\345\215\225/Sc_ShiftsBeginInfoBill_Add_Edit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\217\255\346\254\241\345\274\200\347\217\255\345\215\225/Sc_ShiftsBeginInfoBill_Add_Edit.html"
index c126cbd..9073a85 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\217\255\346\254\241\345\274\200\347\217\255\345\215\225/Sc_ShiftsBeginInfoBill_Add_Edit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\217\255\346\254\241\345\274\200\347\217\255\345\215\225/Sc_ShiftsBeginInfoBill_Add_Edit.html"
@@ -118,14 +118,20 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-row">                                     
+                                    <div class="layui-row">
                                         <div class="layui-col-xs3 layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">搴斿埌宀椾汉鏁�<label style="color:red"> * </label></label>
                                             <div class="layui-input-inline">
                                                 <input type="text" class="layui-input" lay-verify="HStdEmpQty" name="HStdEmpQty" id="HStdEmpQty" value="">
                                             </div>
                                         </div>
-                                        <div class="layui-col-xs9 layui-inline">
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label" style="width: 95px; margin-left: -15px;">璁″垝鍋滃伐鏃堕暱<label style="color:red"> * </label></label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" lay-verify="HPlanShutdownTimes" name="HPlanShutdownTimes" id="HPlanShutdownTimes" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3 layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
@@ -791,6 +797,7 @@
                             , "HGroupLeaderID": data[0]["HGroupLeaderID"]
                             , "HGroupLeaderName": data[0]["鐝粍闀�"]                        
                             , "HStdEmpQty": data[0]["搴斿埌宀椾汉鏁�"]
+                            , "HPlanShutdownTimes": data[0]["璁″垝鍋滃伐鏃堕暱"]
 
                             , "HRemark": data[0]["琛ㄥご澶囨敞"]
                             , "HMaker": data[0]["鍒跺崟浜�"]
@@ -853,6 +860,7 @@
                     return false;
                 }
 
+
                 //#region 瀛愯〃鏁版嵁妫�楠�
                 //for (var i = 0; i < option.data.length; i++) {
                 //    if (option.data[i] != "") {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPBomBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPBomBillList.html"
index af7eabf..1536289 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPBomBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPBomBillList.html"
@@ -308,8 +308,11 @@
                     case 'set_HideColumn':
                         get_HideColumn();
                         break;
-                    default:
+                    //鍒锋柊
+                    case "btn-reload":
+                        get_FastQuery();
                         break;
+                  
                     case 'btn-Add':
                         //椤甸潰灞�-鑷畾涔�
                         layer.open({
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\211\251\346\226\231\346\270\205\345\215\225/sc_Gy_ICBomBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\211\251\346\226\231\346\270\205\345\215\225/sc_Gy_ICBomBillEdit.html"
new file mode 100644
index 0000000..d3108bf
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\211\251\346\226\231\346\270\205\345\215\225/sc_Gy_ICBomBillEdit.html"
@@ -0,0 +1,869 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鐢熶骇鐗╂枡娓呭崟鏂板/缂栬緫</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <style type="text/css">
+        .layui-form-item .layui-inline {
+            margin-right: 0;
+        }
+
+        html {
+            background-color: white;
+            color: white;
+        }
+
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+    </style>
+</head>
+<body>
+
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 15px;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" lay-filter="component-form-group" action="">
+                    <div class="layui-card-header">
+                        <div class="layui-btn-group">
+                            <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <h1 style="text-align: center; padding: 10px 0;"><b>鐢熶骇鐗╂枡娓呭崟</b></h1>
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="date" class="layui-input" name="HDate" id="HDate">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鐗堟湰</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HVersion" id="HVersion" autocomplete="off" value="">
+                                            </div>
+                                        </div>
+
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍥惧彿</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HPicNo" id="HPicNo" autocomplete="off" value="">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鐗╂枡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HMaterName" id="HMaterName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">璁¢噺鍗曚綅</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HUnitName" id="HUnitName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HUnitID" id="HUnitID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HUnitList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鏁伴噺</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HQty" id="HQty" autocomplete="off" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鎴愬搧鐜�</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HProdRate" id="HProdRate" autocomplete="off" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label" style="width: 80px;">璺冲眰</label>
+                                            <div class="layui-input-block" style="width: 190px;">
+                                                <select name="HJump" id="HJump" lay-filter="HJump">
+                                                    <option value="鏄�">鏄�</option>
+                                                    <option value="鍚�">鍚�</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鐘舵��</label>
+                                            <div class="layui-input-inline">
+                                                <input type="checkbox" name="HStatus" id="HStatus" lay-skin="primary" lay-filter="checkbox" value="鍚敤" title="鏄惁鍚敤">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">BOM绫诲瀷</label>
+                                            <div class="layui-input-block" style="width: 190px;">
+                                                <select name="HBomType" id="HBomType" lay-filter="HBomType">
+                                                    <option value="鏍囧噯BOM">鏍囧噯BOM</option>
+                                                    <option value="鐢熶骇BOM">鐢熶骇BOM</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs7 layui-inline">
+                                            <label class="layui-form-label">澶囨敞</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--鍒跺崟淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浣滃簾浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HDeleteMan " id="HDeleteMan " style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-row">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
+                                                <div class="layui-input-block" style="margin-left: 120px;">
+                                                    <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                        </div>
+                    </script>
+
+                    <script type="text/html" id="xuhao">
+                        {{d.LAY_TABLE_INDEX+1}}
+                    </script>
+                </form>
+            </div>
+        </div>
+    </div>
+
+</body>
+</html>
+<script type="text/html" id="barDemo">
+    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+
+<script>
+    //#region 鎶樺彔娉ㄩ噴
+    //#endregion
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+        //#region 鍏敤鍙橀噺
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , laydate = layui.laydate
+            , form = layui.form
+            , element = layui.element;
+        var sWhere = "";
+        var date = new Date();
+        //#endregion
+
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+        get_LoginIs();
+
+        //鑾峰彇椤甸潰璺宠浆鍙傛暟
+        var params = get_UrlVars();
+        var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫
+        var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+
+        Organ();
+
+        //鍒ゆ柇鏄惁鏂板
+        if (linterid == null || linterid == 0) {
+            //鑾峰彇鏈�澶у崟鎹彿 new
+            $("#HMaker").val(sessionStorage["HUserName"]);
+            $("#HInterID").val("0");
+            $("#HBillNo").val("");
+            $.ajax({
+                url: GetWEBURL() + "/Web/GetMAXNum",
+                type: "GET",
+                data: { "HBillType": '3302' },
+                success: function (d) {
+                    //console.log(d.data);
+                    $("#HBillNo").val(d.data[0].HBillNo);
+                    $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                    $("#HInterID").val(d.data[0].HInterID);
+                }
+            });
+        } else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+            $("#HInterID").val(linterid);
+            RoadBillMain(linterid);
+        }
+        //#endregion
+
+        var rowdata = [{
+            "HMaterID": 0, "HMaterNumber": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "HUnitNumber": "", "璁¢噺鍗曚綅": ""
+            , "HWHID": "0", "浠撳簱": "", "HProcID": "0", "宸ュ簭": "", "HQty": "0", "HRelQty": "0", "HWasteRate": "0", "HRemark": ""
+        }];
+
+        // 鍒濆鍖栫晫
+        set_InitGrid();
+
+        //澶村伐鍏锋爮浜嬩欢
+        table.on('toolbar(mainTable)', function (obj) {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            //鏂板琛岃〃鏍兼暟鎹�
+            var NewRow = {
+                "HMaterID": 0, "HMaterNumber": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "HUnitNumber": "", "璁¢噺鍗曚綅": ""
+                , "HWHID": "0", "浠撳簱": "", "HProcID": "0", "宸ュ簭": "", "HQty": "0", "HRelQty": "0", "HWasteRate": "0", "HRemark": ""
+            };
+            switch (obj.event) {
+                case 'btn-AddLine':
+                    table.cache["mainTable"].push(NewRow);
+                    option.data = table.cache["mainTable"];
+
+                    table.render(option);
+                    //鍒锋柊澶嶉�夋
+                    //checkRefresh();
+                    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);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                        //鍒锋柊澶嶉�夋
+                        //checkRefresh();
+                    }
+                    break;
+                ////鍒楄缃�
+                //case 'set_HideColumn':
+                //    get_HideColumn();
+                //    break;
+            }
+        });
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        //閫�鍑烘寜閽�
+        form.on('submit(Exit)', function () {
+            Pub_Close(1);
+        })
+
+        //閫夋嫨鐗╂枡鎸夐挳
+        form.on('submit(HMaterList)', function () {
+            get_checkMater();
+        });
+
+        //閫夋嫨璁¢噺鍗曚綅鎸夐挳
+        form.on('submit(HUnitList)', function () {
+            get_checkUnit();
+        });
+
+
+        //淇濆瓨鎸夐挳
+        form.on('submit(set_SaveBill)', function (data) {
+            set_SaveBill(data);
+        });
+
+        //琛屽唴浜嬩欢
+        table.on('tool(mainTable)', function (obj) {
+            set_GridDelete(obj);   //琛屽唴鍒犻櫎
+            set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+            var data = obj.data;
+            if (obj.event == 'HDate') {
+                var field = $(this).data('field');
+                laydate.render({
+                    elem: this.firstChild
+                    , show: true //鐩存帴鏄剧ず
+                    , closeStop: this
+                    , done: function (nowDate) {
+                        //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+                        data[field] = nowDate;
+                        obj.update(data);
+                        //鍒锋柊澶嶉�夋
+                        //checkRefresh();
+                    }
+                });
+            }
+        });
+
+        $(document).ready(function () {
+
+            $("#HQty").on("input", function (e) {
+                currentValue = $(this).val(); // 鏇存柊褰撳墠鍊�
+
+                for (var i = 0; i < option.data.length; i++) {
+                    option.data[i]["HQty"] = e.delegateTarget.value;
+                }
+                table.render(option);
+            });
+        });
+
+
+        //#endregion
+
+
+        //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+        //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+        function get_LoginIs() {
+            if (sessionStorage.login != "login") {
+                layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                }, function () { window.location.href = "../../user/login.html"; });
+            }
+        }
+        //#endregion
+
+        //#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
+
+     
+
+        function set_InitGrid() {
+            option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , limit: 500
+                , height: 500
+                , loading: false
+                , cols: [[ //瀛愯〃
+                    { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                    , { type: 'numbers', title: '搴忓彿', width: 100, totalRow: true }
+                    , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
+                    , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150, edit: 'text', event: "HMaterID" }//f7
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, }
+                    , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true }
+                    , { field: 'HUnitNumber', title: '璁¢噺鍗曚綅浠g爜', width: 150, edit: 'text', event: "HUnitID" }//f7
+                    , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 100, edit: 'text' }
+                    , { field: 'HWHID', title: 'HWHID', width: 100, hide: true }
+                    , { field: '浠撳簱', title: '浠撳簱', width: 100, edit: 'text', event: "HWHID" }//f7
+                    , { field: 'HProcID', title: 'HProcID', width: 100, hide: true }
+                    , { field: '宸ュ簭', title: '宸ュ簭', width: 100, edit: 'text', event: "HProcID" }//f7
+                    , { field: 'HQty', title: '鐢ㄩ噺', width: 100, edit: 'text' }
+                    , { field: 'HRelQty', title: '鍑�鐢ㄩ噺 ', width: 100, edit: 'text' }
+                    , { field: 'HWasteRate', title: '鎹熻�楃巼 ', width: 100, edit: 'text' }
+                    , { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+                ]]
+            }
+
+            option.data = rowdata;
+            table.render(option);
+        }
+
+        //#region 鍔犺浇琛ㄥご
+        function RoadBillMain(linterid) {
+            //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + "/Sc_ICBomBill/Editlist",
+                type: "GET",
+                data: {
+                    "sWhere": "and hmainid=" + linterid
+                },
+                success: function (result) {
+                    if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        var data = result.data[0];
+                        allVal = result.data[0];
+                        form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                            "HBillNo": data.鍗曟嵁鍙�
+                            , "HDate": formatDate(data.鏃ユ湡)
+                            , "HVersion": data.鐗堟湰
+                            , "HPicNo": data.鍥惧彿
+                            , "HMaterName": data.涓讳欢鐗╂枡鍚嶇О
+                            , "HMaterID": data.涓荤墿鏂檌d
+                            , "HUnitName": data.涓讳欢璁¢噺鍗曚綅
+                            , "HUnitID": data.涓诲崟浣峣d
+                            , "HQty": data.鏁伴噺
+                            , "HProdRate": data.鎴愬搧鐜�
+                            , "HJump": data.璺冲眰
+                            , "HStatus": data.鐘舵��
+                            , "HBomType": data.BOM绫诲瀷
+                            , "HRemark": data.琛ㄥご澶囨敞
+                            , "HMaker": data.鍒跺崟浜�
+                            , "HChecker": data.瀹℃牳浜�
+                            , "HCloseMan": data.鍏抽棴浜�
+                            , "HUpDater": data.淇敼浜�
+                            , "HDeleteMan": data.浣滃簾浜�
+                            , "HMakeDate": data.鍒跺崟鏃ユ湡
+                            , "HCheckDate": data.瀹℃牳鏃ユ湡
+                            , "HCloseDate": data.鍏抽棴鏃ユ湡
+                            , "HUpDateDate": data.淇敼鏃ユ湡
+                            , "HDeleteDate": data.浣滃簾鏃ユ湡
+                        });
+
+                        //瀛愯〃  璧嬪��
+                        var rowdata = [];
+                        for (var i = 0; i < result.data.length; i++) {
+                            rowdata.push(
+                                {
+                                    "HMaterID": result.data[i].HMaterID, "HMaterNumber": result.data[i].鐗╂枡浠g爜, "鐗╂枡鍚嶇О": result.data[i].鐗╂枡鍚嶇О
+                                    , "瑙勬牸鍨嬪彿": result.data[i].瑙勬牸鍨嬪彿, "HUnitID": result.data[i].HUnitID, "HUnitNumber": result.data[i].璁¢噺鍗曚綅浠g爜
+                                    , "璁¢噺鍗曚綅": result.data[i].璁¢噺鍗曚綅
+                                    , "HWHID": result.data[i].HWHID, "浠撳簱": result.data[i].浠撳簱, "HProcID": result.data[i].HProcID, "宸ュ簭": result.data[i].宸ュ簭
+                                    , "HQty": result.data[i].鐢ㄩ噺, "HRelQty": result.data[i].鍑�鐢ㄩ噺, "HWasteRate": result.data[i].鎹熻�楃巼, "HRemark": result.data[i].琛ㄤ綋澶囨敞
+                                }
+                            )
+                        }
+                        option.data = rowdata;
+                        table.render(option);
+                        form.render('select');
+
+                        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 });
+                }
+            });
+        }
+        //#endregion
+
+        //#region 淇濆瓨鏂规硶
+        function set_SaveBill(data) {
+
+            var num = [];
+            for (var i = 0; i < table.cache["mainTable"].length; i++) {
+                if (table.cache["mainTable"][i] != "") {
+                    table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+                    num.push(table.cache["mainTable"][i])
+                }
+            }
+
+            var sMainStr = JSON.stringify(data.field);
+            var sSubStr = JSON.stringify(num);
+            var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"] ;
+
+            $.ajax({
+                type: "POST",
+                url: GetWEBURL() + "sc_Gy_ICBomBill/sc_Gy_ICBomBillAdd", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                async: true,
+                data: { "sMainSub": sMainSub },
+                dataType: "json",
+                success: function (data) {
+                    if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        layer.msg(data.Message, { icon: 1 });
+
+                        $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                        //淇濆瓨鍚庢祻瑙�
+                        //ReRoadBillMain();
+                    }
+                    else {
+                        layer.alert(data.Message, { icon: 5 });
+                    }
+                    layer.closeAll("loading");
+                },
+                error: function (err) {
+                    layer.alert("閿欒:" + err, { icon: 5 });
+                    console.log("Reason" + sMainStr);
+                }
+            });
+        }
+        //#endregion
+
+        //琛屽唴蹇嵎閿瓫閫�
+        function set_GridCellCheck(obj) {
+            $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                if (event.key == "F7") {
+                    //鐗╂枡
+                    if (obj.event == "HMaterID") {
+                        layer.open({
+                            type: 2
+                            , skin: "layui-layer-rim" //鍔犱笂杈规
+                            , title: "鐗╂枡鍒楄〃"  //鏍囬
+                            , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                            , shift: 2 //寮瑰嚭鍔ㄧ敾
+                            , area: ["90%", "90%"] //绐椾綋澶у皬
+                            , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                            , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
+                            , btn: ["纭畾", "鍙栨秷"]
+                            , btn1: function (index, laero) {
+                                //鎸夐挳涓�  鐨勫洖璋�
+                                var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                if (checkStatus.data.length != 1) {
+                                    return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                }
+
+                                var hqty = $("#HQty").val();
+
+                                //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                obj.update({
+                                    "HMaterID": checkStatus.data[0].HItemID
+                                    , "HMaterNumber": checkStatus.data[0].鐗╂枡浠g爜
+                                    , "鐗╂枡鍚嶇О": checkStatus.data[0].鐗╂枡鍚嶇О
+                                    , "瑙勬牸鍨嬪彿": checkStatus.data[0].瑙勬牸鍨嬪彿
+                                    , "HUnitID": checkStatus.data[0].HUnitID
+                                    , "HUnitNumber": checkStatus.data[0].璁¢噺鍗曚綅浠g爜
+                                    , "璁¢噺鍗曚綅": checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
+                                    , "HQty": hqty
+                                })
+                                layer.close(index);//鍏抽棴寮圭獥
+                            }
+                        })
+                    }
+                    //璁¢噺鍗曚綅
+                    if (obj.event == "HUnitID") {
+                        layer.open({
+                            type: 2
+                            , skin: "layui-layer-rim" //鍔犱笂杈规
+                            , title: "璁¢噺鍗曚綅鍒楄〃"  //鏍囬
+                            , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                            , shift: 2 //寮瑰嚭鍔ㄧ敾
+                            , area: ["90%", "90%"] //绐椾綋澶у皬
+                            , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                            , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+                            , btn: ["纭畾", "鍙栨秷"]
+                            , btn1: function (index, laero) {
+                                //鎸夐挳涓�  鐨勫洖璋�
+                                var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                if (checkStatus.data.length != 1) {
+                                    return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                }
+                                //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                obj.update({
+                                    "璁¢噺鍗曚綅": checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
+                                    , "HUnitID": checkStatus.data[0].HItemID
+                                    , "HUnitNumber": checkStatus.data[0].璁¢噺鍗曚綅浠g爜
+                                })
+                                layer.close(index);//鍏抽棴寮圭獥
+                            }
+                        })
+                    }
+                    //浠撳簱
+                    if (obj.event == "HWHID") {
+                        layer.open({
+                            type: 2//寮圭獥绫诲瀷
+                            , skin: 'layui-layer-rim' //鍔犱笂杈规
+                            , area: ['90%', '90%']//澶у皬
+                            , title: '浠撳簱鍒楄〃'//鏍囬
+                            , shift: 2//寮瑰嚭鍔ㄧ敾
+                            , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.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].浠撳簱鍚嶇О
+                                    , "HWHID": checkStatus.data[0].HItemID
+                                })
+                                layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                            }
+                            , btn2: function (index, layero) { }
+                        })
+                    }
+                    //宸ュ簭
+                    if (obj.event == "HProcID") {
+                        layer.open({
+                            type: 2
+                            , skin: "layui-layer-rim" //鍔犱笂杈规
+                            , title: "鏀舵枡浠撲綅鍒楄〃"  //鏍囬
+                            , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                            , shift: 2 //寮瑰嚭鍔ㄧ敾
+                            , area: ["90%", "90%"] //绐椾綋澶у皬
+                            , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                            , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes']
+                            , btn: ["纭畾", "鍙栨秷"]
+                            , btn1: function (index, laero) {
+                                //鎸夐挳涓�  鐨勫洖璋�
+                                var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                if (checkStatus.data.length != 1) {
+                                    return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                }
+                                //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                obj.update({
+                                    "宸ュ簭": checkStatus.data[0].宸ュ簭鍚嶇О
+                                    , "HProcID": checkStatus.data[0].HItemID
+                                })
+                                layer.close(index);//鍏抽棴寮圭獥
+                            }
+                        })
+                    }
+                    //璁¢噺鍗曚綅
+                    if (obj.event == "HBASEUNITID") {
+                        layer.open({
+                            type: 2
+                            , skin: "layui-layer-rim" //鍔犱笂杈规
+                            , title: "鍩烘湰璁¢噺鍗曚綅鍒楄〃"  //鏍囬
+                            , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                            , shift: 2 //寮瑰嚭鍔ㄧ敾
+                            , area: ["90%", "90%"] //绐椾綋澶у皬
+                            , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                            , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+                            , btn: ["纭畾", "鍙栨秷"]
+                            , btn1: function (index, laero) {
+                                //鎸夐挳涓�  鐨勫洖璋�
+                                var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                if (checkStatus.data.length != 1) {
+                                    return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                }
+                                //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                obj.update({
+                                    "鍩烘湰璁¢噺鍗曚綅": checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
+                                    , "HBASEUNITID": checkStatus.data[0].HItemID
+                                })
+                                layer.close(index);//鍏抽棴寮圭獥
+                            }
+                        })
+                    }
+
+                    obj.event = "";
+                    return false;
+                }
+            })
+        }
+
+        //琛屽唴鍒犻櫎
+        function set_GridDelete(obj) {
+            var data = obj.data;
+            var rowIndex = $(obj.tr).attr("data-index");
+            if (obj.event === 'del') {
+                layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                    console.log("绱㈠紩涓�:" + rowIndex);
+                    if (rowIndex === '0') {
+                        layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                    } else {
+                        obj.del();
+                        option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                        table.reload(option);
+                        layer.close(index);
+                    }
+                });
+            }
+        }
+
+        //鑾峰彇缁勭粐
+        function Organ() {
+            //鑾峰彇鐧诲綍椤电粍缁囧垪
+            var Organization = '';
+            $.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++) {
+                            Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                        }
+                        $("#HPRDORGID").append(Organization);
+                        $("#HPRDORGID").val(sessionStorage["OrganizationID"])
+                        form.render('select');
+                    }
+                    layer.closeAll("loading");
+                }
+            })
+        }
+
+        function get_checkMater() {
+            layer.open({
+                type: 2//寮圭獥绫诲瀷
+                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '鐗╂枡鍒楄〃'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.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('璇烽�夋嫨鏁版嵁');
+                    }
+                    $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+                    $("#HMaterID").val(checkStatus.data[0].HItemID);
+                    $("#HUnitID").val(checkStatus.data[0].HUnitID);
+                    $("#HUnitName").val(checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О);
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+        }
+
+        function get_checkUnit() {
+            layer.open({
+                type: 2//寮圭獥绫诲瀷
+                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '璁¢噺鍗曚綅鍒楄〃'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.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('璇烽�夋嫨鏁版嵁');
+                    }
+                    $("#HUnitName").val(checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О);
+                    $("#HUnitID").val(checkStatus.data[0].HItemID);
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+        }
+
+        //#region 淇濆瓨鍚庢祻瑙堟柟娉�
+        function ReRoadBillMain() {
+            location.replace('Add_Edit_Cg_POInStockBillList.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
+            //document.location.href('Add_Edit_Gy_Source.html ? OperationType = 4 & linterid=' + linterid + ' & HSouceBillType=');
+            $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+        }
+        //#endregion
+
+        //#endregion
+
+
+        //浠ヤ笂鏄痩ayui妯″潡
+    });
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\211\251\346\226\231\346\270\205\345\215\225/sc_Gy_ICBomBillMainList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\211\251\346\226\231\346\270\205\345\215\225/sc_Gy_ICBomBillMainList.html"
index f7673db..d116d17 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\211\251\346\226\231\346\270\205\345\215\225/sc_Gy_ICBomBillMainList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\211\251\346\226\231\346\270\205\345\215\225/sc_Gy_ICBomBillMainList.html"
@@ -197,8 +197,8 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                             </div>
                         </script>
@@ -292,6 +292,117 @@
                     }
                 });
             })
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on("toolbar(mainTable)", function (obj) {
+                var checkStatus = table.checkStatus(obj.config.id);//鑾峰彇閫変腑琛� 鏁版嵁
+                switch (obj.event) {
+                    //瀹℃牳
+                    case "btn-Audit": set_AuditBill();
+                        break;
+                    //鍙嶅鏍�
+                    case "btn-DeAudit": set_DeAuditBill();
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn':
+                        get_HideColumn();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                    //鍒锋柊
+                    case "get_Refresh":
+                        get_FastQuery();
+                        break;
+                  //鏂板
+                    case 'btn-Add':
+                        //椤甸潰灞�-鑷畾涔�
+                        layer.open({
+                            type: 2,
+                            skin: 'layui-layer-rim', //鍔犱笂杈规
+                            title: '鏂板鐢熶骇鐢ㄦ枡鍗�',
+                            closeBtn: 1,
+                            shift: 2,
+                            area: ['100%', '100%'],
+                            maxmin: true,
+                            content: './sc_Gy_ICBomBillEdit.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
+                            end: function () {
+                                //鍒锋柊椤甸潰,
+                                location.reload();
+                            },
+                            success: function (layero, index) {
+
+                            }
+                        });
+                        break;
+                     //淇敼
+                    case 'btn-Edit':
+                        var checkStatus = table.checkStatus('mainTable')
+                            , data = checkStatus.data;
+                        if (checkStatus.data.length === 1) {
+                            var hID = data[0].hmainid.toString();
+                            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                            layer.open({
+                                type: 2
+                                , area: ['100%', '100%']
+                                , title: '缂栬緫鐢熶骇鐢ㄦ枡鍗�'
+                                , closeBtn: 1
+                                , shade: 0.6 //閬僵閫忔槑搴�
+                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                                , content: './sc_Gy_ICBomBillEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
+                                , resize: false,
+                                end: function () {
+                                    //鍒锋柊椤甸潰,
+                                    location.reload();
+                                }
+                                , cancel: function () {
+                                    //$(".layui-btn").removeClass("layui-btn-disabled");
+                                }
+                            })
+
+                        } else {
+                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                        }
+                        break;
+                    //鍒犻櫎
+                    case 'btn-Delete':
+                        var checkStatus = table.checkStatus('mainTable')
+                            , data = checkStatus.data;
+                        if (checkStatus.data.length === 1) {
+                            var InterID = data[0].hmainid.toString();
+                            //閫昏緫鍒犻櫎鏂规硶
+                            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                                $.ajax({
+                                    type: "GET",
+                                    url: GetWEBURL() + "sc_Gy_ICBomBill/DeltetICBomBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                                    data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
+                                    success: function (result) {
+                                        if (result.count == 1) {
+                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                                // 寰楀埌frame绱㈠紩
+                                                var index = layer.getFrameIndex(window.name);
+                                                //鍏抽棴褰撳墠frame
+                                                layer.close(index);
+                                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                                window.location.reload();
+                                            });
+
+                                        } else {
+                                            layer.alert(result.code + result.Message, { icon: 5 });
+                                        }
+                                    }, error: function () {
+                                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                    }
+                                });
+                            })
+                        }
+                        else {
+                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                        }
+                        break;
+                }
+            })
             //#endregion
 
             //#region  姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -299,13 +410,12 @@
             function set_ClearBill() {
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
-                //鏌ヨ
-                get_Display(sWhere);
-
                 ColFilter();
                 //鍒濆鍖栨棩鏈�
                 $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                 $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //鏌ヨ
+                get_FastQuery();
             }
 
             function set_InitGrid() {
@@ -540,7 +650,7 @@
                     //閫昏緫瀹℃牳鏂规硶
                     $.ajax({
                         type: "GET",
-                        url: GetWEBURL() + "/Kf_ICStockBillMain/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        url: GetWEBURL() + "/sc_Gy_ICBomBill/AuditBomBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                         data: { "HInterID": InterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
                         success: function (result) {
                             if (result.count == 1) {
@@ -576,7 +686,7 @@
                     //閫昏緫瀹℃牳鏂规硶
                     $.ajax({
                         type: "GET",
-                        url: GetWEBURL() + "/Kf_ICStockBillMain/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        url: GetWEBURL() + "/sc_Gy_ICBomBill/AuditBomBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                         data: { "HInterID": InterID, "IsAudit": 2, "CurUserName": sessionStorage["HUserName"] },
                         success: function (result) {
                             if (result.count == 1) {
@@ -600,28 +710,6 @@
                 }
                 else {
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�');
-                }
-            }
-
-            //鎵撳嵃
-            function get_PrintReport() {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-
-                if (checkStatus.data.length === 1) {
-                    layer.open({
-                        type: 2
-                        , area: ['50%', '50%']
-                        , title: '鎵撳嵃妯$増閫夋嫨'
-                        , shade: 0.6 //閬僵閫忔槑搴�
-                        , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
-                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=ICStockBill', 'yes']
-                        , resize: false
-                    })
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
                 }
             }
 
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/QC_SpcCenterlineList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/QC_SpcCenterlineList.html"
new file mode 100644
index 0000000..246d728
--- /dev/null
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/QC_SpcCenterlineList.html"
@@ -0,0 +1,1234 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>SPC涓績绾垮垪琛�</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/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/PageTitle.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">
+                                        <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+                                        </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="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                                <!--鏄剧ず褰撳墠杩囨护鏂规-->
+                                <div class="layui-inline" style="margin-left:5px;">
+                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+                                </div>
+                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" 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 ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" 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 ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" 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 ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+                                        </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_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+    <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+    <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
+    <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_AbnormalUpdate"><i class="layui-icon layui-icon-refresh-3"></i>寮傚父鏇存柊</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
+    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></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 option = [];
+            var sWhere = "";
+            var HModName = "QC_SpcCenterlineList";
+
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["HInterID", "HMaterID", "HQCCheckItemID", "HCenterWorkID", "HProcID", "HEnvironmentItemID"];
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            var HModuleType = "3340";
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+            //#endregion
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //杩囨护鏉′欢鐨刢lass绫�
+            var HClassTag = "ForFilteringSchemes";
+            //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+            window.HModuleName = "SPC涓績绾垮垪琛�";
+            //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+            window.HDefaultFilter = "";
+            //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+            window.HInterID_Choose = 0;
+
+            //#endregion
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            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_Copy': set_Copy();
+                        break;
+                    //鍒犻櫎
+                    case 'set_DeleteBill': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //寮傚父鏇存柊
+                    case 'get_AbnormalUpdate': get_AbnormalUpdate();
+                        break;
+
+                    //瀹℃牳鎸夐挳      锛�1:瀹℃牳銆�2:鍙嶅鏍革級
+                    case 'btn-Audit':
+                        set_CheckBill(1);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_CheckBill(2);
+                        break;
+                    //鍏抽棴鎸夐挳        锛�1:鍏抽棴銆�2:鍙嶅叧闂級
+                    case 'btn-Close':
+                        set_CloseBill(1);
+                        break;
+                    //鍙嶅叧闂寜閽�
+                    case 'btn-DeClose':
+                        set_CloseBill(2);
+                        break;
+                    //浣滃簾鎸夐挳        锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
+                    case 'btn-Drop':
+                        set_DropBill(1);
+                        break;
+                    //鍙嶄綔搴熸寜閽�
+                    case 'btn-DeDrop':
+                        set_DropBill(2);
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumn();
+                        break;
+                    //淇濆瓨鏂规
+                    case 'set_SaveScheme': set_SaveScheme();
+                        break;
+                    //璇诲彇鏂规
+                    case 'set_ReadScheme': set_ReadScheme();
+                        break;
+                };
+            });
+            //#endregion
+
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                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鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } 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;
+                    }
+                });
+            })
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(2);
+            });
+            //#endregion
+
+            //#endregion
+            //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+            form.on('select(HInitTimeCycle)', function (data) {
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                if (HInitTimeCycle != -1) {
+                    $('#HBeginDate').prop('disabled', true);
+                    $('#HEndDate').prop('disabled', true);
+
+                    $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                    $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+                    //鎵ц鏌ヨ鏂规硶
+                    get_FastQuery();
+                } else {
+                    $('#HBeginDate').prop('disabled', false);
+                    $('#HEndDate').prop('disabled', false);
+                }
+            });
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+                setSelect_HInitTimeCycle();
+                //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                if (HInitTimeCycle != -1) {
+                    $('#HBeginDate').prop('disabled', true);
+                    $('#HEndDate').prop('disabled', true);
+                } else {
+                    $('#HBeginDate').prop('disabled', false);
+                    $('#HEndDate').prop('disabled', false);
+                }
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+                get_DefaultModule();
+            }
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , totalRow: true
+                    //, cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                };
+            }
+            //#endregion
+
+            //#endregion  鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                var data = obj.data;
+                //鍗曟嵁鍙疯秴閾炬帴
+                if (obj.event == '鍗曟嵁鍙�') {                  //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+                    var linterid = data.HInterID.toString();    //澹版槑鍙橀噺linterid 涓� data.HInterID
+                    layer.open({                //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+                        type: 2                         //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫' + HPageTitle  //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+                        , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../../璐ㄩ噺绠$悊/鍩虹寤烘ā/Gy_EnvironmentTestSchemeBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='//璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+                        , resize: false,  //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
+                        end: function () {  //褰撳叧闂椂璋冪敤
+                        }
+                        , cancel: function () {  //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
+                        }
+                    })
+                }
+            });
+             //#endregion
+
+            //寮傚父鏁版嵁  涓績绾挎洿鏂�
+            function get_AbnormalUpdate() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HInterID.toString();
+                    var HBeginDate = $("#HBeginDate").val();
+                    var HEndDate = $("#HEndDate").val();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/QC_SpcCenterlineList/UpdateData", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": HInterID, "HBeginDate": HBeginDate, "HEndDate": HEndDate, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                var AvgData = result.data[0]["涓績绾�"];
+                                var HControlUpperLimit_X = result.data[0]["涓婇檺"];
+                                var HControlLowerLimit_X = result.data[0]["涓嬮檺"];
+                                //var HMaterID = result.data[0]["HMaterID"];
+                                //var HQCCheckItemID = result.data[0]["HQCCheckItemID"];
+                                //var HMouldNum = result.data[0]["HMouldNum"];
+
+                                layer.confirm("涓績绾�:" + AvgData + ",鍧囧�间笂闄�:" + HControlUpperLimit_X + ",鍧囧�间笅闄�:" + HControlLowerLimit_X+"锛屾槸鍚︾‘璁や繚瀛�?", { title: "鍒犻櫎纭" }, function (index) {
+                                    $.ajax({
+                                        type: "GET",
+                                        url: GetWEBURL() + "/QC_SpcCenterlineList/QC_SpcCenterlineAdd", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                                        data: { "HInterID": linterid, "AvgData": AvgData, "HControlUpperLimit_X": HControlUpperLimit_X, "HControlLowerLimit_X": HControlLowerLimit_X, "user": sessionStorage["HUserName"] },
+                                        success: function (result) {
+                                            if (result.count == 1) {
+                                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                                    // 寰楀埌frame绱㈠紩
+                                                    var index = layer.getFrameIndex(window.name);
+                                                    //鍏抽棴褰撳墠frame
+                                                    layer.close(index);
+                                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                                    get_FastQuery();
+                                                });
+
+                                            } else {
+                                                layer.alert(result.code + result.Message, { icon: 5 });
+                                            }
+                                        }, error: function () {
+                                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                        }
+                                    });
+                                })
+
+                            } else {
+                                layer.alert(result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹洿鏂帮紒');
+                }
+
+            }
+
+            //#region 鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/QC_SpcCenterlineList/List',
+                    async: false,
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var totalArray = [];
+                            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 == 'HInterID') {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                } else if ($.inArray(data[i].name, totalArray) > -1) { //璁$畻鍒�
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+                                } else if (data[i].name == '鍗曟嵁鍙�') {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
+                                }
+                                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:120 });
+                                            break;
+                                        case 'long':
+                                        case 'Int32':
+                                        case 'Int64':
+                                        case 'double':
+                                        case 'Decimal':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+                                    }
+                                }
+                            }
+
+                            option.cols = [col];
+                            option.data = data1.data;
+                            table.render(option);
+
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+
+                            layer.close(ajaxLoad);
+
+                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                                ColFilter();
+                            }
+
+                        } 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(number) {
+                var HBillNo = $("#HBillNo").val();  //鍗曟嵁鍙�
+                var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+                var HDate1 = $("#HEndDate").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 (HDate) {
+                    sWhere += " and CONVERT(varchar(100),鍒涘缓鏃ユ湡, 23) >= '" + HDate + "'";
+                }
+                if (HDate1) {
+                    sWhere += " and CONVERT(varchar(100),鍒涘缓鏃ユ湡, 23) <= '" + HDate1 + "'";
+                }
+
+                if (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
+
+
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HBillNo").val("");
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");   $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");   $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                form.render('select');
+
+                sWhere = "";
+            }
+            //#endregion
+
+            //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+            function setSelect_HInitTimeCycle() {
+                var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
+                var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
+
+                var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >浠绘剰闂撮殧</option>';
+                for (var i = 0; i < valueList.length; i++) {
+                    HInitTimeCycle_ArrayList += '<option  style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
+                }
+
+                $("#HInitTimeCycle").empty();
+                $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
+                form.render('select');
+
+                $("#HInitTimeCycle").val("29");
+            }
+            //#region 鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '鏂板' + HPageTitle
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../../璐ㄩ噺绠$悊/鍩虹寤烘ā/Gy_EnvironmentTestSchemeBillEdit.html?OperationType=1&linterid=0&HSouceBillType='
+                    ,btn: [],
+                    end: function (index, layero, that) {
+                        //鍒锋柊椤甸潰
+                        $("#btnSearch").trigger('click');
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HInterID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫' + HPageTitle
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../璐ㄩ噺绠$悊/鍩虹寤烘ā/Gy_EnvironmentTestSchemeBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                        , btn: [],
+                        end: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            $("#btnSearch").trigger('click');
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //澶嶅埗
+            function set_Copy() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HInterID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '鏂板' + HPageTitle
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../璐ㄩ噺绠$悊/鍩虹寤烘ā/Gy_EnvironmentTestSchemeBillEdit.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+                        , end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
+
+            //#region 鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length > 0) {
+                    var linterid = data[0].HInterID.toString();
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/Gy_BaseInformation/Delete锘縂y_EnvironmentTestSchemeBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": linterid,"user": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        get_FastQuery();
+                                    });
+
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").trigger('click');
+            }
+            //#endregion
+
+            //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+            function set_CheckBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HInterID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_BaseInformation/AuditGy_EnvironmentTestSchemeBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
+            function set_CloseBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HInterID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_BaseInformation/CloseGy_EnvironmentTestSchemeBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶄綔搴�/浣滃簾鏁版嵁
+            function set_DropBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HInterID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "Gy_BaseInformation/DropGy_EnvironmentTestSchemeBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                var contentUrl = "";
+                for (var i = 1; i < option.cols[0].length; 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);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+            //#endregion
+            //#region 鏄剧ず鍒楁暟鎹�
+            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 = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+                            var titleData = ["HInterID", "HEntryID", "HDeptID", "HReceiveDeptID", "HErrMsgBackTypeID", "HOrgID", "HDutyID"];
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 1; 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 });
+                    }
+                })
+            }
+            //#endregion
+
+
+            //#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);      $("#ColName1").empty();
+                $("#ColName1").append(Organization);      $("#ColName2").empty();
+                $("#ColName2").append(Organization);
+                form.render('select');
+            }
+            //#endregion
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
+            function get_DefaultModule() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+                    type: "GET",
+                    data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            //褰撳墠鐢ㄦ埛璁剧疆鏈夐粯璁ょ殑杩囨护鏂规
+                            var data = data1.data;
+                            //褰撳墠閫夋嫨鐨勮繃婊ゆ柟妗�
+                            HInterID_Choose = data[0].HInterID;
+                            //杩囨护鏂规鍐呯爜
+                            HInterID = data[0].HInterID
+                            //杩囨护鏂规鍚嶇О
+                            HDefaultFilter = data[0].鏂规鍚嶇О
+                            //杩囨护鏂规鐨勫娉紙鏂规淇℃伅鎻忚堪锛�
+                            var HRemark = data[0].澶囨敞
+                            //鏄剧ず鍑哄綋鍓嶇殑榛樿杩囨护鏂规
+                            document.getElementById("HFilterScheme_Now").style.display = "block";
+                            document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
+                            //鎶婅繃婊ゆ潯浠跺�煎洖鍐欏埌椤甸潰涓�
+                            for (let i = 0; i < data.length; i++) {
+                                $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+                                if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+                                    $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+                                }
+                            }
+                            //鎵ц鏌ヨ鏂规硶
+                            get_FastQuery(2)
+                            form.render("select");
+                        } else {
+                            //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
+                            //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
+                            document.getElementById("HFilterScheme_Now").style.display = "none";
+                            //鎵ц鏌ヨ鏂规硶
+                            get_FastQuery(1)
+                            form.render("select");
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //淇濆瓨鏂规
+            function set_SaveScheme() {
+                var index = layer.open()
+                //鍒ゆ柇鐢ㄦ埛鏄惁鐐瑰嚮浜嗗彸涓婅鐨勨�滃弶鍙封�濆叧闂脊绐楅〉闈�
+                var HIsClose_Manual = false;
+                //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                var Filter = document.getElementsByClassName(HClassTag);
+
+                var HFilterIdList = "";//杩囨护鏉′欢
+                var HFilterIdLists = "";//鎷兼帴澶氫釜杩囨护鏉′欢
+                var HValue = "";//杩囨护鍊�
+                var HElement_type = "";//杩囨护鏍囩绫诲瀷
+
+                for (var i = 0; i < Filter.length; i++) {
+                    HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+                    HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                }
+
+                //鍘婚櫎鏈熬閫楀彿
+                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                HValue = HValue.substring(0, HValue.length - 1);
+                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                //褰撳墠椤甸潰涓婃病鏈夐�夋嫨杩囨护鏂规锛岃繘鍏ユ柊澧炴柟娉�
+                if (HDefaultFilter == "") {
+                    layer.open({
+                        type: 2
+                        , area: ['40%', '80%']
+                        , title: '杩囨护鏂规'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                        , cancel: function () {
+                            // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+                            HIsClose_Manual = true;
+                        }
+                        , end: function () {
+                            if (HIsClose_Manual != true) {
+                                get_FastQuery();
+                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                                document.getElementById("HFilterScheme_Now").style.display = "block";
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                            }
+                        }
+                    })
+                    layer.close(index)
+                } else {
+                    //褰撳墠椤甸潰宸叉湁杩囨护鏂规锛岀敤鎴烽�夋嫨 鏂板鎴栬�呯紪杈�
+                    layer.confirm('褰撳墠宸查�夋嫨杩囨护鏂规锛屾槸鍚︿慨鏀癸紵璇烽�夋嫨瀵瑰簲鎿嶄綔', {
+                        title: "鎿嶄綔鎻愮ず",
+                        icon: 0,
+                        btn: ['鏂板鏂规', '淇濆瓨淇敼褰撳墠鏂规', '鍙栨秷']
+                    }, function (index, layero) {
+                        //鏂板
+                        layer.open({
+                            type: 2
+                            , area: ['40%', '80%']
+                            , title: '杩囨护鏂规'
+                            , shift: 0//寮瑰嚭鍔ㄧ敾
+                            , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                            , end: function () {
+                                get_FastQuery()
+                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                                document.getElementById("HFilterScheme_Now").style.display = "block";
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                            }
+                        })
+                        layer.close(index)
+                    }, function (index) {
+                        //缂栬緫
+                        var Filter_Edit = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                        HFilterIdList = "";
+                        HFilterIdLists = "";
+                        HValue = "";
+                        HElement_type = "";
+                        for (var i = 0; i < Filter_Edit.length; i++) {
+                            HFilterIdList = Filter_Edit[i].id; //杩囨护鏉′欢ID
+                            HFilterIdLists += Filter_Edit[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                            HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                            HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                        }
+                        //鍘婚櫎鏈熬閫楀彿
+                        HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                        HValue = HValue.substring(0, HValue.length - 1);
+                        HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                        var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 3;
+
+                        //淇敼
+                        $.ajax({
+                            type: "POST",
+                            url: GetWEBURL() + "/Xt_FastICScheme/save", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": sMainSub },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
+                                }
+                                else {
+
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+
+                            }
+                        });
+                        layer.close(index)
+                    }, function (index) {
+                        //鍙栨秷
+                        layer.alert('鍙栨秷')
+                        layer.close(index)
+                    });
+                }
+
+            }
+
+            //璇诲彇鏂规
+            function set_ReadScheme() {
+                var HIsClose_Manual = false;
+                var Filter = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+
+                var HFilterIdList = "";
+                var HFilterIdLists = "";
+                var HValue = "";
+                var HElement_type = "";
+                for (var i = 0; i < Filter.length; i++) {
+                    HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+                    HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                }
+                //鍘婚櫎鏈熬閫楀彿
+                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                HValue = HValue.substring(0, HValue.length - 1);
+                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '杩囨护鏂规鍒楄〃'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: ' ../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName
+                    , cancel: function () {
+                        // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+                        HIsClose_Manual = true;
+                    }
+                    , end: function () {
+                        if (HIsClose_Manual != true) {
+                            get_FastQuery()
+                            form.render("select");
+                        }
+                    }
+                })
+            }
+
+            //#endregion
+
+
+        });
+
+            //#endregion
+
+        //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+        function HFilterScheme(obj)  //杩斿洖杩囨护鏂规
+        {
+            var HInterID = obj[0].HInterID;
+            HInterID_Choose = obj[0].HInterID;
+            $.ajax({
+                url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+                type: "GET",
+                data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        var data = data1.data;
+                        //璧嬪�艰繃婊ゆ柟妗堝悕绉�
+                        HDefaultFilter = data[0].鏂规鍚嶇О
+                        var HRemark = data[0].澶囨敞
+                        //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                        document.getElementById("HFilterScheme_Now").style.display = "block";
+                        document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
+                        HInterID = data[0].HInterID
+                        //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
+                        for (let i = 0; i < data.length; i++) {
+                            $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+                            if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+                                $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+                            }
+                        }
+
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+        //#endregion
+
+
+            //浠ヤ笂鏄痩ayui妯″潡
+    </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html"
index 29e8ee2..3f8c168 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html"
@@ -21,7 +21,7 @@
         <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"  >
+                    <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">
@@ -185,32 +185,32 @@
                                         </div>
                                     </div>
                                 </div>
-                           
+
                                 <!--<div class="layui-colla-content">
-        <div class="layui-inline">
-            <div class="layui-inline">
-                <span>鍏朵粬鏉′欢></span>
-            </div>
-        </div>
-        <div class="layui-inline">
-            <label class="layui-form-label">浜у搧鍚嶇О</label>
-            <div class="layui-input-block">
-                <input type="text" class="layui-input" name="hname" id="hname">
-            </div>
-        </div>
-        <div class="layui-inline">
-            <label class="layui-form-label">浜у搧浠g爜</label>
-            <div class="layui-input-block">
-                <input type="text" class="layui-input" name="hnumber" id="hnumber">
-            </div>
-        </div>
-        <div class="layui-inline">
-            <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
-            <div class="layui-input-block">
-                <input type="text" class="layui-input" name="hmodel" id="hmodel">
-            </div>
-        </div>
-    </div>-->
+                                    <div class="layui-inline">
+                                        <div class="layui-inline">
+                                            <span>鍏朵粬鏉′欢></span>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">浜у搧鍚嶇О</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="hname" id="hname">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">浜у搧浠g爜</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="hnumber" id="hnumber">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="hmodel" id="hmodel">
+                                        </div>
+                                    </div>
+                                </div>-->
                             </div>
                         </div>
                         <table class="layui-form-item" id="mainTable" lay-filter="mainTable"></table>
@@ -227,6 +227,9 @@
                                 </button>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="BtnDel" id="BtnDel">
                                     <i class="layui-icon layui-icon-file"></i>鍒犻櫎
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="BtnGX" id="BtnGX">
+                                    <i class="layui-icon layui-icon-file"></i>鏁版嵁鏇存柊
                                 </button>
                             </div>
                         </script>
@@ -260,7 +263,7 @@
             var option = {
                 elem: '#mainTable'
                 , toolbar: '#toolbarDemo'
-                ,height: 'full-50' 
+                ,height: 'full-50'
                 , page: true
                 , limit: 50
                 , limits: [50, 500, 5000, 20000]
@@ -323,7 +326,7 @@
                         if ($("#HInitTimeCycle").val() == 0 && $("#HInitTimeCycle").val() == "") {
                             setSelect_HInitTimeCycle();
                         }
-                    
+
                         if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                             ColFilter();
                         }
@@ -517,7 +520,7 @@
                 //鏍囨敞閫変腑鏍峰紡
                 obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');
             });
- 
+
             //鎵撳嵃
             //form.on('submit(Print)', function (obj) {//閫�鍑�
             //    var checkStatus = table.checkStatus("mainTable"); //鑾峰彇閫変腑琛岀姸鎬�
@@ -584,13 +587,13 @@
                 var checkStatus = table.checkStatus("mainTable"); //鑾峰彇閫変腑琛岀姸鎬�
                 if (checkStatus.data.length == 1) {
                     var HBarCode_Pack = checkStatus.data[0].鍞竴鏉$爜;
-                    layer.open({                //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞� 
+                    layer.open({                //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
                         type: 2                         //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
                         , area: ['100%', '100%']
                         , title: '鐧芥爣鎵撳嵃'  //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
                         , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
                         , shade: 0.6 //閬僵閫忔槑搴�
-                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲                       
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                         , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
                         , content: '../../杞﹂棿绠$悊/浜х嚎/MES_WhiteLabelGeneration.html?OperationType=1&HBarCode_Pack=' + HBarCode_Pack //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
                         , resize: false,  //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
@@ -609,7 +612,7 @@
                 ////var linterid = $("#HInterID").val();
                 ////var linterid = "28973";
                 var Type = "HBarCodePrint";
-                var OpenTmp = "鐧芥爣鎵撳嵃1";
+                var OpenTmp = "鐧芥爣鎵撳嵃15";
                 //var ReportViewer = document.getElementById("ReportViewer");
                 window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
             });
@@ -694,6 +697,33 @@
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
                 }
             });
+
+
+            //鏇存柊
+            form.on('submit(BtnGX)', function (data) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HInterID.toString();
+                    var HRemark = "鏃�";
+                    $.ajax({
+                        url: GetWEBURL1() + '/LEMS/SaveToSc_PackUnionBillSub_Back',
+                        type: "GET",
+                        data: { "HInterID": HInterID, "HRemark": HRemark },
+                        success: function (data1) {
+                            if (data1.count == 1) {
+                                layer.msg(data1.Message);
+                            } else {
+                                layer.alert(data1.code + data1.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+                        }
+                    });
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹洿鏂帮紒');
+                }
+            });
             //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
             function setSelect_HInitTimeCycle() {
                 var valueList = [0, 1, 2, 3, 4, 5, 6, 29]; //valuelist鏁扮粍鍖呭惈涓庢椂闂寸浉鍏崇殑鏁存暟鍊�
@@ -705,7 +735,7 @@
                 }
 
                 $("#HInitTimeCycle").empty();           //浣跨敤jquery鐨別mpty鏂规硶娓呯┖HInitTimeCycle_ArrayList <select>鍏冪礌鐨勫��
-                $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);  //浣跨敤append鏂规硶鏋勫缓涔嬪墠HInitTimeCycle_ArrayList瀛楃涓� 鐨勫唴瀹逛紶鍏InitTimeCycle  
+                $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);  //浣跨敤append鏂规硶鏋勫缓涔嬪墠HInitTimeCycle_ArrayList瀛楃涓� 鐨勫唴瀹逛紶鍏InitTimeCycle
                 form.render('select');       //璋冪敤 閲嶆柊娓叉煋select鍏冪礌
 
                 $("#HInitTimeCycle").val("29");   //浣跨敤jQuery鐨剉al()鏂规硶灏嗕笅鎷夊垪琛ㄧ殑閫変腑鍊艰缃负"29   锛屼笖鏄剧ず銆婅繎涓夋檪澶┿��
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 ad0c5be..a025848 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"
@@ -92,8 +92,8 @@
                                         <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="HUnitName" lay-verify="HUnitName" id="HUnitName" style="background-color:#efefef4d;display: inline-block;" readonly>
-                                                <input type="hidden" name="HUnitID" id="HUnitID" lay-verify="HUnitID" value="0">
+                                                <input type="text" class="layui-input" name="HBadTypeName" lay-verify="HBadTypeName" id="HBadTypeName" style="background-color:#efefef4d;display: inline-block;" readonly>
+                                                <input type="hidden" name="HBadTypeID" id="HBadTypeID" lay-verify="HBadTypeID" value="0">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -560,8 +560,9 @@
                     }
                     //鑾峰彇鏁版嵁
                     $("#HBadReasonID").val(checkStatus.data[0].HItemID);
-                    $("#HBadReasonName").val(checkStatus.data[0].涓嶈壇鍘熷洜鍚嶇О);
-
+                    $("#HBadReasonName").val(checkStatus.data[0].涓嶈壇缂洪櫡鍚嶇О);
+                    $("#HBadTypeName").val(checkStatus.data[0].涓嶈壇绫诲瀷);
+                    $("#HBadTypeID").val(checkStatus.data[0].涓嶈壇绫诲瀷浠g爜);
                     layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                 }
             })
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 a1bbf12..7cc0edf 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"
@@ -789,6 +789,8 @@
                             if (data1.data[0]["HBadReasonID"] != "0") {
                                 $("#HBadReasonID").val(data1.data[0]["HBadReasonID"]);
                                 $("#HBadReasonName").val(data1.data[0]["涓嶈壇鍘熷洜"]);
+                                $("#HBadTypeName").val(data1.data[0]["涓嶈壇绫诲瀷浠g爜"]);
+                                $("#HBadTypeID").val(data1.data[0]["涓嶈壇绫诲瀷"]);
                             } 
                           
                             if (data1.data.length != 0) {
@@ -929,7 +931,9 @@
                         }
 
                         $("#HBadReasonID").val(checkStatus.data[0].HItemID);//鍐呯爜
-                        $("#HBadReasonName").val(checkStatus.data[0].涓嶈壇鍘熷洜鍚嶇О);//鍚嶇О
+                        $("#HBadReasonName").val(checkStatus.data[0].涓嶈壇缂洪櫡鍚嶇О);//鍚嶇О
+                        $("#HBadTypeName").val(checkStatus.data[0].涓嶈壇绫诲瀷);
+                        $("#HBadTypeID").val(checkStatus.data[0].涓嶈壇绫诲瀷浠g爜);
                         get_WriteConfigFile();
                         layer.close(index);//鍏抽棴寮圭獥
                     }
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index 9f7b330..c1d019a 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -251,18 +251,18 @@
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_ShowBill" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_DeleteBill" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_Copy" lay-event="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_Copy_pl" lay-event="set_Copy_pl"><i class="layui-icon layui-icon-form"></i>鎵归噺澶嶅埗</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_Copy" lay-event="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>-->
+                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_Copy_pl" lay-event="set_Copy_pl"><i class="layui-icon layui-icon-form"></i>鎵归噺澶嶅埗</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_cf" lay-event="set_cf"><i class="layui-icon layui-icon-form"></i>鎷嗗垎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Resume" id="set_Resume"><i class="layui-icon layui-icon-form"></i>灞ュ巻鏌ヨ</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Resume" id="set_Resume"><i class="layui-icon layui-icon-form"></i>灞ュ巻鏌ヨ</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_LookDown_StationIn" lay-event="get_LookDown_StationIn"><i class="layui-icon layui-icon-form"></i>涓嬫煡(宸ュ簭杩涚珯鎺ユ敹鍗�)</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_LookDown_StationOut" lay-event="get_LookDown_StationOut"><i class="layui-icon layui-icon-form"></i>涓嬫煡(宸ュ簭鍑虹珯姹囨姤鍗�)</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_LookDown" lay-event="get_LookDown"><i class="layui-icon layui-icon-refresh-3"></i>涓嬫煡</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn_view" lay-event="btn_view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_LookDown" lay-event="get_LookDown"><i class="layui-icon layui-icon-refresh-3"></i>涓嬫煡</button>-->
+                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn_view" lay-event="btn_view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn_print" lay-event="btn_print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn_print_pl" lay-event="btn_print_pl"><i class="layui-icon layui-icon-print"></i>鎵归噺鎵撳嵃(娑ょ憾)</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn_print_pl_YM" lay-event="btn_print_pl_YM"><i class="layui-icon layui-icon-print"></i>鎵归噺鎵撳嵃(缇婃瘺)</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn_print_pl" lay-event="btn_print_pl"><i class="layui-icon layui-icon-print"></i>鎵归噺鎵撳嵃(娑ょ憾)</button>-->
+                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn_print_pl_YM" lay-event="btn_print_pl_YM"><i class="layui-icon layui-icon-print"></i>鎵归噺鎵撳嵃(缇婃瘺)</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="set_CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_AbandonCheck" lay-event="set_AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>鍏抽棴</button>
@@ -271,11 +271,11 @@
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_DeDrop" lay-event="set_DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Refresh" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Exit" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_StationOut" lay-event="set_StationOut"><i class="layui-icon layui-icon-form"></i>宸ュ簭鍑虹珯姹囨姤鍗�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_StationIn" lay-event="get_StationIn"><i class="layui-icon layui-icon-form"></i>宸ュ簭杩涚珯鎺ユ敹鍗�</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_StationOut" lay-event="set_StationOut"><i class="layui-icon layui-icon-form"></i>宸ュ簭鍑虹珯姹囨姤鍗�</button>-->
+                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_StationIn" lay-event="get_StationIn"><i class="layui-icon layui-icon-form"></i>宸ュ簭杩涚珯鎺ユ敹鍗�</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_HideColumn1" lay-event="get_HideColumn1"><i class="layui-icon layui-icon-file-b"></i>鍒楄缃�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_FormChange" lay-event="set_FormChange"><i class="layui-icon layui-icon-file-b"></i>鍗曟嵁鍙樻洿</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_FormChange" lay-event="set_FormChange"><i class="layui-icon layui-icon-file-b"></i>鍗曟嵁鍙樻洿</button>-->
+                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_FirstPieceCheck" id="set_FirstPieceCheck"><i class="layui-icon layui-icon-form"></i>棣栨</button>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_OEEReport_WorkShift.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_OEEReport_WorkShift.html"
index e29b4f5..a4ee078 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_OEEReport_WorkShift.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_OEEReport_WorkShift.html"
@@ -47,21 +47,21 @@
                                         <input type="text" class="layui-input" name="HEquipFileType" id="HEquipFileType">
                                     </div>
                                 </div>
-                                <!--<div class="layui-inline">
+                                <div class="layui-inline">
                                     <label class="layui-form-label">妫�绱㈡ā寮�</label>
                                     <div class="layui-input-block">
                                         <select name="HSearchModel" id="HSearchModel" class="ForFilteringSchemes" lay-filter="HSearchModel" style="width:190px;">
                                         </select>
                                     </div>
-                                </div>-->
-                                <!--<div class="layui-inline">
+                                </div>
+                                <div class="layui-inline">
                                     <label class="layui-form-label">骞�</label>
                                     <div class="layui-input-block">
                                         <select name="HYear" id="HYear" class="ForFilteringSchemes" lay-filter="HYear" style="width:80px;">
                                         </select>
                                     </div>
-                                </div>-->
-                                <!--<div class="layui-inline">
+                                </div>
+                                <div class="layui-inline">
                                     <label class="layui-form-label">寮�濮嬫椂闂�</label>
                                     <div class="layui-input-block">
                                         <select name="HBeginMonth" id="HBeginMonth" class="ForFilteringSchemes" lay-filter="HBeginMonth" style="width:80px;">
@@ -75,20 +75,20 @@
                                         </select>
                                     </div>
                                 </div>
-                                <div class="layui-inline">
-                                    <label class="layui-form-label">寮�濮嬫椂闂�</label>
-                                    <div class="layui-input-block">
-                                        <select name="HBeginWeek" id="HBeginWeek" class="ForFilteringSchemes" lay-filter="HBeginWeek" style="width:80px;">
-                                        </select>
-                                    </div>
-                                </div>
-                                <div class="layui-inline">
-                                    <label class="layui-form-label">缁撴潫鏃堕棿</label>
-                                    <div class="layui-input-block">
-                                        <select name="HEndWeek" id="HEndWeek" class="ForFilteringSchemes" lay-filter="HEndWeek" style="width:80px;">
-                                        </select>
-                                    </div>
-                                </div>-->
+                                <!--<div class="layui-inline">
+        <label class="layui-form-label">寮�濮嬫椂闂�</label>
+        <div class="layui-input-block">
+            <select name="HBeginWeek" id="HBeginWeek" class="ForFilteringSchemes" lay-filter="HBeginWeek" style="width:80px;">
+            </select>
+        </div>
+    </div>
+    <div class="layui-inline">
+        <label class="layui-form-label">缁撴潫鏃堕棿</label>
+        <div class="layui-input-block">
+            <select name="HEndWeek" id="HEndWeek" class="ForFilteringSchemes" lay-filter="HEndWeek" style="width:80px;">
+            </select>
+        </div>
+    </div>-->
                                 <div class="layui-inline">
                                     <label class="layui-form-label">寮�濮嬫椂闂�</label>
                                     <div class="layui-input-block">
@@ -106,6 +106,12 @@
                                     <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-inline">
+                                    <label class="layui-form-label" style="width: 85px;">缁煎悎OEE1</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="OEE1" id="OEE1" readonly>
+                                    </div>
+                                </div>
                                 <div class="layui-inline">
                                     <label class="layui-form-label" style="width: 85px;">缁煎悎OEE</label>
                                     <div class="layui-input-block" style="margin-left: 120px;">
@@ -223,9 +229,9 @@
             //#endregion
 
             //#region 妫�绱㈡ā寮忎笅鎷夊垪琛ㄧ洃鍚�
-            //form.on('select(HSearchModel)', function (data) {
-            //    changeInput_BySearchModel();
-            //});
+            form.on('select(HSearchModel)', function (data) {
+                changeInput_BySearchModel();
+            });
             //#endregion
 
 
@@ -234,7 +240,7 @@
             //#region 鍒濆鍖栫晫闈�
             function set_ClearBill() {
                 //鍒濆鍖栦笅鎷夊垪琛�
-                //setInit_SelectElement();
+                setInit_SelectElement();
                 $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
                 $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));  //缁撴潫鏃ユ湡
                 //鍒濆鍖栬〃鏍�
@@ -305,20 +311,28 @@
 
 
                             //璁$畻缁煎悎OEE
+                            var OEE1 = 0;
                             var OEE = 0;
                             var num = 0;
+                            var num1 = 0;
                             for (var i = 0; i < data1.data.length; i++) {
+                                if (data1.data[i].OEE1.replace("%", "") * 1 != 0) {
+                                    OEE1 += data1.data[i].OEE1.replace("%", "") * 1;
+                                    num1 += 1;
+                                }
                                 if (data1.data[i].OEE.replace("%", "") * 1 != 0) {
                                     OEE += data1.data[i].OEE.replace("%", "") * 1;
                                     num += 1;
                                 }
-
                             }
                             if (data1.data.length > 0) {
-                                OEE = OEE / num + "%"
+                                OEE1 = (OEE1 / num1).toFixed(2) + "%";
+                                OEE = (OEE / num).toFixed(2) + "%";
                             } else {
+                                OEE1 += "%";
                                 OEE += "%";
                             }
+                            $("#OEE1").val(OEE1);
                             $("#OEE").val(OEE);
 
                             //鍒锋柊鎸夐挳鏄剧ず
@@ -350,29 +364,29 @@
                 var HDeptName = $("#HDeptName").val();               //杞﹂棿
                 var HEqiupFileNumber = $("#HEquipFileNumber").val();//璁惧缂栫爜
                 var HEquipFileType = $("#HEquipFileType").val();//璁惧绫诲瀷
-                //var HSearchModel = $("#HSearchModel").val();
-                //var HYear = $("#HYear").val();
+                var HSearchModel = $("#HSearchModel").val();
+                var HYear = $("#HYear").val();
                 var HBeginMonth = $("#HBeginMonth").val();
                 var HEndMonth = $("#HEndMonth").val();
-                var HBeginWeek = $("#HBeginWeek").val();
-                var HEndWeek = $("#HEndWeek").val();
+                //var HBeginWeek = $("#HBeginWeek").val();
+                //var HEndWeek = $("#HEndWeek").val();
                 var HBeginDate = $("#HBeginDate").val();
                 var HEndDate = $("#HEndDate").val();
 
-                sWhere = " '" + HEqiupFileNumber + "','" + HEquipFileType + "','" + HDeptName + "'," + 2024 + ",'" + HBeginDate + "','" + HEndDate + "'";
+                sWhere = " " + HSearchModel + ",'" + HEqiupFileNumber + "','" + HEquipFileType + "','" + HDeptName + "'," + HYear + " ";
 
-                //if (HSearchModel == 1) {
-                //    sWhere += ",'" + "" + "','" + "" + "'";
-                //}
-                //else if (HSearchModel == 2) {
-                //    sWhere += ",'" + HBeginMonth + "','" + HEndMonth + "'";
-                //}
-                //else if (HSearchModel == 3) {
-                //    sWhere += ",'" + HBeginWeek + "','" + HEndWeek + "'";
-                //}
-                //else if (HSearchModel == 4) {
-                //    sWhere += ",'" + HBeginDate + "','" + HEndDate + "'";
-                //}
+                if (HSearchModel == 1) {
+                    sWhere += ",'" + "" + "','" + "" + "'";
+                }
+                else if (HSearchModel == 2) {
+                    sWhere += ",'" + HBeginMonth + "','" + HEndMonth + "'";
+                }
+                else if (HSearchModel == 3) {
+                    sWhere += ",'" + HBeginDate + "','" + HEndDate + "'";
+                }
+                else if (HSearchModel == 4) {
+                    sWhere += ",'" + HBeginDate + "','" + HEndDate + "'";
+                }
 
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -398,7 +412,7 @@
                 form.render('select');
 
                 //鍒濆鍖栦笅鎷夊垪琛�
-                //setInit_SelectElement();
+                setInit_SelectElement();
 
                 sWhere = "";
             }
@@ -459,13 +473,13 @@
                 //var HMainID = datas.hmainid;
                 //var HMainID = 3382;
                 var HSourceCode = obj.璁惧缂栫爜;
-                var HDate = obj.鏃ユ湡;
-                var HType = "";
+                var HDate = obj.鐝;
+                var HSearchModel = $("#HSearchModel").val();
                 var wait = layer.load();
                 $.ajax({
                     url: GetWEBURL() + '/Sc_OEEReport/getSc_OEEReportDetailist_WorkShift',
                     type: "GET",
-                    data: { "HSourceCode": HSourceCode, "HDate": HDate, "HType": HType, "user": sessionStorage["HUserName"]},
+                    data: { "HSourceCode": HSourceCode, "HDate": HDate, "HType": HSearchModel, "user": sessionStorage["HUserName"]},
                     async: false,
                     success: function (data1) {
                         if (data1.count == 1) {
@@ -652,11 +666,11 @@
                     var element_HEndMonth = document.getElementById("HEndMonth").parentElement.parentElement;
                     element_HEndMonth.style = "display:none;"
 
-                    var element_HBeginWeek = document.getElementById("HBeginWeek").parentElement.parentElement;
-                    element_HBeginWeek.style = "display:none;"
+                    //var element_HBeginWeek = document.getElementById("HBeginWeek").parentElement.parentElement;
+                    //element_HBeginWeek.style = "display:none;"
 
-                    var element_HEndWeek = document.getElementById("HEndWeek").parentElement.parentElement;
-                    element_HEndWeek.style = "display:none;"
+                    //var element_HEndWeek = document.getElementById("HEndWeek").parentElement.parentElement;
+                    //element_HEndWeek.style = "display:none;"
 
                     var element_HBeginDate = document.getElementById("HBeginDate").parentElement.parentElement;
                     element_HBeginDate.style = "display:none;"
@@ -677,11 +691,11 @@
                     var element_HEndMonth = document.getElementById("HEndMonth").parentElement.parentElement;
                     element_HEndMonth.style = ""
 
-                    var element_HBeginWeek = document.getElementById("HBeginWeek").parentElement.parentElement;
-                    element_HBeginWeek.style = "display:none;"
+                    //var element_HBeginWeek = document.getElementById("HBeginWeek").parentElement.parentElement;
+                    //element_HBeginWeek.style = "display:none;"
 
-                    var element_HEndWeek = document.getElementById("HEndWeek").parentElement.parentElement;
-                    element_HEndWeek.style = "display:none;"
+                    //var element_HEndWeek = document.getElementById("HEndWeek").parentElement.parentElement;
+                    //element_HEndWeek.style = "display:none;"
 
                     var element_HBeginDate = document.getElementById("HBeginDate").parentElement.parentElement;
                     element_HBeginDate.style = "display:none;"
@@ -693,32 +707,7 @@
                     //get_FastQuery();
                 }
                 else if (HSearchModel == 3) {
-                    var element_HYear = document.getElementById("HYear").parentElement.parentElement;
-                    element_HYear.style = ""
-
-                    var element_HBeginMonth = document.getElementById("HBeginMonth").parentElement.parentElement;
-                    element_HBeginMonth.style = "display:none;"
-
-                    var element_HEndMonth = document.getElementById("HEndMonth").parentElement.parentElement;
-                    element_HEndMonth.style = "display:none;"
-
-                    var element_HBeginWeek = document.getElementById("HBeginWeek").parentElement.parentElement;
-                    element_HBeginWeek.style = ""
-
-                    var element_HEndWeek = document.getElementById("HEndWeek").parentElement.parentElement;
-                    element_HEndWeek.style = ""
-
-                    var element_HBeginDate = document.getElementById("HBeginDate").parentElement.parentElement;
-                    element_HBeginDate.style = "display:none;"
-
-                    var element_HEndDate = document.getElementById("HEndDate").parentElement.parentElement;
-                    element_HEndDate.style = "display:none;"
-
-                    //鎵ц鏌ヨ鏂规硶
-                    //get_FastQuery();
-                }
-                else if (HSearchModel == 4) {
-                    var element_HYear = document.getElementById("HYear").parentElement.parentElement;
+                   var element_HYear = document.getElementById("HYear").parentElement.parentElement;
                     element_HYear.style = "display:none;"
 
                     var element_HBeginMonth = document.getElementById("HBeginMonth").parentElement.parentElement;
@@ -727,11 +716,11 @@
                     var element_HEndMonth = document.getElementById("HEndMonth").parentElement.parentElement;
                     element_HEndMonth.style = "display:none;"
 
-                    var element_HBeginWeek = document.getElementById("HBeginWeek").parentElement.parentElement;
-                    element_HBeginWeek.style = "display:none;"
+                    //var element_HBeginWeek = document.getElementById("HBeginWeek").parentElement.parentElement;
+                    //element_HBeginWeek.style = "display:none;"
 
-                    var element_HEndWeek = document.getElementById("HEndWeek").parentElement.parentElement;
-                    element_HEndWeek.style = "display:none;"
+                    //var element_HEndWeek = document.getElementById("HEndWeek").parentElement.parentElement;
+                    //element_HEndWeek.style = "display:none;"
 
                     var element_HBeginDate = document.getElementById("HBeginDate").parentElement.parentElement;
                     element_HBeginDate.style = ""
@@ -741,7 +730,30 @@
 
                     //鎵ц鏌ヨ鏂规硶
                     //get_FastQuery();
+                } else if (HSearchModel == 4) {
+
+                   var element_HYear = document.getElementById("HYear").parentElement.parentElement;
+                    element_HYear.style = "display:none;"
+
+                    var element_HBeginMonth = document.getElementById("HBeginMonth").parentElement.parentElement;
+                    element_HBeginMonth.style = "display:none;"
+
+                    var element_HEndMonth = document.getElementById("HEndMonth").parentElement.parentElement;
+                    element_HEndMonth.style = "display:none;"
+
+                    //var element_HBeginWeek = document.getElementById("HBeginWeek").parentElement.parentElement;
+                    //element_HBeginWeek.style = "display:none;"
+
+                    //var element_HEndWeek = document.getElementById("HEndWeek").parentElement.parentElement;
+                    //element_HEndWeek.style = "display:none;"
+
+                    var element_HBeginDate = document.getElementById("HBeginDate").parentElement.parentElement;
+                    element_HBeginDate.style = ""
+
+                    var element_HEndDate = document.getElementById("HEndDate").parentElement.parentElement;
+                    element_HEndDate.style = ""
                 }
+
             }
             //#endregion
 
@@ -754,7 +766,7 @@
                 //妫�绱㈡ā寮�
                 var HSearchModel = 4;
                 valueList = [1,2,3,4];
-                titleList = ['骞�','鏈�','鍛�','鏃�'];
+                titleList = ['骞�', '鏈�', '鏃�', '鐝'];
                 ArrayList = '';
                 for (var i = 0; i < valueList.length; i++) {
                     ArrayList += '<option  style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';

--
Gitblit v1.9.1