From c577cccc71e019cc2a7c64300bc9c3eaacca3fd2 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 16 十一月 2023 11:08:52 +0800
Subject: [PATCH] 1

---
 WebTM/views/设备管理/Sb_EquipRepairCheckBillList_PDA.html    |  458 +++++
 WebTM/views/基础资料/基础资料/Gy_RepairCheckList_PDA.html        |  607 +++++++
 WebTM/views/生产管理/作业指导书/Gy_SOPBill_Video.html             |  130 -
 WebTM/views/设备管理/Sb_EqpMaintenanceBillList_PDA.html      |   44 
 WebTM/views/IpadIndex.html                               |   42 
 WebTM/views/index_Mobile.html                            |   82 
 WebTM/views/设备管理/Sb_EquipDotCheckBill_PDA.html           |    7 
 WebTM/views/设备管理/Sb_EquipDotCheckBillList_PDA.html       |   46 
 WebTM/views/设备管理/Sb_EquipRepairCheckBill_PDA.html        |  927 +++++++++++
 WebTM/views/设备管理/Sb_EquipMaintainBillList_PDA.html       |   43 
 WebTM/views/设备管理/设备规程单/Sb_EquipDotCheckRuleList_PDA.html |  631 +++++++
 WebTM/views/设备管理/Sb_EquipConkBookBill_PDA.html           |  882 ++++++++++
 WebTM/views/基础资料/公用基础资料/Gy_ConkTypeList_PDA.html         |  520 ++++++
 WebTM/views/设备管理/Sb_EquipDotCheckBillEdit.html           |    1 
 WebTM/views/设备管理/Sb_EquipMaintainBill_PDA.html           |    7 
 WebTM/views/设备管理/Sb_EqpMaintenanceBill_PDA.html          |    4 
 WebTM/views/设备管理/Sb_EquipConkBookBillList_PDA.html       |  446 +++++
 WebTM/views/PublicPage/DeptInformation_PDA.html          |    2 
 WebTM/WebTM.csproj                                       |    7 
 19 files changed, 4,726 insertions(+), 160 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 594745b..6d6429a 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -244,6 +244,7 @@
     <Content Include="views\鍝佽川绠$悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBill.html" />
     <Content Include="views\鍝佽川绠$悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBillList.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_TemporaryArea.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_ConkTypeList_PDA.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterType.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterTypeEdit.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_TemporaryArea.html" />
@@ -262,6 +263,7 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Xs_ExceptiveCheckRequestBillList.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Xs_SeOrderBill.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Xs_SeOrderChangeBillList.aspx" />
+    <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckList_PDA.html" />
     <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcCommPrice.html" />
     <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcCommPriceList.html" />
     <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_BadType.html" />
@@ -311,10 +313,15 @@
     <Content Include="views\璁″垝绠$悊\宸ヨ壓璺嚎\Gy_RoutingBillSubList.html" />
     <Content Include="views\璁惧绠$悊\Sb_EqpMaintenanceBillList_PDA.html" />
     <Content Include="views\璁惧绠$悊\Sb_EqpMaintenanceBill_PDA.html" />
+    <Content Include="views\璁惧绠$悊\Sb_EquipConkBookBillList_PDA.html" />
+    <Content Include="views\璁惧绠$悊\Sb_EquipConkBookBill_PDA.html" />
     <Content Include="views\璁惧绠$悊\Sb_EquipDotCheckBillList_PDA.html" />
     <Content Include="views\璁惧绠$悊\Sb_EquipDotCheckBill_PDA.html" />
     <Content Include="views\璁惧绠$悊\Sb_EquipMaintainBillList_PDA.html" />
     <Content Include="views\璁惧绠$悊\Sb_EquipMaintainBill_PDA.html" />
+    <Content Include="views\璁惧绠$悊\Sb_EquipRepairCheckBillList_PDA.html" />
+    <Content Include="views\璁惧绠$悊\Sb_EquipRepairCheckBill_PDA.html" />
+    <Content Include="views\璁惧绠$悊\璁惧瑙勭▼鍗昞Sb_EquipDotCheckRuleList_PDA.html" />
     <Content Include="views\璐ㄩ噺绠$悊\宸ュ簭妫�楠屽崟\MES_ProcessCheckBillList_PDA.html" />
     <Content Include="views\璐ㄩ噺绠$悊\宸ュ簭妫�楠屽崟\MES_ProcessCheckBill_PDA.html" />
     <Content Include="views\杞﹂棿绠$悊\鍗曞搧杩囩珯\Cj_CollectionOfSingleProductDefects.html" />
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index bdbc716..90019a2 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -37,6 +37,7 @@
         var HICMOEntryID = "";     //鐢熶骇璁㈠崟瀛愬唴鐮�
         var HICMOBillNo = "";      //浠诲姟鍗曞彿
         var HMaterName = "";      //浜у搧鍚嶇О
+        var HMaterID = 0;          //浜у搧ID
         //娉ㄦ剰锛氶�夐」鍗� 渚濊禆 element 妯″潡锛屽惁鍒欐棤娉曡繘琛屽姛鑳芥�ф搷浣�
         layui.config({
             base: '../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -178,9 +179,10 @@
 
 
                                 html1 += '<h1><span>宸ュ崟鍙凤細</span><span id="wk' + (i + 1) + '">' + LoadData1[i].HICMOBillNo + '</span></h1>';
+                                html1 += '<h1 style="display:none;"><span>浜у搧ID锛�</span><span id="materid' + (i + 1) + '">' + LoadData1[i].HMaterID + '</span></h1>';
                                 html1 += '<h1><span>浜у搧鍚嶇О锛�</span><span id="ptn' + (i + 1) + '">' + LoadData1[i].HMaterName + '</span></h1>';
                                 html1 += '<h1><span>浜у搧鍨嬪彿锛�</span><span id="pts' + (i + 1) + '">' + LoadData1[i].HModel + '</span></h1>';
-                                html1 += '<h1><span>璁″垝鏁伴噺锛�</span><span>' + LoadData1[i].HDatePlanQty + '</span><span style="margin-left:20px;">姹囨姤鎬绘暟锛�</span><span>' + LoadData1[i].HDateFinishQty+'</span></h1>';
+                                html1 += '<h1><span>璁″垝鏁伴噺锛�</span><span>' + LoadData1[i].HDatePlanQty + '</span><span style="margin-left:20px;">姹囨姤鎬绘暟锛�</span><span>' + LoadData1[i].HDateFinishQty + '</span></h1>';
                                 switch (LoadData1[i].HICMOStatus) {
                                     case "寰呯敓浜�":
                                         html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border3"></span><span>' + LoadData1[i].HICMOStatus + '</span></h1>';
@@ -378,7 +380,7 @@
             HICMOInterID = $("#df" + i + "").html();     //鐢熶骇璁㈠崟涓诲唴鐮�
             HICMOEntryID = $("#ds" + i + "").html();     //鐢熶骇璁㈠崟瀛愬唴鐮�
             HMaterName = $("#ptn" + i + "").html();     //浜у搧鍚嶇О
-
+            HMaterID = $("#materid" + i + "").html();     //浜у搧ID
 
             if (workcode != "" && workcode != null) {
                 $('.cns').removeClass('check1');  //鍒犻櫎涓嶅悓鐖剁骇clss鏍峰紡鐩稿悓鐨勬墍鏈夊厓绱�
@@ -588,9 +590,9 @@
                 layer.alert("鍗曟嵁鐘舵�佷笉婊¤冻寮�宸ユ潯浠�!", { icon: 5 });
                 return false;
             }
-           var indexOpen= layer.open({
+            var indexOpen = layer.open({
                 type: 1
-                , title: "纭寮�宸ュ悧?" 
+                , title: "纭寮�宸ュ悧?"
                 , closeBtn: false
                 , area: '300px;'
                 , shade: 0.8
@@ -598,7 +600,7 @@
                 , btn: ['纭畾', '鍙栨秷']
                 , btnAlign: 'c'
                 , moveType: 1 //鎷栨嫿妯″紡锛�0鎴栬��1
-                , content: '<div style="padding: 50px; line-height: 22px; font-weight: 300;text-align:center;">璁惧缂栧彿:' + HSourceName1 + '<br>宸ュ崟鍙�:' + workcode + '<br>浜у搧鍚嶇О:' + HMaterName+'<br></div>'
+                , content: '<div style="padding: 50px; line-height: 22px; font-weight: 300;text-align:center;">璁惧缂栧彿:' + HSourceName1 + '<br>宸ュ崟鍙�:' + workcode + '<br>浜у搧鍚嶇О:' + HMaterName + '<br></div>'
                 , btn1: function (index, layero, e) {
 
                     //鏂板寮�宸ュ崟
@@ -626,6 +628,30 @@
                     });
                 }
             });
+        }
+
+        //SOP 浣滀笟鎸囧涔�
+        function SOP(event, obj) {
+            if (wktag == 0) {
+                layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
+                return false;
+            }
+
+            layer.open({
+                type: 2,
+                skin: 'layui-layer-rim', //鍔犱笂杈规
+                title: '浣滀笟鎸囧涔�',
+                closeBtn: 1,
+                shift: 2,
+                area: ['80%', '80%'],
+                maxmin: true,
+                content: '../../../views/鐢熶骇绠$悊/浣滀笟鎸囧涔�/Gy_SOPBill_Video.html?OperationType=5&HMaterID=' + HMaterID + '&HSourceNo=' + workcode + '&HSourceEntryID=' + HSourceEntryID,
+                end: function () {
+
+                },               
+            });
+
+           /* window.open("../../../views/鐢熶骇绠$悊/浣滀笟鎸囧涔�/Gy_SOPBill_Video.html?OperationType=5&HMaterID=" + HMaterID + "&HSourceNo=" + workcode + "&HSourceEntryID=" + HSourceEntryID);*/
         }
 
         //姹囨姤鎸夐挳鐐瑰嚮浜嬩欢
@@ -1040,6 +1066,12 @@
                                     <span class="imgtitle">蹇�熷紑宸�</span>
                                 </div>
                             </div>
+                            <div class="layui-col-sm12 layui-col-md4" onclick="SOP(event,this)">
+                                <div class="cnt bottomright">
+                                    <span class="layui-icon layui-icon-pause imgicon"></span>
+                                    <span class="imgtitle">浣滀笟鎸囧涔�</span>
+                                </div>
+                            </div>
                         </div>
                         <div class="layui-row layui-col-space10">
                             <div class="layui-col-sm12 layui-col-md4" onclick="OpenFistCheck(event,this)">
diff --git a/WebTM/views/PublicPage/DeptInformation_PDA.html b/WebTM/views/PublicPage/DeptInformation_PDA.html
index 12c6618..629dc58 100644
--- a/WebTM/views/PublicPage/DeptInformation_PDA.html
+++ b/WebTM/views/PublicPage/DeptInformation_PDA.html
@@ -34,7 +34,7 @@
                                         <div class="layui-col-xs3 layui-inline" style="width: 23%;display:none;">
                                             <div id="treeDepartment" lay-filter="treeDepartment" class="demo-tree demo-tree-box" style="height: 580px; overflow: scroll;"></div>
                                         </div>
-                                        <div>
+                                        <div style="margin-top:5px;margin-bottom:5px;">
                                             <div class="layui-inline" style="margin-left:5px;">
                                                 <label style="width: 28px;">浠g爜</label>
 
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index 2fa5916..5da5b80 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -552,15 +552,63 @@
                   </a>
                   <dl class="layui-nav-child">
                       <dd>
-                          <a lay-href="璁惧绠$悊/Sb_EquipDotCheckBill_PDA.html" style="color: aqua;">
+                          <a href="璁惧绠$悊/Sb_EquipDotCheckBill_PDA.html" target="main_self_frame"  style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               璁惧鐐规璁板綍鍗�
                           </a>
                       </dd>
                        <dd>
-                          <a lay-href="璁惧绠$悊/Sb_EquipDotCheckBillList_PDA.html" style="color: aqua;">
+                          <a href="璁惧绠$悊/Sb_EquipDotCheckBillList_PDA.html" target="main_self_frame"  style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               璁惧鐐规璁板綍鍗曞垪琛�
+                          </a>
+                      </dd>
+                      <dd>
+                          <a href="璁惧绠$悊/Sb_EquipMaintainBill_PDA.html" target="main_self_frame"  style="color: aqua;">
+                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                              璁惧淇濆吇璁板綍鍗�
+                          </a>
+                      </dd>
+                       <dd>
+                          <a href="璁惧绠$悊/Sb_EquipMaintainBillList_PDA.html" target="main_self_frame"  style="color: aqua;">
+                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                              璁惧淇濆吇璁板綍鍗曞垪琛�
+                          </a>
+                      </dd>
+                      <dd>
+                          <a href="璁惧绠$悊/Sb_EqpMaintenanceBill_PDA.html" target="main_self_frame"  style="color: aqua;">
+                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                              璁惧缁翠慨璁板綍鍗�
+                          </a>
+                      </dd>
+                      <dd>
+                          <a href="璁惧绠$悊/Sb_EqpMaintenanceBillList_PDA.html" target="main_self_frame"  style="color: aqua;">
+                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                              璁惧缁翠慨璁板綍鍗曞垪琛�
+                          </a>
+                      </dd>
+                       <dd>
+                          <a href="璁惧绠$悊/Sb_EquipConkBookBill_PDA.html" target="main_self_frame"  style="color: aqua;">
+                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                              璁惧鏁呴殰鐧昏鍗�
+                          </a>
+                      </dd>
+                      <dd>
+                          <a href="璁惧绠$悊/Sb_EquipConkBookBillList_PDA.html" target="main_self_frame"  style="color: aqua;">
+                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                              璁惧鏁呴殰鐧昏鍗曞垪琛�
+                          </a>
+                      </dd>
+                       <dd>
+                          <a href="璁惧绠$悊/Sb_EquipRepairCheckBill_PDA.html" target="main_self_frame"  style="color: aqua;">
+                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                              璁惧缁翠慨楠屾敹鍗�
+                          </a>
+                      </dd>
+                       <dd>
+                          <a href="璁惧绠$悊/Sb_EquipRepairCheckBillList_PDA.html" target="main_self_frame"  style="color: aqua;">
+                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                              璁惧缁翠慨楠屾敹鍗曞垪琛�
                           </a>
                       </dd>
                       <!--<dd>
@@ -569,18 +617,6 @@
                               璁惧鐐规璁板綍鍗昈LD
                           </a>
                       </dd>-->
-                      <dd>
-                          <a lay-href="璁惧绠$悊/Sb_EquipMaintainBill_PDA.html" style="color: aqua;">
-                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                              璁惧淇濆吇璁板綍鍗�
-                          </a>
-                      </dd>
-                       <dd>
-                          <a lay-href="璁惧绠$悊/Sb_EquipMaintainBillList_PDA.html" style="color: aqua;">
-                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                              璁惧淇濆吇璁板綍鍗曞垪琛�
-                          </a>
-                      </dd>
                       <!--<dd>
                           <a lay-href="璁惧绠$悊/Sb_EquipMaintainBillList_PDA.html" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
@@ -593,24 +629,6 @@
                               璁惧淇濆吇璁板綍鍗昣Mul
                           </a>
                       </dd>-->
-                      <dd>
-                          <a lay-href="璁惧绠$悊/Sb_EqpMaintenanceBill_PDA.html" style="color: aqua;">
-                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                              璁惧缁翠慨璁板綍鍗�
-                          </a>
-                      </dd>
-                      <dd>
-                          <a lay-href="璁惧绠$悊/Sb_EqpMaintenanceBillList_PDA.html" style="color: aqua;">
-                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                              璁惧缁翠慨璁板綍鍗曞垪琛�
-                          </a>
-                      </dd>
-                       <dd>
-                          <a lay-href="璁惧绠$悊/Sb_EqpMaintenanceBillList_PDA.html" style="color: aqua;">
-                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                              璁惧鏁呴殰鐧昏鍗�
-                          </a>
-                      </dd>
                       <!--<dd>
                           <a lay-href="璁惧绠$悊/Sb_EqpMaintenanceBillList_PDA_OLD.html" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkTypeList_PDA.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkTypeList_PDA.html"
new file mode 100644
index 0000000..c954f3b
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkTypeList_PDA.html"
@@ -0,0 +1,520 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鏁呴殰绫诲埆</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div style="margin-top:5px;margin-bottom:5px;">
+                                    <div class="layui-inline" style="margin-left:5px;">
+                                        <label style="width: 28px;">浠g爜</label>
+
+                                        <input type="text" name="HNumber" id="HNumber" style="width:75px">
+
+                                        <label style="width: 28px;">鍚嶇О</label>
+
+                                        <input type="text" name="HName" id="HName" style="width:75px">
+                                        <button type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                        </button>
+                                    </div>
+                                    <div style="margin-top:5px;">
+                                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                                    </div>
+                                </div>                                                                                   
+                            </div>
+                        </div>
+                        
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>-->
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh"></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="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            //#region 鍏敤鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+            var sWhere = "";
+            var option = [];
+            var Organization = sessionStorage["Organization"]
+            var HModName = "Gy_ConkType";
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["hitemid","hparentid"];
+            //#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_DeleteBill': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': parent.layui.admin.events.closeThisTabs();
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumn();
+                        break;
+                };
+            });
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                form.render('select');
+
+                sWhere = "";
+                //$("#btnSearch").click();
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            //#endregion
+
+            //#endregion
+
+            //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , limits: [50, 500, 5000, 50000]
+                    , limit: 50
+                    , cellMinWidth: 90
+                    //, cols: [[
+                    //    { type: 'checkbox', fixed: 'left' }
+                    //    , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+                    //    , { field: '鏁呴殰绫诲埆浠g爜', title: '鏁呴殰绫诲埆浠g爜' }
+                    //    , { field: '鏁呴殰绫诲埆', title: '鏁呴殰绫诲埆鍚嶇О' }
+                    //    , { field: 'hlevel', title: '绛夌骇' }
+                    //    , { field: '澶囨敞', title: '澶囨敞' }
+                    //]]
+                };
+            }
+            //#endregion
+
+
+
+            //#region 鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+                    url: GetWEBURL() + '/Gy_ConkType/list',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left' });
+                            for (var i = 0; i < data.length; i++) {
+                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            option = {
+                                elem: '#mainTable'
+                                //, toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 'full-80'
+                                , page: true
+                                , limits: [50, 500, 5000, 50000]
+                                , limit: 50
+                                , cellMinWidth: 90
+                            }
+                            table.render(option);
+
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+
+                            layer.close(ajaxLoad);
+
+                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                                ColFilter();
+                            }
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery() {
+                var HNumber = $("#HNumber").val();
+                var HName = $("#HName").val();
+                //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 (HNumber) {
+                    sWhere += " and 鏁呴殰绫诲埆浠g爜 like '%" + HNumber + "%'";
+                }
+                if (HName) {
+                    sWhere += " and 鏁呴殰绫诲埆 like '%" + HName + "%'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+
+            //#region 鍒锋柊閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                sWhere = "";
+            }
+            //#endregion
+
+
+            //#region 鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '鏁呴殰绫诲埆鍒楄〃-鏂板'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_ConkType.html?OperationType=1&linterid=&HSouceBillType='
+                })
+            }
+            //#endregion
+
+            //#region 缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].hitemid.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '鏁呴殰绫诲埆鍒楄〃-缂栬緫'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_ConkType.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var ItemID = data[0].hitemid.toString();
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        //閫昏緫鍒犻櫎鏂规硶
+                        $.ajax({
+                            url: GetWEBURL() + 'DeltetGy_ConkType',
+                            type: "GET",
+                            data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(wait);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                set_ClearQuery();
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //#region 闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                var contentUrl = "";
+                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+                var urlLen = urlStr.split('/');
+                for (var i = 0; i < urlLen.length - 4; i++) {
+                    contentUrl += "../";
+                }
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: [contentUrl, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+            //#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", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 2; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                //if (data1.data[0].HColumnWidth != 0) {
+                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                                //} else {
+                                //    option.cols[0][i + 1]["width"] = "";
+                                //}
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                        } else {
+                            table.render(option);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#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);
+                form.render('select');
+            }
+            //#endregion
+
+            //#endregion
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+
+
+    </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairCheckList_PDA.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairCheckList_PDA.html"
new file mode 100644
index 0000000..6333f70
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairCheckList_PDA.html"
@@ -0,0 +1,607 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>缁翠慨楠屾敹椤圭洰鍒楄〃</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/treeTable.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/layui/lay/modules/util.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <style media="screen">
+        .custom-tree-item-clicked {
+            color: #FC9003
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div style="margin-top:5px;margin-bottom:5px;">
+                                    <div class="layui-inline" style="margin-left:5px;">
+                                        <label style="width: 28px;">浠g爜</label>
+
+                                        <input type="text" name="HNumber" id="HNumber" style="width:75px">
+
+                                        <label style="width: 28px;">鍚嶇О</label>
+
+                                        <input type="text" name="HName" id="HName" style="width:75px">
+                                        <button type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                        </button>
+                                    </div>
+                                    <div style="margin-top:5px;">
+                                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+
+        var TagId = "";
+        var TagParentId = "";
+        var Level = "1";
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , util = layui.util
+                , tree = layui.tree
+            //鏌ヨ鏉′欢
+            var sWhere = "";
+            var option = [];
+            var HModName = "Gy_RepairCheckList";
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["hitemid","hparentid"];
+            //#endregion
+
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+            //鍒濆鍖栬〃鏍�
+            set_ClearBill();
+            //#endregion
+
+
+            //#region 澶村伐鍏锋爮浜嬩欢
+
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //鏂板
+                    case 'set_AddNew': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'set_ShowBill': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'set_DeleteBill': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //娴忚
+                    case 'btn-view':
+                        get_ViewReport();
+                        break;
+                    //瀹℃牳
+                    case 'btn-Audit': set_AuditBill();
+                        break;
+                    //鍙嶅鏍�
+                    case 'btn-DeAudit': set_DeAuditBill();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumn();
+                        break;
+                };
+            });
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            //#endregion
+            //鍒濆鍖栬〃鏍�
+
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+
+            //#region鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , limits: [50, 500, 5000, 50000]
+                    , limit: 50
+                    , cellMinWidth: 90
+                    //, cols: [[
+                    //    { type: 'checkbox', fixed: 'left' }
+                    //    , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+                    //    , { field: 'HNumber', title: '淇濆吇椤圭洰浠g爜', width: 200 }
+                    //    , { field: 'HName', title: '淇濆吇椤圭洰鍚嶇О', width: 200 }
+                    //    , { field: 'HLevel', title: '绛夌骇', width: 200 }
+                    //    , { field: 'HEndFlag', title: '鏄庣粏鏍囪', width: 200 }
+                    //    , { field: 'HStopFlag', title: '绂佺敤鏍囪', width: 200 }
+                    //    , { field: 'HRemark', title: '澶囨敞', width: 200 }
+                    //    , { field: 'HUseFlag', title: '浣跨敤鏍囪', width: 200 }
+                    //]]
+                };
+            }
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_RepairCheck/GetRepairCheckList',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left' });
+                            for (var i = 0; i < data.length; i++) {
+                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            option = {
+                                elem: '#mainTable'
+                                , toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 'full-80'
+                                , page: true
+                                , limits: [50, 500, 5000, 50000]
+                                , limit: 50
+                                , cellMinWidth: 90
+                            }
+                            table.render(option);
+
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+
+                            layer.close(ajaxLoad);
+                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                                ColFilter();
+                            }
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery() {
+                var HNumber = $("#HNumber").val();
+                var HName = $("#HName").val();
+               
+                if (HNumber) {
+                    sWhere += " and 缁翠慨楠屾敹椤圭洰浠g爜 like '%" + HNumber + "%'";
+                }
+                if (HName) {
+                    sWhere += " and 缁翠慨楠屾敹椤圭洰 like '%" + HName + "%'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");              
+                form.render('select');
+                sWhere = "";
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //#region 宸ュ叿鏍忎簨浠�
+            //鏂板
+            function set_AddNew() {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板缁翠慨妫�楠岄」鐩�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../鍩虹璧勬枡/Gy_RepairCheckEdit.html?OperationType=1&linterid=&HSouceBillType='],
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+
+            }
+
+            //淇敼鎸夐挳
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].HItemID.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫鍣ㄥ叿棰嗙敤鍗�'
+                        , closeBtn: 1
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍩虹璧勬枡/Gy_RepairCheckEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            };
+
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
+                        btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+                        , yes: function (index, layero) {
+                            $.ajax({
+                                url: GetWEBURL() + '/Gy_RepairCheck/DeleteRepairCheck',
+                                type: "GET",
+                                data: { "HItemID": data[0].HItemID, "User": sessionStorage["HUserName"] },
+                                success: function (result) {
+                                    if (result.count == 1) {
+                                        layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                            // 寰楀埌frame绱㈠紩
+                                            var index = layer.getFrameIndex(window.name);
+                                            //鍏抽棴褰撳墠frame
+                                            layer.close(index);
+                                            //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                            window.location.reload();
+                                            //閲嶈浇tree
+                                            //tree.reload('treeDepartment', {});
+                                        });
+
+                                    } else {
+                                        layer.alert(result.code + result.Message, { icon: 5 });
+                                    }
+                                }
+                            })
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            };
+
+            //鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").click();
+            }
+
+            //棰勮
+            function get_ViewReport() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + InterID + "&Type=HRepairCheck&OpenTmp=缁翠慨楠屾敹椤圭洰");
+
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+                }
+            }
+
+            //瀹℃牳
+            function set_AuditBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HBillStatus = data[0].HBillStatus.toString(); //鍗曟嵁鐘舵��
+                    var HInterID = data[0].hmainid.toString();
+                    if (HBillStatus > 0) {
+                        layer.msg('鍗曟嵁涓嶄负鏈鏍哥姸鎬侊紒');
+                        return false;
+                    }
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_Mould/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+
+            //鍙嶅鏍�
+            function set_DeAuditBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HBillStatus = data[0].HBillStatus.toString(); //鍗曟嵁鐘舵��
+                    var HInterID = data[0].hmainid.toString();
+                    if (HBillStatus = 0) {
+                        layer.msg('鍗曟嵁宸蹭负鏈鏍哥姸鎬�,鏃犻渶鍙嶅鏍革紒');
+                        return false;
+                    }
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_Mould/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": HInterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+
+            }
+
+            //#region 闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                var contentUrl = "";
+                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+                var urlLen = urlStr.split('/');
+                for (var i = 0; i < urlLen.length - 4; i++) {
+                    contentUrl += "../";
+                }
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: [contentUrl, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+            //#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", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 2; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                //if (data1.data[0].HColumnWidth != 0) {
+                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                                //} else {
+                                //    option.cols[0][i + 1]["width"] = "";
+                                //}
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                        } else {
+                            table.render(option);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#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);
+                form.render('select');
+            }
+            //#endregion
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html"
index a25921e..e4b61ed 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html"
@@ -74,7 +74,7 @@
                                 </ul>
                             </div>                           
                         </div> <!--top-end-->
-                        <div style="width:98%;height:570px;min-height:300px;position: relative;">
+                        <div style="width:98%;height:calc(90vh);min-height:300px;position: relative;">
                             <!--//杞挱鍥�-->
                             <div class="layui-carousel" id="test1" style="position:absolute;"><!--閫忔槑搴� opacity: 0.2-->
                                 <div carousel-item id="file">
@@ -149,9 +149,7 @@
             var HSourceID = sessionStorage["HSourceID"];//鐢熶骇璧勬簮
             //#endregion
             //#region 杩涘叆椤甸潰鏃㈠姞杞�
-            //鍒濆鍖栬〃鏍�
-            set_InitGrid();
-            set_InitGrid2();
+           
             // 杞挱鍥�
             var ins = carousel.render({
                 elem: '#test1'
@@ -178,7 +176,7 @@
                     var Stamp = new Date();
 
                     $('#Date').html(year + "&nbsp;骞�" + " " + monthNames[month] + ' ' + day + "&nbsp;鏃�");
-                    $('#Week').html(dayNames[Stamp.getDay()] + ' ' + (hh < 10 ? ("0" + hh) : hh) + ' : ' + (mm < 10 ? ("0" + mm) : mm) + ' : ' + (ss < 10 ? ("0" + ss) : ss));                  
+                    $('#Week').html(dayNames[Stamp.getDay()] + ' ' + (hh < 10 ? ("0" + hh) : hh) + ' : ' + (mm < 10 ? ("0" + mm) : mm) + ' : ' + (ss < 10 ? ("0" + ss) : ss));
                 }, 1000);
             });
             //#endregion
@@ -191,16 +189,13 @@
 
             //寮�濮嬫挱鏀捐棰�
             video.addEventListener("play", (event) => {
-                $('#test1').css('opacity', 0.5);               
+                $('#test1').css('opacity', 0.5);
             });
             //缁撴潫鎾斁瑙嗛
             video.addEventListener("pause", (event) => {
-                $('#test1').css('opacity', 1);          
-            });
+                $('#test1').css('opacity', 1);
+            });          
 
-            //鑾峰彇褰撳墠鐢熶骇璧勬簮鐨勭敓浜ц鍗�
-            get_Display(sWhere, HID);
-          
             //#region 鍒ゆ柇鎿嶄綔绫诲瀷(杩欓噷娌$敤鍒�)
             if (OperationType == 1 || OperationType == 2) {//鏃犳簮鏂板
                 //鍒濆鍩烘湰淇℃伅璧嬪��
@@ -208,10 +203,20 @@
             else if (OperationType == 3) {//缂栬緫
                 set_EditFromGrid(linterid);
             }
+            else if (OperationType == 5) {//鏌ョ湅
+                HMaterID = params[params[1]]; //鐗╂枡ID
+                HSourceNo = params[params[2]]; //宸ュ崟鍙�
+                HSourceEntryID = params[params[3]]; //婧愬崟瀛愬唴鐮�      
+                get_SopFile(HMaterID, HSourceNo);
+                return;
+            }
             else {
                 layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
             }
             //#endregion
+
+            //鑾峰彇褰撳墠鐢熶骇璧勬簮鐨勭敓浜ц鍗�
+            get_Display(sWhere, HID);
 
             //#region 閫夊崟鍙�
             form.on('submit(CheckTask)', function (data) {
@@ -221,7 +226,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '宸ュ崟鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Sc_ICMOBillListView3.html?HSourceID=' + HSourceID, 'yes']                    
+                    , content: ['../../Baseset/鍩虹璧勬枡/Sc_ICMOBillListView3.html?HSourceID=' + HSourceID, 'yes']
                 })
             });
 
@@ -245,7 +250,7 @@
                 } else {
                     document.getElementById("IsHide").style.display = "inherit";//闅愯棌瑙嗛
                     document.getElementById("HideVideo").innerHTML = "闅愯棌瑙嗛";
-                }             
+                }
             });
 
             //#region 閫�鍑�
@@ -258,7 +263,7 @@
                     //鍏抽棴椤电
                     Pub_Close(1);
                 }
-            });            
+            });
 
             //#endregion
             //#region 鏄惁鑷姩鎾斁
@@ -289,28 +294,28 @@
                         break;
                 }
             });
+            //#endregion          
+            
             //#endregion
-
-            //#region 鐐瑰嚮涓昏〃甯﹀嚭浠庤〃鏁版嵁
-            table.on('rowDouble(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
-                //var datas = obj.data; //鑾峰緱褰撳墠琛屾暟鎹�
-                //HBillNo = datas["鍗曟嵁鍙�"].toString();
-                //var HMainID = datas.hmainid;
-                var wait = layer.load();
-                HInterID = obj.data.HInterID
-                if (HInterID == "" || HInterID == null) {
-                    HInterID = 0;
-                }
+            
+            //#region 鏍规嵁鐗╂枡鍔犺浇鍥剧墖
+            function get_SopFile(HMaterID, HSourceNo) {
+                var wait = layer.load();//閬僵
                 $("#file").html("");
                 $(".layui-carousel-ind").html("");
+
                 $.ajax({
-                    url: GetWEBURL() + '/Sc_ICMOBillStatus_Tmp/Filelist',
+                    url: GetWEBURL() + '/Gy_SopBill/getListByMaterID',
                     type: "GET",
-                    data: { "sWhere": HInterID },
+                    data: { "HMaterID": HMaterID, "HSourceNo": HSourceNo },
+
                     success: function (data1) {
                         if (data1.count == 1) {
-                            option2.data = data1.data;
-                            table.render(option2);
+                            if (data1.data[0]) {
+                                HInterID = data1.data[0].HInterID
+                            }
+                            option.data = data1.data;
+                            table.render(option);
 
                             for (let i = 0; i < data1.data.length; i++) {
                                 var html = '';
@@ -323,78 +328,29 @@
                                 if (data1.data[i].鏂囦欢绫诲瀷 == '.pdf') {
                                     var FileName2 = data1.data[i].鏂囦欢鍚嶇О;
                                     //<embed src="Test PDF.pdf" type="application/pdf" style="width:100%;height:100%" internalinstanceid="81" />
-                                    html += '<div><embed src="../../../Files/' + FileName2 + '"' + ' type="application/pdf" style="width:100%;height:100%" internalinstanceid="81" /></div>'
+                                    html += '<div><embed src="../../../Files/' + FileName2 + '"' + ' type="application/pdf" style="width:100%;height:100%"  internalinstanceid="81" /></div>'
                                     $("#file").append(html);
                                 }
                             }
+
                             if (data1.data.length == 0) {
-                                var html2 = '<h1 style="text-align:center;color:red;font-weight:bolder;">鏆傛湭涓婁紶鏂囦欢</h1>';
+                                var html2 = '<h1 style="text-align:center;line-height:570px;color:red;font-weight:bolder;">鏆傛湭涓婁紶鏂囦欢</h1>';
                                 $("#file").append(html2);
                             }
                             ins.reload({ autoplay: false })
+
                             layer.close(wait);
                         } else {
-                            layer.alert(data1.code + data1.Message, { icon: 5 });
                             layer.close(wait);
+                            layer.alert(data1.Message, { icon: 5 });
                         }
                     }, error: function () {
                         layer.close(wait);
-                        layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-            });
+            }
             //#endregion
-
-            //#region 鍒濆鍖栬〃鏍�
-            function set_InitGrid() {
-                option = {
-                    id: 'mainTable'
-                    , elem: '#mainTable'
-                    , toolbar: '#toolbarDemo'
-                    , page: false
-                    , cellMinWidth: 90
-                    , totalRow: false
-                    , toolbar: false
-                    , limit: 50
-                    , height: 300
-                    , cols: [[
-                        , { field: '婧愬崟鍗曞彿', title: '璁″垝', width: 100 }
-                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 100, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
-                        , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
-                        , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
-                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
-                        , { field: '宸ュ簭', title: '宸ュ簭', width: 100 }
-                        //, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 66 }
-                    ]]
-                    , limits: [50, 500, 5000, 20000]
-                    , done: function (res, curr, count) {
-
-                    }
-                };
-            }
-            function set_InitGrid2() {
-                option2 = {
-                    id: 'mainTable2'
-                    , elem: '#mainTable2'
-                    , toolbar: '#toolbarDemo'
-                    , page: false
-                    , cellMinWidth: 90
-                    , totalRow: false
-                    , toolbar: false
-                    , limit: 50
-                    , height: 300
-                    , cols: [[
-                        , { field: '搴忓彿', title: '搴忓彿', width: 115,}
-                        , { field: '宸ュ簭', title: '宸ュ簭', width: 115, }
-                        , { field: '鏂囦欢鍚嶇О', title: '鏂囦欢鍚嶇О', width: 115 }
-                    ]]
-                    , limits: [50, 500, 5000, 20000]
-                    , done: function (res, curr, count) {
-
-                    }
-                };
-            }
-            //#endregion          
 
             //#region 鍔犺浇缃戞牸
             function get_Display(HSourceID, HID) {
@@ -504,9 +460,9 @@
                     }
                 });
             };
-               
 
-            //浠ヤ笂鏄痩ayui妯″潡           
+
+            //浠ヤ笂鏄痩ayui妯″潡
         });
         //杩斿洖浠诲姟鍗曚俊鎭�
         function GetICMOBillValue(obj) {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList_PDA.html"
index 38287c2..37e359c 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList_PDA.html"
@@ -38,6 +38,26 @@
                                 <div class="layui-inline">
                                     <input type="date" class="layui-input" id="HEndDate" style="width:110px;" placeholder="yyyy-MM-dd">
                                 </div>
+
+                                <div class="layui-inline" style="margin-top:2px;">
+                                    <label class="layui-form-label" style="width: 60px;">璁惧缂栫爜</label>
+                                    <div class="layui-input-inline">
+                                        <input class="layui-input" name="HEqNumber" lay-verify="HEqNumber" id="HEqNumber">
+                                    </div>
+                                </div>
+                                <div class="layui-inline" style="margin-top:2px;">
+                                    <label class="layui-form-label" style="width: 60px;">璁惧鍚嶇О</label>
+                                    <div class="layui-input-inline">
+                                        <input class="layui-input" name="HEqName" lay-verify="HEqName" id="HEqName">
+                                    </div>
+                                </div>
+                                <div class="layui-inline" style="margin-top:2px;">
+                                    <label class="layui-form-label" style="width: 60px;">鍗� 鎹� 鍙�</label>
+                                    <div class="layui-input-inline">
+                                        <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="width:125px;">
+                                    </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>
@@ -213,7 +233,7 @@
                                 , height: 'full-70'
                                 , totalRow: false //寮�鍚悎璁�
                                 , cols: [col]
-                                , data: data1.data
+                                , data: data1.data == null ? [] : data1.data
                             };
                             table.render(option);
 
@@ -237,12 +257,22 @@
             function get_FastQuery() {
                 var HBeginDate = $("#HBeginDate").val();//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
                 var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
-
+                var HEqNumber = $("#HEqNumber").val(); //璁惧浠g爜
+                var HEqName = $("#HEqName").val(); //璁惧鍚嶇О
+                var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
 
                 if (HBeginDate != "" && HEndDate != "") {
                     sWhere += " and 鏃ユ湡 between '" + HBeginDate + "' and '" + HEndDate + "' ";
                 }
-
+                if (HEqNumber != "") {
+                    sWhere += " and 璁惧浠g爜 like '%" + HEqNumber + "%'"
+                }
+                if (HEqName != "") {
+                    sWhere += " and 璁惧鍚嶇О like '%" + HEqName + "%'"
+                }
+                if (HBillNo != "") {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'"
+                }
                 get_Display(sWhere);
                 //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
                 sWhere = "";
@@ -255,12 +285,8 @@
                 $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                 $("#HMaterNumber").val("");
                 $("#HBillNo").val("");
-                $("#HProductName").val("");
-                $("#HProductModel").val("");
-                $("#ColContent").val("");
-                $("#ColName").val("0");
-                $("#Comparator").val("0");
-                ColFilter();
+                $("#HEqNumber").val(""); //璁惧浠g爜
+                $("#HEqName").val(""); //璁惧鍚嶇О                     
                 sWhere = "";
             }
 
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBill_PDA.html"
index f28d2e3..7b21a00 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBill_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBill_PDA.html"
@@ -534,7 +534,7 @@
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetMAXNum",
                     type: "GET",
-                    data: { "HBillType": '3903' },
+                    data: { "HBillType": '3910' },
                     success: function (d) {
                         //console.log(d.data);
                         $("#HInterID").val("0");
@@ -865,7 +865,7 @@
             //闈炵┖楠岃瘉
             function AllowLoadData(sSubStr) {
                 if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
-                    layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    layer.msg("娌℃湁璁惧鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return false;
                 }
                 //if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipConkBookBillList_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipConkBookBillList_PDA.html"
new file mode 100644
index 0000000..47a064c
--- /dev/null
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipConkBookBillList_PDA.html"
@@ -0,0 +1,446 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>璁惧鏁呴殰鐧昏鍗曞垪琛�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/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">
+        input.layui-input.layui-unselect {
+            padding-right: 0;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 30px;">鏃ユ湡</label>
+                                    <input type="date" class="layui-input" id="HBeginDate" style="width:110px;" placeholder="yyyy-MM-dd">
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width:5px">-</label>
+                                </div>
+                                <div class="layui-inline">
+                                    <input type="date" class="layui-input" id="HEndDate" style="width:110px;" placeholder="yyyy-MM-dd">
+                                </div>
+
+                                <div class="layui-inline" style="margin-top:2px;">
+                                    <label class="layui-form-label" style="width: 60px;">璁惧缂栫爜</label>
+                                    <div class="layui-input-inline">
+                                        <input class="layui-input" name="HEqNumber" lay-verify="HEqNumber" id="HEqNumber">
+                                    </div>
+                                </div>
+                                <div class="layui-inline" style="margin-top:2px;">
+                                    <label class="layui-form-label" style="width: 60px;">璁惧鍚嶇О</label>
+                                    <div class="layui-input-inline">
+                                        <input class="layui-input" name="HEqName" lay-verify="HEqName" id="HEqName">
+                                    </div>
+                                </div>
+                                <div class="layui-inline" style="margin-top:2px;">
+                                    <label class="layui-form-label" style="width: 60px;">鍗� 鎹� 鍙�</label>
+                                    <div class="layui-input-inline">
+                                        <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="width:125px;">
+                                    </div>
+                                </div>
+
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btnDel"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></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
+                , util = layui.util
+            //鏌ヨ鏉′欢
+            var sWhere = "";
+            var option = [];
+            var HModName = "Sb_EquipConkBookBillList_PDA";
+
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+            //#region 鍒濆鍖栫晫闈�
+
+            set_ClearBill();
+
+            //#endregion
+
+            //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //瀹℃牳
+                    case 'btnCheck': btnCheck(1);
+                        break;
+                    //鍙嶅鏍�
+                    case 'btnAdutCheck': btnCheck(2);
+                        break;
+                    //鍒犻櫎
+                    case 'btnDel': btnDel();
+                        break;
+                    //閫�鍑�
+                    case 'btn-exit': Pub_Close(2);
+                        break;
+                    //闅愯棌鍒楄缃�
+                    case 'HideColumn':
+                        get_HideColumn();
+                        break;
+                };
+            });
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+
+            //琛岀洃鍚簨浠�-鍗曞嚮
+            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 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+            //鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栨椂闂�
+                $("#HBeginDate").val(Format(new Date() - 1000 * 60 * 60 * 24 * 30, "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+                //鍔犺浇鏁版嵁鍒扮綉鏍�
+                get_FastQuery();
+                DisPlay_HideColumn();
+            }
+
+            //鍒楁槑鏄剧ず涓嬫媺妗�
+            function ColFilter() {
+                var Organization = '<option  value="0" selected="selected" ></option>';
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    if (option.cols[0][i].hide != true) {
+                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+                    }
+                }
+                $("#ColName").empty();
+                $("#ColName").append(Organization);
+                form.render('select');
+            }
+
+
+            //鍔犺浇缃戞牸
+            function get_Display(sWhere) {
+                //鍔ㄦ�佸垪-缂撳瓨鍒楄〃
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetEquipmentBillsList",
+                    type: "GET",
+                    async: false,
+                    data: { "sWhere": sWhere, "Type": "GZ" },
+                    success: function (data1) {
+
+                        if (data1.count == 1) {
+
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left' });
+                            for (var i = 0; i < data.length; i++) {
+                                if ($.inArray(data[i].name, "") > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+                                    }
+                                }
+                            }
+                            option = {
+                                elem: '#mainTable'
+                                , toolbar: '#toolbarDemo'
+                                , cellMinWidth: 120
+                                , page: true
+                                , limit: 50
+                                , limits: [50, 500, 5000, 20000]
+                                , height: 'full-70'
+                                , totalRow: false //寮�鍚悎璁�
+                                , cols: [col]
+                                , data: data1.data == null ? [] : data1.data
+                            };
+                            table.render(option);
+
+                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                                ColFilter();
+                            }
+                        }
+                    },
+                    error: function (err) {
+                        layer.msg('閿欒' + err, {
+                            icon: 5,
+                            time: 20000
+                        }, function () {
+                            //do something
+                        });
+                    }
+                })
+            }
+
+            //蹇�熻繃婊�
+            function get_FastQuery() {
+                var HBeginDate = $("#HBeginDate").val();//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+                var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+                var HEqNumber = $("#HEqNumber").val(); //璁惧浠g爜
+                var HEqName = $("#HEqName").val(); //璁惧鍚嶇О
+                var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+
+                if (HBeginDate != "" && HEndDate != "") {
+                    sWhere += " and 鏃ユ湡 between '" + HBeginDate + "' and '" + HEndDate + "' ";
+                }
+                if (HEqNumber != "") {
+                    sWhere += " and 璁惧浠g爜 like '%" + HEqNumber + "%'"
+                }
+                if (HEqName != "") {
+                    sWhere += " and 璁惧鍚嶇О like '%" + HEqName + "%'"
+                }
+                if (HBillNo != "") {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'"
+                }
+                get_Display(sWhere);
+                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+                sWhere = "";
+            }
+
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                //鍒濆鍖栨椂闂�
+                $("#HBeginDate").val(Format(new Date() - 1000 * 60 * 60 * 24 * 30, "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HMaterNumber").val("");
+                $("#HBillNo").val("");
+                $("#HEqNumber").val(""); //璁惧浠g爜
+                $("#HEqName").val(""); //璁惧鍚嶇О  
+                
+                sWhere = "";
+            }
+
+            //鍒犻櫎
+            function btnDel() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hmainid = data[0].hmainid;
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        //閫昏緫鍒犻櫎鏂规硶
+                        $.ajax({
+                            url: GetWEBURL() + '/ProcessCheck/DelProcessCheckBill',
+                            type: "GET",
+                            data: { "lngBillKey": hmainid, "user": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                console.log('gouba' + result);
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(wait);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        get_FastQuery();
+                                    });
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+
+            }
+
+            //闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+
+            //鏄剧ず鍒楁暟鎹�
+            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 = ["hmainid","HMaterID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 1; i++) {
+                                if (dataCol[i]) {
+                                    var dataCols = dataCol[i].split('|');
+                                }
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //鏄剧ず鍒�
+                                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
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipConkBookBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipConkBookBill_PDA.html"
new file mode 100644
index 0000000..44ff79e
--- /dev/null
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipConkBookBill_PDA.html"
@@ -0,0 +1,882 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>璁惧鏁呴殰鐧昏鍗�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
+    <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+    <!--寮曠敤layui js鏂囦欢-->
+    <script src="../../layuiadmin/layui/layui.js"></script>
+    <script src="../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../layuiadmin/PubCustom.js"></script>
+    <!--鑷畾涔夋牱寮�-->
+    <style>       
+        .layui-form-label {
+            font-size: 14px;
+            width: 85px;
+            text-align: inherit;
+        }
+        /*鍏ㄥ眬璁剧疆杈撳叆妗嗛珮搴�*/
+        .layui-input {
+            height: 30px;
+        }
+        /*璁剧疆琛ㄥご杈撳叆妗�*/
+        .t1_input {
+            padding: 1%;
+        }
+        /*鏈珯淇℃伅td*/
+        .bz_td {
+            display: -webkit-box; /*璁剧疆鎸夐挳涓嶆崲琛�*/
+            padding: 1%; /*璁剧疆杈撳叆妗嗚竟璺�*/
+        }
+        /*璁剧疆鏈珯淇℃伅鎸夐挳楂樺害*/
+        .bz_btu {
+            height: 30px;
+            width: 60px;
+            line-height: 30px;
+        }
+
+        th {
+            width: 70px;
+            text-align: center;
+        }
+    </style>
+</head>
+
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
+                    <div style="background-color:#0085E8;">
+                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>璁惧鏁呴殰鐧昏鍗�</span>
+                    </div>
+                    <div class="layui-form-item" style="margin: 1% 2%;text-align: right;">
+                        <button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius">鏂板</button>
+                        <!--<button type="button" lay-submit="" lay-filter="" class="layui-btn layui-btn-radius">娓呯┖</button>-->
+                        <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius">淇濆瓨</button>
+                        <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
+                    </div>
+                    <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item layui-show">
+                                <table style="width:80%;">
+                                    <tbody>
+                                        <tr>
+                                            <th>璁惧鏉$爜</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HBarCode" class="layui-input" id="HBarCode" placeholder="璇疯緭鍏ヨ澶囨潯鐮佸悗鍥炶溅" style="border-radius: 50px;">
+                                                <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius" lay-filter="QueDin" style="line-height: 30px;">纭畾</button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>寮�濮嬫椂闂�</th>
+                                            <td class="t1_input">
+                                                <input type="datetime" name="HConkBeginDate" class="layui-input" id="HConkBeginDate" placeholder="璇烽�夋嫨鏃ユ湡">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鏁呴殰绫诲埆</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HConkTypeName" class="layui-input" id="HConkTypeName" placeholder="閫夋嫨鏁呴殰绫诲埆" style="background-color:#efefef4d;">
+                                                <input type="hidden" name="HConkTypeID" id="HConkTypeID" value="0" autocomplete="off" class="layui-input">
+                                                <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="ConkType" id="ConkType" style="font-weight:bolder">...</button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鏁呴殰鎻忚堪</th>
+                                            <td class="bz_td">
+                                                <textarea name="HExplanation" id="HExplanation" placeholder="璇疯緭鍏ュ唴瀹�" class="layui-textarea"></textarea>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鍗曟嵁鍙�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HBillNo" class="layui-input" id="HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" style="border-radius: 50px;">
+                                                <input type="hidden" name="HInterID" id="HInterID" value="0" autocomplete="off" class="layui-input">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鍗曟嵁鏃ユ湡</th>
+                                            <td class="t1_input">
+                                                <input type="datetime" name="HDate" class="layui-input" id="HDate" placeholder="璇烽�夋嫨鏃ユ湡">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>閮ㄩ棬</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HDeptName" class="layui-input" id="HDeptName" placeholder="閫夋嫨閮ㄩ棬" style="background-color:#efefef4d;">
+                                                <input type="hidden" name="HDeptID" id="HDeptID" value="0" autocomplete="off" class="layui-input">
+                                                <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="Department" id="Department" style="font-weight:bolder">...</button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鍙戠幇浜�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HEmpName" class="layui-input" id="HEmpName" placeholder="閫夋嫨鍙戠幇浜�" style="background-color:#efefef4d;">
+                                                <input type="hidden" name="HEmpID" id="HEmpID" value="0" autocomplete="off" class="layui-input">
+                                                <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HEmp" id="HEmp" style="font-weight:bolder">...</button>
+                                            </td>
+                                        </tr>                                       
+                                        <tr>
+                                            <th>璐熻矗浜�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HManagerName" class="layui-input" id="HManagerName" placeholder="閫夋嫨璐熻矗浜�" style="background-color:#efefef4d;">
+                                                <input type="hidden" name="HManagerID" id="HManagerID" value="0" autocomplete="off" class="layui-input">
+                                                <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HManager" id="HManager" style="font-weight:bolder">...</button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>璁惧鍚嶇О</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HBarName" class="layui-input" id="HBarName" placeholder="璇疯緭鍏ヨ澶囧悕绉�" style="border-radius: 50px;background-color:#EDEDED;" readonly>
+                                                <input type="hidden" name="HEquipID" id="HEquipID" value="0" autocomplete="off" class="layui-input">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>璁惧瑙勬牸</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HBarSpec" class="layui-input" id="HBarSpec" placeholder="璇疯緭鍏ヨ澶囪鏍�" style="border-radius: 50px;background-color:#EDEDED;" readonly>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>璁惧鍨嬪彿</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HBarModel" class="layui-input" id="HBarModel" placeholder="璇疯緭鍏ヨ澶囧瀷鍙�" style="border-radius: 50px;background-color:#EDEDED;" readonly>
+                                            </td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                            <div class="layui-tab-item">
+                                <table style="width:80%;">
+                                    <tbody>
+                                        <tr>
+                                            <th>鍒涘缓浜�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HMaker" class="layui-input" id="HMaker" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鍒涘缓鏃ユ湡</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HMakeDate" class="layui-input" id="HMakeDate" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>淇敼浜�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HUpDater" class="layui-input" id="HUpDater" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>淇敼鏃ユ湡</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HUpDateDate" class="layui-input" id="HUpDateDate" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>瀹℃牳浜�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HChecker" class="layui-input" id="HChecker" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>瀹℃牳鏃ユ湡</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HCheckDate" class="layui-input" id="HCheckDate" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>浣滃簾浜�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HDeleteMan" class="layui-input" id="HDeleteMan" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>浣滃簾鏃ユ湡</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HDeleteDate" class="layui-input" id="HDeleteDate" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                            <div class="layui-tab-item" style="display:none">
+                                <table class="" id="mainTable" lay-filter="mainTable"></table>
+                                <script type="text/html" id="toolbarDemo">
+                                    <div class="layui-btn-container">
+                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炶</button>
+                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                    </div>
+                                </script>
+                                <script type="text/html" id="xuhao">
+                                    {{d.LAY_TABLE_INDEX+1}}
+                                </script>
+                                <script type="text/html" id="barDemo">
+                                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+                                </script>
+                            </div>
+                        </div>
+                        <ul class="layui-tab-title">
+                            <li class="layui-this">鍩烘湰淇℃伅</li>
+                            <li>鍏朵粬淇℃伅</li>
+                            <!--<li>鏄庣粏淇℃伅</li>-->
+                        </ul>
+                    </div>
+                    <!--闅愯棌瀛楁-->
+                    <input type="hidden" name="lngBillKey" id="lngBillKey">
+                    <input type="hidden" name="lngBillSubKey" id="lngBillSubKey">
+
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        var IsSet = "";
+        layui.config({
+            base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                ,laydate = layui.laydate
+                , element = layui.element;
+
+            //#region 鏃ユ湡鏃堕棿閫夋嫨鍣�
+            laydate.render({
+                elem: '#HConkBeginDate'
+                , type: 'datetime'
+            });           
+            laydate.render({
+                elem: '#HDate'
+                , type: 'datetime'
+            });
+            laydate.render({
+                elem: '#HMakeDate'
+                , type: 'datetime'
+            });
+            laydate.render({
+                elem: '#HUpDateDate'
+                , type: 'datetime'
+            });
+            laydate.render({
+                elem: '#HCheckDate'
+                , type: 'datetime'
+            });
+            laydate.render({
+                elem: '#HDeleteDate'
+                , type: 'datetime'
+            });
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            //鑾峰彇鏈�澶у崟鎹彿
+            $.ajax({
+                url: GetWEBURL() + "/Web/GetMAXNum",
+                type: "GET",
+                data: { "HBillType": '3907' },
+                success: function (d) {
+                    //console.log(d.data);
+                    $("#HInterID").val("0");
+                    $("#HBillNo").val(d.data[0].HBillNo);
+                }
+            });
+            //#endregion
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                var NewRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": ""};
+                switch (obj.event) {
+                    //鏂板涓�琛�
+                    case 'btn-AddLine': btnAddLine(NewRow);
+                        break;
+                    case 'btn-Edit': btnEditLine(obj);
+                        break;
+                }
+            });
+            //琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+            });
+
+
+            //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
+            $("#HBarCode").focus();
+            //鍒濆鍩烘湰淇℃伅璧嬪��
+            $("#HConkBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鐐规寮�濮嬫椂闂�
+            $("#HRepairEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));    //鐐规缁撴潫鏃堕棿
+            $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
+            $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒涘缓鏃ユ湡
+
+            $("#HDeptID").val(sessionStorage["HDeptID"]);               //閮ㄩ棬ID
+            $("#HDeptName").val(sessionStorage["HDept"]);               //閮ㄩ棬
+            $("#HEmpID").val(sessionStorage["HKeeperID"]);              //鍙戠幇浜篒D
+            $("#HEmpName").val(sessionStorage["HKeeper"]);            //鍙戠幇浜�
+            $("#HManagerID").val(sessionStorage["HManagerID"]);         //璐d换浜篒D
+            $("#HManagerName").val(sessionStorage["HManagerName"]);     //璐d换浜�
+            $("#HMaker").val(sessionStorage["HUserName"]);     //鍒涘缓浜�
+            //妯℃不鍏锋潯鐮佹槸鍚︽壂鎻忔爣璁�
+            var HProcExchBillNoFlag = false;
+
+
+
+            //鏉″舰鐮佸洖杞︽柟娉�
+            $('#HBarCode').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    GetMeesageByBarCode();
+                }
+            });
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
+            });
+
+            //鏉″舰鐮佸洖杞︽柟娉�
+            $('#HBarCode').on('keydown', function (event) {
+                var HBarCode = $('#HBarCode').val();
+                if (event.keyCode == 13) {
+                    if (!HBarCode) {
+                        layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+                        return;
+                    }
+                    var index = layer.load();
+                    $.ajax({
+                        url: GetWEBURL() + "/Sb_PDA_EqpRepairWorkBill/txtHBarCode_KeyDown",
+                        type: "GET",
+                        data: { "HBarCode": HBarCode },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                var data = result.data[0];
+                                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                    "HEquipID": data.HInterID,
+                                    "HBarName": data.HName,
+                                    "HBarSpec": data.HModel,
+                                    "HBarModel": data.HModel2,
+                                    "HQty": "1"
+                                });
+                                $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                                $("#HBarCode").css("background-color", "#efefef4d");
+
+                                HProcExchBillNoFlag = true;
+                                layer.close(index);
+                            }
+                            else {
+                                layer.close(index);
+                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        },
+                        error: function (err) {
+                            layer.close(index);
+                            layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                }
+            });
+
+
+            //閫�鍑�-鍏抽棴椤甸潰鏂规硶
+            $('#Cancel').on('click', function () {
+                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    parent.layui.admin.events.closeThisTabs(); //鍏抽棴椤电
+                });
+            })
+
+            //鎻愪氦
+            form.on('submit(Saver)', function (data) {//鎻愪氦
+                //var tableData = data.field;               
+                data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
+                var oMain = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(table.cache['mainTable']);
+                var sMainSub = oMain + ';' + sSubStr + ";" + sessionStorage["HUserName"] + ";" + 1;
+                if (AllowLoadData(sSubStr)) {
+                    $.ajax({
+                        type: "POST",
+                        url: GetWEBURL() + "/Sb_EqpRepairWorkBill/SaveGetEqpConkBookBillList",
+                        async: true,
+                        data: { "msg": sMainSub },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) {
+                                layer.msg("鎻愪氦鎴愬姛");
+                                $('#Saver').removeClass("buttom_box_little");
+                                $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
+                            }
+                            else {
+                                layer.close(index);
+                                layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        },
+                        error: function (err) {
+                            layer.close(index);
+                            layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                }
+            });
+
+
+            //鏂板
+            form.on('submit(Add)', function (data) {
+                $('#Saver').addClass("buttom_box_little");
+                $('#Saver').addClass("layui-btn-disabled").attr("disabled", false);
+                $("#HBarCode").removeAttr("readonly");//鏉″舰鐮佹竻闄ゅ彧璇�
+                $("#HBarCode").removeAttr("background-color");//鏉″舰鐮佹竻闄よ儗鏅壊
+
+                // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
+                $("#formData")[0].reset();
+                layui.form.render();
+                option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "" }];
+                table.render(option);
+
+                $("#HBarCode").focus();
+                //鑾峰彇鏈�澶у崟鎹彿
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '3907' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HInterID").val("0");
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                    }
+                });
+                $("#HConkBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //缁翠慨寮�濮嬫椂闂�
+                $("#HRepairEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));    //缁翠慨缁撴潫鏃堕棿
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
+                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒涘缓鏃ユ湡
+                $("#HMaker").val(sessionStorage["HUserName"]);     //鍒涘缓浜�
+            })
+
+             //#region 閫�鍑烘寜閽�
+            form.on('submit(Cancel)', function () {
+                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    Pub_Close(2);
+                });
+            })
+            //#endregion
+            
+            //鏁呴殰绫诲埆
+            form.on('submit(ConkType)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏁呴殰绫诲埆鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ConkTypeList_PDA.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HConkTypeName").val(checkStatus.data[0].鏁呴殰绫诲埆);
+                        $("#HConkTypeID").val(checkStatus.data[0].hitemid);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //閮ㄩ棬寮圭獥
+            form.on('submit(Department)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '閮ㄩ棬鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../views/PublicPage/DeptInformation_PDA.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        $("#HDeptID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //鍙戠幇浜哄脊绐�
+            form.on('submit(HEmp)', function () {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '浜哄憳鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../PublicPage/UserInformation_PDA.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HEmpName").val(checkStatus.data[0].HName);
+                        $("#HEmpID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //缁翠慨椤圭洰寮圭獥
+            form.on('submit(HRepairList)', function () {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '缁翠慨椤圭洰鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../PublicPage/RepairItemInformation.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HRepair").val(checkStatus.data[0].HName);
+                        $("#HRepairID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //璐熻矗浜哄脊绐�
+            form.on('submit(HManager)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '浜哄憳鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../PublicPage/UserInformation_PDA.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HManagerName").val(checkStatus.data[0].HName);
+                        $("#HManagerID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //琛ㄥご淇℃伅閫夋嫨鍗曟嵁寮圭獥
+            form.on('submit(XDHList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '璁惧缁翠慨鐧昏鍗�',
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    content: ['../璁惧绠$悊/Sb_EqpConkBookBillList.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('璇烽�夋嫨鍗曟嵁鏁版嵁');
+                        }
+                        $("#HMainSourceBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+                        $("#HMainSourceInterID").val(checkStatus.data[0].hmainid);
+                        $("#HMainSourceEntryID").val(checkStatus.data[0].hsubid);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+                        //layer.full(index);
+                    }
+                });
+            });
+
+
+            //浠ヤ笅涓烘椤甸潰鎵�鏈夋柟娉�
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                //琛ㄥご
+                columns = [
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+                    , { field: 'HRepairID', title: 'HRepairID', edit: 'text', event: "", hide: true }
+                    , { field: 'HRepairCode', title: '缁翠慨椤圭洰浠g爜', edit: 'text', event: "", event: "HRepairCode" }
+                    , { field: 'HRepairName', title: '缁翠慨椤圭洰', edit: 'text', event: "" }
+                    , { field: 'HManagerID', title: 'HManagerID', edit: 'text', hide: true }
+                    , { field: 'HManagerCode', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: "HManagerCode" }
+                    , { field: 'HManagerName', title: '璐熻矗浜�', edit: 'text' }
+                    , { field: 'HRepairExplanation', title: '缁翠慨瑕佹眰', edit: 'text' }
+                    , { field: 'HRemark', title: '澶囨敞', event: "", edit: 'text' }
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 150 }
+                ];
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , page: true
+                    , cellMinWidth: 120
+                    , totalRow: true
+                    , limit: 10
+                    , height: 'full-50'
+                    , cols: [columns]
+                    , limits: [50, 500, 1000, 5000]
+                    , done: function (res, curr, count) {
+
+                    }
+                };
+                option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "" }];
+                table.render(option);
+            }
+            //澧炲姞涓�琛�
+            function btnAddLine(NewRow) {
+                var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
+                buttonArr = [];//娓呯┖鏁扮粍
+                for (var i = 0; i < tableBak.length; i++) {
+                    buttonArr.push(tableBak[i]);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+                }
+                buttonArr.push(NewRow);  //鍦ㄥ熬閮ㄥ姞涓�琛�
+                table.reload("mainTable", {
+                    data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+                })
+            }
+            //缂栬緫涓�琛�
+            function btnEditLine() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    layer.open({
+                        type: 2
+                        , area: ['80%', '80%']
+                        , title: '缂栬緫PDA璁惧缁翠慨'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../璁惧绠$悊/Sb_EqpMaintenanceBillList_PDAEdit.html?OperationType=3&linterid=&HSouceBillType='
+                        , resize: false
+                        , btn: ['纭畾', '鍙栨秷']
+                        , yes: function (index, layero) {
+
+                            //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                            var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                            var HRepairID = parent.layer.getChildFrame('#HRepairID').val();
+                            var HRepairCode = parent.layer.getChildFrame('#HRepairCode').val();
+                            var HRepairName = parent.layer.getChildFrame('#HRepairName').val();
+                            var HManagerID = parent.layer.getChildFrame('#HManagerID').val();
+                            var HManagerCode = parent.layer.getChildFrame('#HManagerCode').val();
+                            var HManagerName = parent.layer.getChildFrame('#HManagerName').val();
+                            var HRepairExplanation = parent.layer.getChildFrame('#HRepairExplanation').val();
+                            if (HRepairID == "") {
+                                return layer.msg('璇烽�夋嫨缁翠慨椤圭洰');
+                            }
+                            if (HManagerID == "") {
+                                return layer.msg('璇烽�夋嫨璐熻矗浜�');
+                            }
+                            buttonArr = [];//娓呯┖鏁扮粍
+                            var checkrow = {
+                                "HRepairID": HRepairID, "HRepairCode": HRepairCode, "HRepairName": HRepairName,
+                                "HManagerID": HManagerID, "HManagerCode": HManagerCode, "HManagerName": HManagerName,
+                                "HRepairExplanation": HRepairExplanation
+                            };
+                            buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+                            table.reload("mainTable", {
+                                data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+                            })
+                            layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                        }
+                        , end: function () {
+
+                        }
+                        , cancel: function () {
+
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            // 琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+            function set_GridDelete(obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'del') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+                        console.log("绱㈠紩涓�:" + rowIndex);
+                        if (rowIndex === '0') {
+                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        } else {
+                            //obj.del();
+                            //layer.close(index);
+                            var oldData = table.cache["mainTable"];
+                            oldData.splice(obj.tr.data('index'), 1);
+                            table.reload('mainTable', { data: oldData });
+                            layer.close(index);
+                        }
+                    });
+                }
+            }
+            //闈炵┖楠岃瘉
+            function AllowLoadData(sSubStr) {
+                if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
+                    layer.msg("娌℃湁璁惧鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                //if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+                //    sSubStr = JSON.parse(sSubStr);
+                //    for (var i = 0; i < sSubStr.length; i++) {
+                //        if (sSubStr[i].HManagerCode == "") {
+                //            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璐熻矗浜轰唬鐮佷俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //            return false;
+                //        }
+                //        if (sSubStr[i].HRepairCode == "") {
+                //            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,缁翠慨椤圭洰浠g爜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //            return false;
+                //        }
+                //        else {
+                //            return true;
+                //        }
+                //    }
+                //}
+                return true;
+            }
+            //鎵潯鐮�
+            function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+                var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+                if (!HBarCode) {
+                    layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+                    return;
+                }
+                var index = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "/Sb_PDA_EqpRepairWorkBill/txtHBarCode_KeyDown",
+                    type: "GET",
+                    data: { "HBarCode": HBarCode },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            var data = result.data[0];
+                            $("#HEquipID").val(data.HInterID);
+                            $("#HBarName").val(data.HName);
+                            $("#HBarSpec").val(data.HModel);
+                            $("#HBarModel").val(data.HModel2);
+                            $("#HQty").val(1);
+                            $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                            $("#HBarCode").css("background-color", "#efefef4d");
+
+                            HProcExchBillNoFlag = true;
+                            layer.close(index);
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+            //浠ヤ笂涓簂ayui妯″潡
+        });
+
+    </script>
+</body>
+</html>
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
index 17d93d6..754ee9d 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
@@ -260,6 +260,7 @@
                     }
                 });
             });
+            //鑾峰彇璁惧鐐规瑙勭▼
             function get_DocCheckItem() {
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetDotCheckRuleItemByEquipProjectID",
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList_PDA.html"
index dd4482c..d77c8e2 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList_PDA.html"
@@ -37,7 +37,27 @@
                                 </div>
                                 <div class="layui-inline">
                                     <input type="date" class="layui-input" id="HEndDate" style="width:110px;" placeholder="yyyy-MM-dd">
-                                </div>                               
+                                </div>
+
+                                <div class="layui-inline" style="margin-top:2px;">
+                                    <label class="layui-form-label" style="width: 60px;">璁惧缂栫爜</label>
+                                    <div class="layui-input-inline">
+                                        <input class="layui-input" name="HEqNumber" lay-verify="HEqNumber" id="HEqNumber">
+                                    </div>
+                                </div>
+                                <div class="layui-inline" style="margin-top:2px;">
+                                    <label class="layui-form-label" style="width: 60px;">璁惧鍚嶇О</label>
+                                    <div class="layui-input-inline">
+                                        <input class="layui-input" name="HEqName" lay-verify="HEqName" id="HEqName">
+                                    </div>
+                                </div>
+                                <div class="layui-inline" style="margin-top:2px;">
+                                    <label class="layui-form-label" style="width: 60px;">鍗� 鎹� 鍙�</label>
+                                    <div class="layui-input-inline">
+                                        <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="width:125px;">
+                                    </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>
@@ -213,7 +233,7 @@
                                 , height: 'full-70'
                                 , totalRow: false //寮�鍚悎璁�
                                 , cols: [col]
-                                , data: data1.data
+                                , data: data1.data == null ? [] : data1.data
                             };
                             table.render(option);
 
@@ -237,12 +257,22 @@
             function get_FastQuery() {
                 var HBeginDate = $("#HBeginDate").val();//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
                 var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
-
+                var HEqNumber = $("#HEqNumber").val(); //璁惧浠g爜
+                var HEqName = $("#HEqName").val(); //璁惧鍚嶇О
+                var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
 
                 if (HBeginDate != "" && HEndDate != "") {
                     sWhere += " and 鏃ユ湡 between '" + HBeginDate + "' and '" + HEndDate + "' ";
                 }
-
+                if (HEqNumber != "") {
+                    sWhere += " and 璁惧浠g爜 like '%" + HEqNumber + "%'"
+                }
+                if (HEqName != "") {
+                    sWhere += " and 璁惧鍚嶇О like '%" + HEqName + "%'"
+                }
+                if (HBillNo != "") {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'"
+                }
                 get_Display(sWhere);
                 //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
                 sWhere = "";
@@ -255,12 +285,8 @@
                 $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                 $("#HMaterNumber").val("");
                 $("#HBillNo").val("");
-                $("#HProductName").val("");
-                $("#HProductModel").val("");
-                $("#ColContent").val("");
-                $("#ColName").val("0");
-                $("#Comparator").val("0");
-                ColFilter();
+                $("#HEqNumber").val(""); //璁惧浠g爜
+                $("#HEqName").val(""); //璁惧鍚嶇О               
                 sWhere = "";
             }
 
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
index 6da00da..6d380c8 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
@@ -219,8 +219,8 @@
                                 </table>
                             </div>
                             <div class="layui-tab-item">
-                                <div class="layui-inline">
-                                    <label class="layui-form-label">璁惧鐐规瑙勭▼</label>
+                                <div class="layui-inline" style="margin-bottom:5px;">
+                                    <label class="layui-form-label" style="width:100px;">璁惧鐐规瑙勭▼</label>
                                     <div class="layui-input-inline">
                                         <input type="hidden" name="HEquipDotCheckRuleInterID" id="HEquipDotCheckRuleInterID" class="layui-input" value="" style="float:left;width:150px;">
                                         <input type="text" name="HEquipDotCheckRuleInterNo" id="HEquipDotCheckRuleInterNo" class="layui-input" value="" style="float:left;width:150px;" readonly="readonly">
@@ -509,7 +509,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../璁惧绠$悊/璁惧瑙勭▼鍗�/Sb_EquipDotCheckRuleList.html', 'yes'],
+                    content: ['../璁惧绠$悊/璁惧瑙勭▼鍗�/Sb_EquipDotCheckRuleList_PDA.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
                         //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -543,6 +543,7 @@
                             if (result.count == 1) {
                                 var BYData = result;//
                                 var rowdate1 = layui.table.cache["mainTable"];
+                                var data = result.data;
                                 option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "" }];
                                 table.render(option);
 
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_PDA.html"
index 513af48..d0c8af5 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_PDA.html"
@@ -38,6 +38,26 @@
                                 <div class="layui-inline">
                                     <input type="date" class="layui-input" id="HEndDate" style="width:110px;" placeholder="yyyy-MM-dd">
                                 </div>
+
+                                <div class="layui-inline" style="margin-top:2px;">
+                                    <label class="layui-form-label" style="width: 60px;">璁惧缂栫爜</label>
+                                    <div class="layui-input-inline">
+                                        <input class="layui-input" name="HEqNumber" lay-verify="HEqNumber" id="HEqNumber">
+                                    </div>
+                                </div>
+                                <div class="layui-inline" style="margin-top:2px;">
+                                    <label class="layui-form-label" style="width: 60px;">璁惧鍚嶇О</label>
+                                    <div class="layui-input-inline">
+                                        <input class="layui-input" name="HEqName" lay-verify="HEqName" id="HEqName">
+                                    </div>
+                                </div>
+                                <div class="layui-inline" style="margin-top:2px;">
+                                    <label class="layui-form-label" style="width: 60px;">鍗� 鎹� 鍙�</label>
+                                    <div class="layui-input-inline">
+                                        <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="width:125px;">
+                                    </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>
@@ -213,7 +233,7 @@
                                 , height: 'full-70'
                                 , totalRow: false //寮�鍚悎璁�
                                 , cols: [col]
-                                , data: data1.data
+                                , data: data1.data == null ? [] : data1.data
                             };
                             table.render(option);
 
@@ -237,12 +257,23 @@
             function get_FastQuery() {
                 var HBeginDate = $("#HBeginDate").val();//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
                 var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+                var HEqNumber = $("#HEqNumber").val(); //璁惧浠g爜
+                var HEqName = $("#HEqName").val(); //璁惧鍚嶇О
+                var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
 
 
                 if (HBeginDate != "" && HEndDate != "") {
                     sWhere += " and 鏃ユ湡 between '" + HBeginDate + "' and '" + HEndDate + "' ";
                 }
-
+                if (HEqNumber != "") {
+                    sWhere += " and 璁惧浠g爜 like '%" + HEqNumber + "%'"
+                }
+                if (HEqName != "") {
+                    sWhere += " and 璁惧鍚嶇О like '%" + HEqName + "%'"
+                }
+                if (HBillNo != "") {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'"
+                }
                 get_Display(sWhere);
                 //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
                 sWhere = "";
@@ -255,12 +286,8 @@
                 $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                 $("#HMaterNumber").val("");
                 $("#HBillNo").val("");
-                $("#HProductName").val("");
-                $("#HProductModel").val("");
-                $("#ColContent").val("");
-                $("#ColName").val("0");
-                $("#Comparator").val("0");
-                ColFilter();
+                $("#HEqNumber").val(""); //璁惧浠g爜
+                $("#HEqName").val(""); //璁惧鍚嶇О                   
                 sWhere = "";
             }
 
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBill_PDA.html"
index dd3fc25..656e1a5 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBill_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBill_PDA.html"
@@ -219,8 +219,8 @@
                                 </table>
                             </div>
                             <div class="layui-tab-item">
-                                <div class="layui-inline">
-                                    <label class="layui-form-label">璁惧淇濆吇瑙勭▼</label>
+                                <div class="layui-inline" style="margin-bottom:5px;">
+                                    <label class="layui-form-label" style="width:100px;">璁惧淇濆吇瑙勭▼</label>
                                     <div class="layui-input-inline">
                                         <input type="hidden" name="HEquipMaintainRuleInterID" id="HEquipMaintainRuleInterID" class="layui-input" value="" style="float:left;width:150px;">
                                         <input type="text" name="HEquipMaintainRuleInterNo" id="HEquipMaintainRuleInterNo" class="layui-input" value="" style="float:left;width:150px;" readonly="readonly">
@@ -509,7 +509,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../璁惧绠$悊/璁惧瑙勭▼鍗�/Sb_EquipMaintainRuleList.html', 'yes'],
+                    content: ['../璁惧绠$悊/璁惧瑙勭▼鍗�/Sb_EquipMaintainRuleList_PDA.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
                         //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -543,6 +543,7 @@
                             if (result.count == 1) {
                                 var BYData = result;//
                                 var rowdate1 = layui.table.cache["mainTable"];
+                                var data = result.data;
                                 option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "" }];
                                 table.render(option);
 
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipRepairCheckBillList_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipRepairCheckBillList_PDA.html"
new file mode 100644
index 0000000..fa73f23
--- /dev/null
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipRepairCheckBillList_PDA.html"
@@ -0,0 +1,458 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>璁惧缁翠慨楠屾敹鍗曞垪琛�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/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">
+        input.layui-input.layui-unselect {
+            padding-right: 0;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 30px;">鏃ユ湡</label>
+                                    <input type="date" class="layui-input" id="HBeginDate" style="width:110px;" placeholder="yyyy-MM-dd">
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width:5px">-</label>
+                                </div>
+                                <div class="layui-inline">
+                                    <input type="date" class="layui-input" id="HEndDate" style="width:110px;" placeholder="yyyy-MM-dd">
+                                </div>
+
+                                <div class="layui-inline" style="margin-top:2px;">
+                                    <label class="layui-form-label" style="width: 60px;">璁惧缂栫爜</label>
+                                    <div class="layui-input-inline">
+                                        <input class="layui-input" name="HEqNumber" lay-verify="HEqNumber" id="HEqNumber">
+                                    </div>
+                                </div>
+                                <div class="layui-inline"  style="margin-top:2px;">
+                                    <label class="layui-form-label" style="width: 60px;">璁惧鍚嶇О</label>
+                                    <div class="layui-input-inline">
+                                        <input class="layui-input" name="HEqName" lay-verify="HEqName" id="HEqName">
+                                    </div>
+                                </div>
+
+                                <!--<div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 60px;">璁惧缂栫爜</label>
+                                    <input class="layui-input" name="HEqNumber" lay-verify="HEqNumber" id="HEqNumber" style="width:70px;">
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 60px;">璁惧鍚嶇О</label>
+                                    <input class="layui-input" name="HEqName" lay-verify="HEqName" id="HEqName" style="width:70px;">
+                                </div>-->
+
+                                <div class="layui-inline"  style="margin-top:2px;">
+                                    <label class="layui-form-label" style="width: 60px;">鍗� 鎹� 鍙�</label>
+                                    <div class="layui-input-inline">
+                                        <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="width:125px;">
+                                    </div>
+                                </div>
+
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btnDel"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></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
+                , util = layui.util
+            //鏌ヨ鏉′欢
+            var sWhere = "";
+            var option = [];
+            var HModName = "Sb_EquipRepairCheckBillList_PDA";
+
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+            //#region 鍒濆鍖栫晫闈�
+
+            set_ClearBill();
+
+            //#endregion
+
+            //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //瀹℃牳
+                    case 'btnCheck': btnCheck(1);
+                        break;
+                    //鍙嶅鏍�
+                    case 'btnAdutCheck': btnCheck(2);
+                        break;
+                    //鍒犻櫎
+                    case 'btnDel': btnDel();
+                        break;
+                    //閫�鍑�
+                    case 'btn-exit': Pub_Close(2);
+                        break;
+                    //闅愯棌鍒楄缃�
+                    case 'HideColumn':
+                        get_HideColumn();
+                        break;
+                };
+            });
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+
+            //琛岀洃鍚簨浠�-鍗曞嚮
+            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 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+            //鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栨椂闂�
+                $("#HBeginDate").val(Format(new Date() - 1000 * 60 * 60 * 24 * 30, "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+                //鍔犺浇鏁版嵁鍒扮綉鏍�
+                get_FastQuery();
+                DisPlay_HideColumn();
+            }
+
+            //鍒楁槑鏄剧ず涓嬫媺妗�
+            function ColFilter() {
+                var Organization = '<option  value="0" selected="selected" ></option>';
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    if (option.cols[0][i].hide != true) {
+                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+                    }
+                }
+                $("#ColName").empty();
+                $("#ColName").append(Organization);
+                form.render('select');
+            }
+
+
+            //鍔犺浇缃戞牸
+            function get_Display(sWhere) {
+                //鍔ㄦ�佸垪-缂撳瓨鍒楄〃
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetEquipmentBillsList",
+                    type: "GET",
+                    async: false,
+                    data: { "sWhere": sWhere, "Type": "YS" },
+                    success: function (data1) {
+
+                        if (data1.count == 1) {
+
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left' });
+                            for (var i = 0; i < data.length; i++) {
+                                if ($.inArray(data[i].name, "") > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+                                    }
+                                }
+                            }
+                            option = {
+                                elem: '#mainTable'
+                                , toolbar: '#toolbarDemo'
+                                , cellMinWidth: 120
+                                , page: true
+                                , limit: 50
+                                , limits: [50, 500, 5000, 20000]
+                                , height: 'full-70'
+                                , totalRow: false //寮�鍚悎璁�
+                                , cols: [col]
+                                , data: data1.data == null ? [] : data1.data
+                            };
+                            table.render(option);
+
+                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                                ColFilter();
+                            }
+                        }
+                    },
+                    error: function (err) {
+                        layer.msg('閿欒' + err, {
+                            icon: 5,
+                            time: 20000
+                        }, function () {
+                            //do something
+                        });
+                    }
+                })
+            }
+
+            //蹇�熻繃婊�
+            function get_FastQuery() {
+                var HBeginDate = $("#HBeginDate").val();//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+                var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+
+                var HEqNumber = $("#HEqNumber").val(); //璁惧浠g爜
+                var HEqName = $("#HEqName").val(); //璁惧鍚嶇О
+                var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+
+                if (HBeginDate != "" && HEndDate != "") {
+                    sWhere += " and 鏃ユ湡 between '" + HBeginDate + "' and '" + HEndDate + "'";
+                }
+
+                if (HEqNumber != "") {
+                    sWhere += " and 璁惧浠g爜 like '%" + HEqNumber + "%'"
+                }
+                if (HEqName != "") {
+                    sWhere += " and 璁惧鍚嶇О like '%" + HEqName + "%'"
+                }
+                if (HBillNo != "") {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'"
+                }
+
+                get_Display(sWhere);
+                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+                sWhere = "";
+            }
+
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                //鍒濆鍖栨椂闂�
+                $("#HBeginDate").val(Format(new Date() - 1000 * 60 * 60 * 24 * 30, "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HBillNo").val("");
+                $("#HEqNumber").val(""); //璁惧浠g爜
+                $("#HEqName").val(""); //璁惧鍚嶇О
+               
+                sWhere = "";
+            }
+
+            //鍒犻櫎
+            function btnDel() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hmainid = data[0].hmainid;
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        //閫昏緫鍒犻櫎鏂规硶
+                        $.ajax({
+                            url: GetWEBURL() + '/ProcessCheck/DelProcessCheckBill',
+                            type: "GET",
+                            data: { "lngBillKey": hmainid, "user": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                console.log('gouba' + result);
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(wait);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        get_FastQuery();
+                                    });
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+
+            }
+
+            //闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+
+            //鏄剧ず鍒楁暟鎹�
+            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 = ["hmainid", "HMaterID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 1; i++) {
+                                if (dataCol[i]) {
+                                    var dataCols = dataCol[i].split('|');
+                                }
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //鏄剧ず鍒�
+                                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
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipRepairCheckBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipRepairCheckBill_PDA.html"
new file mode 100644
index 0000000..5b917bf
--- /dev/null
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipRepairCheckBill_PDA.html"
@@ -0,0 +1,927 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>璁惧缁翠慨楠屾敹鍗�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
+    <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+    <!--寮曠敤layui js鏂囦欢-->
+    <script src="../../layuiadmin/layui/layui.js"></script>
+    <script src="../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../layuiadmin/PubCustom.js"></script>
+    <!--鑷畾涔夋牱寮�-->
+    <style>
+        .layui-form-label {
+            font-size: 14px;
+            width: 85px;
+            text-align: inherit;
+        }
+        /*鍏ㄥ眬璁剧疆杈撳叆妗嗛珮搴�*/
+        .layui-input {
+            height: 30px;
+        }
+        /*璁剧疆琛ㄥご杈撳叆妗�*/
+        .t1_input {
+            padding: 1%;
+        }
+        /*鏈珯淇℃伅td*/
+        .bz_td {
+            display: -webkit-box; /*璁剧疆鎸夐挳涓嶆崲琛�*/
+            padding: 1%; /*璁剧疆杈撳叆妗嗚竟璺�*/
+        }
+        /*璁剧疆鏈珯淇℃伅鎸夐挳楂樺害*/
+        .bz_btu {
+            height: 30px;
+            width: 60px;
+            line-height: 30px;
+        }
+
+        th {
+            width: 70px;
+            text-align: center;
+        }
+    </style>
+</head>
+
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
+                    <div style="background-color:#0085E8;">
+                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>璁惧缁翠慨楠屾敹鍗�</span>
+                    </div>
+                    <div class="layui-form-item" style="margin: 1% 2%;text-align: right;">
+                        <button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius">鏂板</button>
+                        <!--<button type="button" lay-submit="" lay-filter="" class="layui-btn layui-btn-radius">娓呯┖</button>-->
+                        <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius">淇濆瓨</button>
+                        <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
+                    </div>
+                    <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item layui-show">
+                                <table style="width:80%;">
+                                    <tbody>
+                                        <tr>
+                                            <th>璁惧鏉$爜</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HBarCode" class="layui-input" id="HBarCode" placeholder="璇疯緭鍏ヨ澶囨潯鐮佸悗鍥炶溅" style="border-radius: 50px;">
+                                                <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius" lay-filter="QueDin" style="line-height: 30px;">纭畾</button>
+                                            </td>
+                                        </tr>
+                                        <tr style="display:none;">
+                                            <th>寮�濮嬫椂闂�</th>
+                                            <td class="t1_input">
+                                                <input type="datetime" name="HCheckBeginDate" class="layui-input" id="HCheckBeginDate" placeholder="璇烽�夋嫨鏃ユ湡">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>楠岃瘉缁撹    </th>
+                                            <td class="t1_input">
+                                                <select name="HCheckResult" lay-filter="aihao" id="HCheckResult">
+                                                    <option value="OK" selected="selected">OK</option>
+                                                    <option value="NG">NG</option>
+                                                </select>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>楠岃瘉鍐呭</th>
+                                            <td class="bz_td">
+                                                <textarea name="HRepairCheckMainContent" id="HRepairCheckMainContent" placeholder="璇疯緭鍏ュ唴瀹�" class="layui-textarea"></textarea>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鍗曟嵁鍙�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HBillNo" class="layui-input" id="HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" style="border-radius: 50px;">
+                                                <input type="hidden" name="HInterID" id="HInterID" value="0" autocomplete="off" class="layui-input">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鍗曟嵁鏃ユ湡</th>
+                                            <td class="t1_input">
+                                                <input type="datetime" name="HDate" class="layui-input" id="HDate" placeholder="璇烽�夋嫨鏃ユ湡">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>閮ㄩ棬</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HDeptName" class="layui-input" id="HDeptName" placeholder="閫夋嫨閮ㄩ棬" style="background-color:#efefef4d;">
+                                                <input type="hidden" name="HDeptID" id="HDeptID" value="0" autocomplete="off" class="layui-input">
+                                                <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="Department" id="Department" style="font-weight:bolder">...</button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>楠屾敹浜�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HEmpName" class="layui-input" id="HEmpName" placeholder="閫夋嫨楠屾敹浜�" style="background-color:#efefef4d;">
+                                                <input type="hidden" name="HEmpID" id="HEmpID" value="0" autocomplete="off" class="layui-input">
+                                                <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HEmp" id="HEmp" style="font-weight:bolder">...</button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>楠岃瘉椤圭洰</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HRepairCheckMainName" class="layui-input" id="HRepairCheckMainName" placeholder="閫夋嫨楠岃瘉椤圭洰" style="background-color:#efefef4d;">
+                                                <input type="hidden" name="HRepairCheckMainID" id="HRepairCheckMainID" value="0" autocomplete="off" class="layui-input">
+                                                <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HRepairCheckMain" id="HRepairCheckMain" style="font-weight:bolder">...</button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>璐熻矗浜�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HManagerName" class="layui-input" id="HManagerName" placeholder="閫夋嫨璐熻矗浜�" style="background-color:#efefef4d;">
+                                                <input type="hidden" name="HManagerID" id="HManagerID" value="0" autocomplete="off" class="layui-input">
+                                                <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HManager" id="HManager" style="font-weight:bolder">...</button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>璁惧鍚嶇О</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HBarName" class="layui-input" id="HBarName" placeholder="璇疯緭鍏ヨ澶囧悕绉�" style="border-radius: 50px;background-color:#EDEDED;" readonly>
+                                                <input type="hidden" name="HEquipID" id="HEquipID" value="0" autocomplete="off" class="layui-input">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>璁惧瑙勬牸</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HBarSpec" class="layui-input" id="HBarSpec" placeholder="璇疯緭鍏ヨ澶囪鏍�" style="border-radius: 50px;background-color:#EDEDED;" readonly>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>璁惧鍨嬪彿</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HBarModel" class="layui-input" id="HBarModel" placeholder="璇疯緭鍏ヨ澶囧瀷鍙�" style="border-radius: 50px;background-color:#EDEDED;" readonly>
+                                            </td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                            <div class="layui-tab-item">
+                                <table style="width:80%;">
+                                    <tbody>
+                                        <tr>
+                                            <th>鍒涘缓浜�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HMaker" class="layui-input" id="HMaker" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鍒涘缓鏃ユ湡</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HMakeDate" class="layui-input" id="HMakeDate" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>淇敼浜�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HUpDater" class="layui-input" id="HUpDater" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>淇敼鏃ユ湡</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HUpDateDate" class="layui-input" id="HUpDateDate" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>瀹℃牳浜�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HChecker" class="layui-input" id="HChecker" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>瀹℃牳鏃ユ湡</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HCheckDate" class="layui-input" id="HCheckDate" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>浣滃簾浜�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HDeleteMan" class="layui-input" id="HDeleteMan" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>浣滃簾鏃ユ湡</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HDeleteDate" class="layui-input" id="HDeleteDate" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                            <div class="layui-tab-item" style="display:none">
+                                <table class="" id="mainTable" lay-filter="mainTable"></table>
+                                <script type="text/html" id="toolbarDemo">
+                                    <div class="layui-btn-container">
+                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炶</button>
+                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                    </div>
+                                </script>
+                                <script type="text/html" id="xuhao">
+                                    {{d.LAY_TABLE_INDEX+1}}
+                                </script>
+                                <script type="text/html" id="barDemo">
+                                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+                                </script>
+                            </div>
+                        </div>
+                        <ul class="layui-tab-title">
+                            <li class="layui-this">鍩烘湰淇℃伅</li>
+                            <li>鍏朵粬淇℃伅</li>
+                            <!--<li>鏄庣粏淇℃伅</li>-->
+                        </ul>
+                    </div>
+                    <!--闅愯棌瀛楁-->
+                    <input type="hidden" name="lngBillKey" id="lngBillKey">
+                    <input type="hidden" name="lngBillSubKey" id="lngBillSubKey">
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        var IsSet = "";
+        layui.config({
+            base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                ,laydate = layui.laydate
+                , element = layui.element;
+
+            //#region 鏃ユ湡鏃堕棿閫夋嫨鍣�
+            laydate.render({
+                elem: '#HCheckBeginDate'
+                , type: 'datetime'
+            });
+            laydate.render({
+                elem: '#HDate'
+                , type: 'datetime'
+            });
+            laydate.render({
+                elem: '#HMakeDate'
+                , type: 'datetime'
+            });
+            laydate.render({
+                elem: '#HUpDateDate'
+                , type: 'datetime'
+            });
+            laydate.render({
+                elem: '#HCheckDate'
+                , type: 'datetime'
+            });
+            laydate.render({
+                elem: '#HDeleteDate'
+                , type: 'datetime'
+            });
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            //鑾峰彇鏈�澶у崟鎹彿
+            $.ajax({
+                url: GetWEBURL() + "/Web/GetMAXNum",
+                type: "GET",
+                data: { "HBillType": '3911' },
+                success: function (d) {
+                    //console.log(d.data);
+                    $("#HInterID").val("0");
+                    $("#HBillNo").val(d.data[0].HBillNo);
+                }
+            });
+            //#endregion
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                var NewRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": ""};
+                switch (obj.event) {
+                    //鏂板涓�琛�
+                    case 'btn-AddLine': btnAddLine(NewRow);
+                        break;
+                    case 'btn-Edit': btnEditLine(obj);
+                        break;
+                }
+            });
+            //琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+            });
+
+
+            //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
+            $("#HBarCode").focus();
+            //鍒濆鍩烘湰淇℃伅璧嬪��
+            $("#HCheckBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //缁翠慨鏃ユ湡鏃堕棿
+            $("#HRepairEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));    //鐐规缁撴潫鏃堕棿
+            $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
+            $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒涘缓鏃ユ湡
+
+            $("#HDeptID").val(sessionStorage["HDeptID"]);               //閮ㄩ棬ID
+            $("#HDeptName").val(sessionStorage["HDept"]);               //閮ㄩ棬
+            $("#HEmpID").val(sessionStorage["HKeeperID"]);              //楠屾敹浜篒D
+            $("#HEmpName").val(sessionStorage["HKeeper"]);            //楠屾敹浜�
+            $("#HManagerID").val(sessionStorage["HManagerID"]);         //璐d换浜篒D
+            $("#HManagerName").val(sessionStorage["HManagerName"]);     //璐d换浜�
+            $("#HMaker").val(sessionStorage["HUserName"]);     //鍒涘缓浜�
+            //妯℃不鍏锋潯鐮佹槸鍚︽壂鎻忔爣璁�
+            var HProcExchBillNoFlag = false;
+
+
+
+            //鏉″舰鐮佸洖杞︽柟娉�
+            $('#HBarCode').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    GetMeesageByBarCode();
+                }
+            });
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
+            });
+
+            //鏉″舰鐮佸洖杞︽柟娉�
+            $('#HBarCode').on('keydown', function (event) {
+                var HBarCode = $('#HBarCode').val();
+                if (event.keyCode == 13) {
+                    if (!HBarCode) {
+                        layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+                        return;
+                    }
+                    var index = layer.load();
+                    $.ajax({
+                        url: GetWEBURL() + "/Sb_PDA_EqpRepairWorkBill/txtHBarCode_KeyDown",
+                        type: "GET",
+                        data: { "HBarCode": HBarCode },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                var data = result.data[0];
+                                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                    "HEquipID": data.HInterID,
+                                    "HBarName": data.HName,
+                                    "HBarSpec": data.HModel,
+                                    "HBarModel": data.HModel2,
+                                    "HQty": "1"
+                                });
+                                $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                                $("#HBarCode").css("background-color", "#efefef4d");
+
+                                HProcExchBillNoFlag = true;
+                                layer.close(index);
+                            }
+                            else {
+                                layer.close(index);
+                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        },
+                        error: function (err) {
+                            layer.close(index);
+                            layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                }
+            });
+
+
+            //閫�鍑�-鍏抽棴椤甸潰鏂规硶
+            $('#Cancel').on('click', function () {
+                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    parent.layui.admin.events.closeThisTabs(); //鍏抽棴椤电
+                });
+            })
+
+            //鎻愪氦
+            form.on('submit(Saver)', function (data) {//鎻愪氦
+                //var tableData = data.field;
+                data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
+                var oMain = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(table.cache['mainTable']);
+                var sMainSub = oMain + ';' + sSubStr + ";" + sessionStorage["HUserName"] + ";" + 1;
+                if (AllowLoadData(sSubStr)) {
+                    $.ajax({
+                        type: "POST",
+                        url: GetWEBURL() + "/Sb_EqpRepairWorkBill/SaveGetEqpRepairCheckBillList",
+                        async: true,
+                        data: { "msg": sMainSub },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) {
+                                layer.msg("鎻愪氦鎴愬姛");
+                                $('#Saver').removeClass("buttom_box_little");
+                                $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
+                            }
+                            else {
+                                layer.close(index);
+                                layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        },
+                        error: function (err) {
+                            layer.close(index);
+                            layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                }
+            });
+
+
+            //鏂板
+            form.on('submit(Add)', function (data) {
+                $('#Saver').addClass("buttom_box_little");
+                $('#Saver').addClass("layui-btn-disabled").attr("disabled", false);
+                $("#HBarCode").removeAttr("readonly");//鏉″舰鐮佹竻闄ゅ彧璇�
+                $("#HBarCode").removeAttr("background-color");//鏉″舰鐮佹竻闄よ儗鏅壊
+
+                // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
+                $("#formData")[0].reset();
+                layui.form.render();
+                option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "" }];
+                table.render(option);
+
+                $("#HBarCode").focus();
+                //鑾峰彇鏈�澶у崟鎹彿
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '3911' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HInterID").val("0");
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                    }
+                });
+                $("#HConkBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //缁翠慨寮�濮嬫椂闂�
+                $("#HRepairEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));    //缁翠慨缁撴潫鏃堕棿
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
+                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒涘缓鏃ユ湡
+                $("#HMaker").val(sessionStorage["HUserName"]);     //鍒涘缓浜�
+            })
+
+             //#region 閫�鍑烘寜閽�
+            form.on('submit(Cancel)', function () {
+                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    Pub_Close(2);
+                });
+            })
+            //#endregion
+
+            //鏁呴殰绫诲埆
+            form.on('submit(ConkType)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏁呴殰绫诲埆鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ConkTypeList_PDA.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HConkTypeName").val(checkStatus.data[0].鏁呴殰绫诲埆);
+                        $("#HConkTypeID").val(checkStatus.data[0].hitemid);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //閮ㄩ棬寮圭獥
+            form.on('submit(Department)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '閮ㄩ棬鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../views/PublicPage/DeptInformation_PDA.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        $("#HDeptID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+            
+            //楠岃瘉椤圭洰寮圭獥
+            form.on('submit(HRepairCheckMain)', function () {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '楠岃瘉椤圭洰鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairCheckList_PDA.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HRepairCheckMainName").val(checkStatus.data[0].缁翠慨楠屾敹椤圭洰);
+                        $("#HRepairCheckMainID").val(checkStatus.data[0].hitemid);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //楠屾敹浜哄脊绐�
+            form.on('submit(HEmp)', function () {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '浜哄憳鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../PublicPage/UserInformation_PDA.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HEmpName").val(checkStatus.data[0].HName);
+                        $("#HEmpID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //缁翠慨椤圭洰寮圭獥
+            form.on('submit(HRepairList)', function () {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '缁翠慨椤圭洰鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../PublicPage/RepairItemInformation.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HRepair").val(checkStatus.data[0].HName);
+                        $("#HRepairID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //璐熻矗浜哄脊绐�
+            form.on('submit(HManager)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '浜哄憳鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../PublicPage/UserInformation_PDA.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HManagerName").val(checkStatus.data[0].HName);
+                        $("#HManagerID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //琛ㄥご淇℃伅閫夋嫨鍗曟嵁寮圭獥
+            form.on('submit(XDHList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '璁惧缁翠慨鐧昏鍗�',
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    content: ['../璁惧绠$悊/Sb_EqpConkBookBillList.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('璇烽�夋嫨鍗曟嵁鏁版嵁');
+                        }
+                        $("#HMainSourceBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+                        $("#HMainSourceInterID").val(checkStatus.data[0].hmainid);
+                        $("#HMainSourceEntryID").val(checkStatus.data[0].hsubid);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+                        //layer.full(index);
+                    }
+                });
+            });
+
+
+            //浠ヤ笅涓烘椤甸潰鎵�鏈夋柟娉�
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                //琛ㄥご
+                columns = [
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+                    , { field: 'HRepairID', title: 'HRepairID', edit: 'text', event: "", hide: true }
+                    , { field: 'HRepairCode', title: '缁翠慨椤圭洰浠g爜', edit: 'text', event: "", event: "HRepairCode" }
+                    , { field: 'HRepairName', title: '缁翠慨椤圭洰', edit: 'text', event: "" }
+                    , { field: 'HManagerID', title: 'HManagerID', edit: 'text', hide: true }
+                    , { field: 'HManagerCode', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: "HManagerCode" }
+                    , { field: 'HManagerName', title: '璐熻矗浜�', edit: 'text' }
+                    , { field: 'HRepairExplanation', title: '缁翠慨瑕佹眰', edit: 'text' }
+                    , { field: 'HRemark', title: '澶囨敞', event: "", edit: 'text' }
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 150 }
+                ];
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , page: true
+                    , cellMinWidth: 120
+                    , totalRow: true
+                    , limit: 10
+                    , height: 'full-50'
+                    , cols: [columns]
+                    , limits: [50, 500, 1000, 5000]
+                    , done: function (res, curr, count) {
+
+                    }
+                };
+                option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "" }];
+                table.render(option);
+            }
+            //澧炲姞涓�琛�
+            function btnAddLine(NewRow) {
+                var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
+                buttonArr = [];//娓呯┖鏁扮粍
+                for (var i = 0; i < tableBak.length; i++) {
+                    buttonArr.push(tableBak[i]);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+                }
+                buttonArr.push(NewRow);  //鍦ㄥ熬閮ㄥ姞涓�琛�
+                table.reload("mainTable", {
+                    data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+                })
+            }
+            //缂栬緫涓�琛�
+            function btnEditLine() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    layer.open({
+                        type: 2
+                        , area: ['80%', '80%']
+                        , title: '缂栬緫PDA璁惧缁翠慨'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../璁惧绠$悊/Sb_EqpMaintenanceBillList_PDAEdit.html?OperationType=3&linterid=&HSouceBillType='
+                        , resize: false
+                        , btn: ['纭畾', '鍙栨秷']
+                        , yes: function (index, layero) {
+
+                            //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                            var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                            var HRepairID = parent.layer.getChildFrame('#HRepairID').val();
+                            var HRepairCode = parent.layer.getChildFrame('#HRepairCode').val();
+                            var HRepairName = parent.layer.getChildFrame('#HRepairName').val();
+                            var HManagerID = parent.layer.getChildFrame('#HManagerID').val();
+                            var HManagerCode = parent.layer.getChildFrame('#HManagerCode').val();
+                            var HManagerName = parent.layer.getChildFrame('#HManagerName').val();
+                            var HRepairExplanation = parent.layer.getChildFrame('#HRepairExplanation').val();
+                            if (HRepairID == "") {
+                                return layer.msg('璇烽�夋嫨缁翠慨椤圭洰');
+                            }
+                            if (HManagerID == "") {
+                                return layer.msg('璇烽�夋嫨璐熻矗浜�');
+                            }
+                            buttonArr = [];//娓呯┖鏁扮粍
+                            var checkrow = {
+                                "HRepairID": HRepairID, "HRepairCode": HRepairCode, "HRepairName": HRepairName,
+                                "HManagerID": HManagerID, "HManagerCode": HManagerCode, "HManagerName": HManagerName,
+                                "HRepairExplanation": HRepairExplanation
+                            };
+                            buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+                            table.reload("mainTable", {
+                                data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+                            })
+                            layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                        }
+                        , end: function () {
+
+                        }
+                        , cancel: function () {
+
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            // 琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+            function set_GridDelete(obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'del') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+                        console.log("绱㈠紩涓�:" + rowIndex);
+                        if (rowIndex === '0') {
+                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        } else {
+                            //obj.del();
+                            //layer.close(index);
+                            var oldData = table.cache["mainTable"];
+                            oldData.splice(obj.tr.data('index'), 1);
+                            table.reload('mainTable', { data: oldData });
+                            layer.close(index);
+                        }
+                    });
+                }
+            }
+            //闈炵┖楠岃瘉
+            function AllowLoadData(sSubStr) {
+                if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
+                    layer.msg("娌℃湁璁惧鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                //if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+                //    sSubStr = JSON.parse(sSubStr);
+                //    for (var i = 0; i < sSubStr.length; i++) {
+                //        if (sSubStr[i].HManagerCode == "") {
+                //            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璐熻矗浜轰唬鐮佷俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //            return false;
+                //        }
+                //        if (sSubStr[i].HRepairCode == "") {
+                //            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,缁翠慨椤圭洰浠g爜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //            return false;
+                //        }
+                //        else {
+                //            return true;
+                //        }
+                //    }
+                //}
+                return true;
+            }
+            //鎵潯鐮�
+            function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+                var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+                if (!HBarCode) {
+                    layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+                    return;
+                }
+                var index = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "/Sb_PDA_EqpRepairWorkBill/txtHBarCode_KeyDown",
+                    type: "GET",
+                    data: { "HBarCode": HBarCode },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            var data = result.data[0];
+                            $("#HEquipID").val(data.HInterID);
+                            $("#HBarName").val(data.HName);
+                            $("#HBarSpec").val(data.HModel);
+                            $("#HBarModel").val(data.HModel2);
+                            $("#HQty").val(1);
+                            $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                            $("#HBarCode").css("background-color", "#efefef4d");
+
+                            HProcExchBillNoFlag = true;
+                            layer.close(index);
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+            //浠ヤ笂涓簂ayui妯″潡
+        });
+
+    </script>
+</body>
+</html>
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleList_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleList_PDA.html"
new file mode 100644
index 0000000..9b16e50
--- /dev/null
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleList_PDA.html"
@@ -0,0 +1,631 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>璁惧鐐规瑙勭▼鍗�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <style type="text/css"></style>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/soulTable.slim.js"></script>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width:45px">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-inline">
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:80px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline" style="display:none;">
+                                    <label class="layui-form-label">鍒跺崟浜�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HCreateBy" id="HCreateBy">
+                                    </div>
+                                </div>
+                                <div class="layui-inline" style="display:none;">
+                                    <label class="layui-form-label">寮�濮嬫椂闂�</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
+                                    </div>
+                                </div>
+                                <div class="layui-inline" style="display:none;">
+                                    <label class="layui-form-label">缁撴潫鏃堕棿</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layui-btn-sm" 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 layui-btn-sm" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btnAdd"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btnModify"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>鍏抽棴</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>-->
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , element = layui.element
+            , laypage = layui.laypage
+            , laydate = layui.laydate
+            , soulTable = layui.soulTable
+            var sWhere = "";
+            var option = [];
+            var HModName = "Sb_EquipDotCheckRuleList";
+            var titleData = ["hmainid", "鐐规椤圭洰ID", "璐熻矗浜篒D", "hbilltype", "HMoudType", "hsubid","鍐呴儴鍗曟嵁鍙�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+            //鍒濆鍖栬〃鏍�
+            set_ClearBill();
+            //鍒濆鍖栬〃鏍�
+            DisPlay_HideColumn();
+            //#endregion
+
+            //#region 椤甸潰鎸夐挳鐐规浜嬩欢瑙﹀彂
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //鏂板鎸夐挳
+                    case 'btnAdd': set_AddNew();
+                        break;
+                    //缂栬緫鎸夐挳
+                    case 'btnModify': set_ShowBill();
+                        break;
+                    //鍒犻櫎鎸夐挳
+                    case 'btndelete': set_DeleteBill();
+                        break;
+                    //瀹℃牳
+                    case 'set_CheckBill': set_CheckBill(1);
+                        break;
+                    //鍙嶅鏍�
+                    case 'set_AbandonCheck': set_CheckBill(2);
+                        break;
+                    //鍏抽棴
+                    case 'set_CloseBill': set_CloseBill(1);
+                        break;
+                    //鍙嶅叧闂�
+                    case 'set_CancelCloseBill': set_CloseBill(2);
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumn();
+                        break;
+                };
+            });
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                get_Refresh();
+            });
+
+            //#endregion
+
+            //鍒濆鍖栬〃鏍�
+            function set_ClearBill() {
+                $("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid()
+            {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , limits: [50, 500, 5000, 20000]
+                    , limit: 50 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                    , cellMinWidth: 200
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+                        , { field: '鐐规鍛ㄦ湡', title: '鐐规鍛ㄦ湡' }
+                        , { field: '鍛ㄦ湡鍗曚綅', title: '鍛ㄦ湡鍗曚綅' }
+                        , { field: '璁″垝寮�濮嬫棩鏈�', title: '璁″垝寮�濮嬫棩鏈�', templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
+                        , { field: '璁″垝缁撴潫鏃ユ湡', title: '璁″垝缁撴潫鏃ユ湡', templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '鐐规椤圭洰ID', title: '鐐规椤圭洰ID', hide: true}
+                        , { field: '鐐规椤圭洰', title: '鐐规椤圭洰' }
+                        , { field: '鐐规閮ㄤ綅', title: '鐐规閮ㄤ綅' }
+                        , { field: '鍏蜂綋瑕佹眰', title: '鍏蜂綋瑕佹眰' }
+                        , { field: '璐熻矗浜篒D', title: '璐熻矗浜篒D', hide: true }
+                        , { field: '璐熻矗浜�', title: '璐熻矗浜�' }
+                        , { field: '澶囨敞', title: '澶囨敞' }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
+                        , { field: '淇敼浜�', title: '淇敼浜�' }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
+                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: 'hbilltype', title: 'hbilltype', hide: true }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
+                        , { field: 'HMoudType', title: 'HMoudType', hide: true }
+                        , { field: 'hsubid', title: 'hsubid', hide: true }
+                    ]]
+                };
+            }
+
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var index = layer.load();
+                var ajaxLoad = layer.load();
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    url: GetWEBURL() + '/Sb_EquipDotCheckRuleBill/GetEquipDotCheckRuleList',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left' });
+                            for (var i = 0; i < data.length; i++) {
+                                if ($.inArray(data[i].name, titleData) > -1 ) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            option = {
+                                elem: '#mainTable'
+                                , toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 550
+                                , page: true
+                                , cellMinWidth: 90
+                                , limit: 50
+                                , limits: [50, 500, 5000, 20000]
+                                , done: function (res, curr, count) {
+                                    soulTable.render(this);
+                                }
+                            }
+                            table.render(option);
+
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+
+                            layer.close(ajaxLoad);
+                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                                ColFilter();
+                            }
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //蹇�熻繃婊�
+            function get_FastQuery() {
+                //var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
+                var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+                var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜�
+                var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
+                var EndHCreateDate = $("#EndHCreateDate").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 (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
+                if (HCreateBy) {
+                    sWhere += " and 鍒跺崟浜� like '%" + HCreateBy + "%'";
+                }
+                if (BenginHCreateDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + BenginHCreateDate + "'";
+                }
+                if (EndHCreateDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + EndHCreateDate + "'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //鏂板
+            function set_AddNew() {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板璁惧鐐规瑙勭▼鍗曞垪琛�',
+                    closeBtn: false,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../璁惧瑙勭▼鍗�/Sb_EquipDotCheckRuleEdit.html?OperationType=1&linterid=&HSouceBillType=',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            }
+
+            //淇敼
+            function set_ShowBill()
+            {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].hmainid.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫璁惧鐐规瑙勭▼鍗曞垪琛�'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../璁惧瑙勭▼鍗�/Sb_EquipDotCheckRuleEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+                    var ModRightNameDelete = 'Gy_MouldFile_Delete';
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + '/Sb_EquipDotCheckRuleBill/DeleteEquipDotCheckRuleBillList',
+                            data: { "HInterID": HInterID, "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('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+
+            //瀹℃牳/鍙嶅鏍�
+            function set_CheckBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+
+                if (data.length == 1) {
+                    layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+                        var wait = layer.load();
+                        var HInterID = data[0].hmainid;
+                        $.ajax({
+                            url: GetWEBURL() + '/Sb_EquipDotCheckRuleBill/CheckSb_EquipDotCheckRuleBill',
+                            type: "GET",
+                            data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    get_FastQuery();
+                                    layer.msg(result.Message, { icon: 1 });
+                                    layer.close(wait);
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+                } else {
+                    layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+                }
+            }
+
+            //鍏抽棴/鍙嶅叧闂�
+            function set_CloseBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+
+                if (data.length == 1) {
+                    layer.confirm("纭瑕佸叧闂悧?", function (index) {
+                        var wait = layer.load();
+                        var HInterID = data[0].hmainid;
+                        $.ajax({
+                            url: GetWEBURL() + '/Sb_EquipDotCheckRuleBill/CloseSb_EquipDotCheckRuleBill',
+                            type: "GET",
+                            data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { icon: 1 });
+                                    layer.close(wait);
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+                }
+            } 
+
+            //鍒锋柊
+            function get_Refresh() {
+                 $("#HBillNo").val("");//鍗曟嵁鍙�
+                 $("#HCreateBy").val("");//鍒跺崟浜�
+                $("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                form.render('select');
+                sWhere = "";
+                get_Display(sWhere);
+            }
+
+            //闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+
+            //鏄剧ず鍒楁暟鎹�
+            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 = ["hmainid", "鐐规椤圭洰ID", "璐熻矗浜篒D", "hbilltype", "HMoudType","hsubid"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�*/
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 2; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                //if (data1.data[0].HColumnWidth != 0) {
+                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                                //} else {
+                                //    option.cols[0][i + 1]["width"] = "";
+                                //}
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                        } else {
+                            table.render(option);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+
+            //鍒楁槑鏄剧ず涓嬫媺妗�
+            function ColFilter() {
+                var Organization = '<option  value="0" selected="selected" ></option>';
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    if (option.cols[0][i].hide != true) {
+                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+                    }
+                }
+                $("#ColName").empty();
+                $("#ColName").append(Organization);
+                form.render('select');
+            }
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+
+
+
+
+    </script>
+
+</body>
+</html>
\ No newline at end of file

--
Gitblit v1.9.1