From 2b2dee6429828108c44b3bfa9eb630603479b6ea Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期六, 11 五月 2024 13:34:53 +0800
Subject: [PATCH] 1

---
 WebTM/views/设备管理/设备开机单/Sb_EquipBeginBill.html                 |  600 ++
 WebTM/views/模治具管理/模治具管理/Sc_MouldDotCheckPlanBillList.html     |   19 
 WebTM/views/index_Mobile.html                                 |   12 
 WebTM/views/项目管理/工作任务/PM_WorkTaskMoneyBill.html               |   45 
 WebTM/views/模治具管理/模具生产领用单/Sc_MouldProdOutBill_PDA_old.html    |  522 ++
 WebTM/views/设备管理/设备开机单/Sb_EquipBeginBillList.html             | 1047 ++++
 WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html   |   75 
 WebTM/views/项目管理/工程项目/PM_ProjectBill.html                     |    2 
 WebTM/views/仓存管理/分步式调入单/Fb_StepFoldinBillEdit.html            |  229 
 WebTM/views/设备管理/设备停机单/Sb_EquipStopBill.html                  |  598 ++
 WebTM/views/基础资料/基础资料/Gy_DotCheckItemClassList.html           |  652 ++
 WebTM/views/项目管理/工作任务/PM_WorkTaskMoneyBillList.html           |    2 
 WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckBill.html   |   73 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_PreventErrMould.html      |  279 +
 WebTM/views/销售管理/应收单/Xs_ReceivableBill.html                   |   51 
 WebTM/views/项目管理/基础建模/Gy_TaskClass.html                       |   13 
 WebTM/views/采购管理/应付单/Cg_PayableBill.html                      |   82 
 WebTM/views/设备管理/Sb_EquipDotCheckBillEdit.html                |  343 +
 WebTM/views/项目管理/工程项目/PM_ProjectBeginBillMain.html            |   80 
 WebTM/views/基础资料/基础资料/Gy_DotCheckList.html                    |    7 
 WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html                 |   13 
 WebTM/views/基础资料/基础资料/Gy_DotCheckItemMethodList.html          |  666 ++
 WebTM/views/模治具管理/模治具管理/Sc_Add_MouldDotCheckBillList.html     |  270 +
 WebTM/views/模治具管理/模治具管理/Sc_Add_MouldDotCheckPlanBillList.html |  106 
 WebTM/views/项目管理/工作任务/PM_WorkTaskBill.html                    |   55 
 WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html      |   83 
 WebTM/WebTM.csproj                                            |   20 
 WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html                 |    2 
 WebTM/views/模治具管理/器具点检规程单/Sc_MouldDotCheckRuleBillEdit.html   |   89 
 WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html                 |    3 
 WebTM/views/领料发货/销售出库/Kf_SellOutBill.html                     |   44 
 WebTM/views/设备管理/设备停机单/Sb_EquipStopBillList.html              | 1047 ++++
 WebTM/views/基础资料/基础资料/Gy_DotCheckEdit.html                    |   61 
 WebTM/views/基础资料/基础资料/Gy_DotCheckItemClassEdit.html           |  194 
 WebTM/views/采购管理/收料通知单/Add_Edit_Cg_POInStockBillList.html     |    9 
 WebTM/views/领料发货/分步式调出单/Fb_StepFoldOutBillEdit.html           |  157 
 WebTM/views/基础资料/公用基础资料/Gy_PreventErrMould.html               |  706 +++
 WebTM/views/验收入库/外购入库/Kf_POStockInBackBill_Add_Up.html        |    1 
 WebTM/views/仓存管理/仓库调拨/Add_Edit_Kf_MoveStockBill.html          |  100 
 WebTM/views/质量管理/安灯逐级呼叫规则/OA_AndengFlowRuleBillMain.html      |   34 
 WebTM/views/基础资料/基础资料/Gy_DotCheckItemMethodEdit.html          |  194 
 WebTM/views/模治具管理/模治具点检保养/Sc_MouldDotCheckBill_PDA_OLD.html   |  555 ++
 WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html               |   63 
 WebTM/views/模治具管理/模治具点检保养/Sc_MouldDotCheckBill_PDA.html       | 1188 +++-
 WebTM/views/设备管理/Sb_EquipDotCheckPlanBillEdit.html            |   98 
 WebTM/views/基础资料/公用基础资料/Gy_MaintainLev.html                   |  706 +++
 WebTM/views/销售管理/发货通知单/Add_Edit_Xs_SeOutStockBillList.html    |  119 
 WebTM/WebTM.csproj.user                                       |   11 
 WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html               |   10 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_MaintainLev.html          |  279 +
 WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html        |  103 
 WebTM/views/设备管理/设备规程单/Sb_EquipDotCheckRuleEdit.html          |   88 
 WebTM/views/模治具管理/模具生产领用单/Sc_MouldProdOutBill_PDA.html        | 1818 ++++++-
 WebTM/views/设备管理/Sb_EquipDotCheckBill_PDA.html                |  180 
 WebTM/views/项目管理/工程项目/PM_ProjectMoneyBillMain.html            |   70 
 WebTM/views/Baseset/基础资料/Gy_DepartmentList.html               |   42 
 WebTM/views/系统管理/用户管理/Xt_UserListEdit.html                    |    2 
 WebTM/views/项目管理/工程项目/PM_ProjectEndBillMain.html              |   65 
 WebTM/views/领料发货/分步式调出单/Fb_StepFoldOutBillList.html           |    1 
 59 files changed, 12,665 insertions(+), 1,318 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 5516c73..4d1d184 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -321,8 +321,22 @@
     <Content Include="views\鍝佽川绠$悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBill_KaiBei.html" />
     <Content Include="views\鍝佽川绠$悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBill.html" />
     <Content Include="views\鍝佽川绠$悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBillList.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_MaintainLev.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_PreventErrMould.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_ColorClassList.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaintainLev.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_PreventErrMould.html" />
+    <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemMethodEdit.html" />
+    <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemClassEdit.html" />
+    <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemMethodList.html" />
+    <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemClassList.html" />
+    <Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇棰嗙敤鍗昞Sc_MouldProdOutBill_PDA.html" />
+    <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldDotCheckBill_PDA.html" />
     <Content Include="views\鐢熶骇绠$悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackSignBill_BrushCard.html" />
+    <Content Include="views\璁惧绠$悊\璁惧鍋滄満鍗昞Sb_EquipStopBill.html" />
+    <Content Include="views\璁惧绠$悊\璁惧鍋滄満鍗昞Sb_EquipStopBillList.html" />
+    <Content Include="views\璁惧绠$悊\璁惧寮�鏈哄崟\Sb_EquipBeginBill.html" />
+    <Content Include="views\璁惧绠$悊\璁惧寮�鏈哄崟\Sb_EquipBeginBillList.html" />
     <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Kf_PressurizedWaterNoOutReport.html" />
     <Content Include="views\椤圭洰绠$悊\鍩虹寤烘ā\Add_Edit_Gy_TaskClass.html" />
     <Content Include="views\椤圭洰绠$悊\鍩虹寤烘ā\Add_Edit_Gy_ProjectClass.html" />
@@ -1381,7 +1395,7 @@
     <Content Include="views\妯℃不鍏风鐞哱妯″叿鏀瑰埗鍏ュ簱鍗昞Sc_MouldRepairInBill_PDA.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯″叿鏀瑰埗鍑哄簱鍗昞Sc_MouldRepairOutBill_PDA.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇閫�搴撳崟\Sc_MouldProdBackBill_PDA.html" />
-    <Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇棰嗙敤鍗昞Sc_MouldProdOutBill_PDA.html" />
+    <Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇棰嗙敤鍗昞Sc_MouldProdOutBill_PDA_old.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯″叿缁翠慨璁板綍鍗昞Sc_MouldRepairWorkBill_PDA.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯″叿鍏朵粬鍑哄簱鍗昞Sc_MouldOtherOutBill_PDA.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯″叿鍏朵粬鍏ュ簱鍗昞Sc_MouldOtherInBill_PDA.html" />
@@ -1421,7 +1435,7 @@
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldScrapRequestBillList.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldStatusChangeBill.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldStatusChangeBillList.html" />
-    <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldDotCheckBill_PDA.html" />
+    <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldDotCheckBill_PDA_OLD.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldMaintainBill_PDA.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱BatchGen_MouldFile.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_BarCodeBill_Out.html" />
@@ -1754,6 +1768,8 @@
     <Content Include="views\椤圭洰绠$悊\鍛ㄨ鍒抃PM_WorkReportWeekBillMainList.html" />
     <Content Include="views\椤圭洰绠$悊\鍛ㄨ鍒抃PM_WorkTaskWeekBillList.html" />
     <Content Include="views\椤圭洰绠$悊\鍛ㄨ鍒抃PM_WorkTaskWeekBill.html" />
+    <Content Include="views\椤圭洰绠$悊\鍩虹寤烘ā\Gy_ProjectClass.html" />
+    <Content Include="views\椤圭洰绠$悊\鍩虹寤烘ā\Gy_TaskClass.html" />
     <Content Include="views\椤圭洰绠$悊\宸ヤ綔浠诲姟\PM_WorkTaskMoneyBillList.html" />
     <Content Include="views\椤圭洰绠$悊\宸ヤ綔浠诲姟\PM_WorkTaskMoneyBill.html" />
     <Content Include="views\椤圭洰绠$悊\宸ヤ綔浠诲姟\PM_WorkTaskReportBillList.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index ebfee46..005e8c8 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,9 +1,9 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
     <ProjectView>ProjectFiles</ProjectView>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
@@ -16,8 +16,9 @@
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
         <WebProjectProperties>
-          <StartPageUrl>views/user/login.html</StartPageUrl>
-          <StartAction>SpecificPage</StartAction>
+          <StartPageUrl>
+          </StartPageUrl>
+          <StartAction>CurrentPage</StartAction>
           <AspNetDebugging>True</AspNetDebugging>
           <SilverlightDebugging>False</SilverlightDebugging>
           <NativeDebugging>False</NativeDebugging>
@@ -31,7 +32,7 @@
           <StartWorkingDirectory>
           </StartWorkingDirectory>
           <EnableENC>True</EnableENC>
-          <AlwaysStartWebServerOnDebug>True</AlwaysStartWebServerOnDebug>
+          <AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
         </WebProjectProperties>
       </FlavorProperties>
     </VisualStudio>
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
index c7f3304..a08197c 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
@@ -34,12 +34,18 @@
     <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
     <script>
         layui.use(['table', 'form', 'layer'], function () {
             var table = layui.table
                 , form = layui.form
                 , layer = layui.layer
                 , $ = layui.$;
+            var params = get_UrlVars();
+            var Type = params[params[0]];
+            if (Type == undefined || Type == '') {
+                Type = "HDept1";
+            }
 
             form.on('submit(HQuery)', function () {//閫夋嫨浠撳簱
                 //var sMainStr = JSON.stringify(table.cache['mainTable']);
@@ -53,26 +59,36 @@
                 }
             });
 
-            form.on('submit(FH)', function () {//閫夋嫨浠撳簱
-                //var sMainStr = JSON.stringify(table.cache['mainTable']);
-                var checkStatus = table.checkStatus('mainTable')
-                 , data = checkStatus.data;
-                parent.GetHDeptNameValue(data);
+            form.on('submit(FH)', function () {//閫夋嫨閮ㄩ棬
                 var index = parent.layer.getFrameIndex(window.name);
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (data.length == 0) {
+                    parent.layer.close(index);
+                    return;
+                }
+                switch (Type) {
+                    case "HDept1":
+                        parent.GetHDeptNameValue(data);
+                        break;
+                    case "HDept2":
+                        parent.GetHDeptName2Value(data);
+                        break;
+                }
                 parent.layer.close(index);
             });
             RoadQuery($('#Value').val());
             table.render({
                 elem: '#mainTable'
                 // , url: '/demo/table/user/'
-               , data: []
-              , cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
-              , cols: [[
-                  { type: 'checkbox' }
-                , { field: 'HItemID', title: '閮ㄩ棬ID', hide: true }
-                , { field: 'HNumber', title: '閮ㄩ棬浠g爜' }
-                , { field: 'HName', title: '閮ㄩ棬鍚嶇О', sort: true }
-              ]]
+                , data: []
+                , cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+                , cols: [[
+                    { type: 'checkbox' }
+                    , { field: 'HItemID', title: '閮ㄩ棬ID', hide: true }
+                    , { field: 'HNumber', title: '閮ㄩ棬浠g爜' }
+                    , { field: 'HName', title: '閮ㄩ棬鍚嶇О', sort: true }
+                ]]
                 , page: true
                 , limits: [50, 500, 5000, 50000],
                 limit: 50
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index 585050a..293938b 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -275,6 +275,18 @@
                               涓嬫ā鍗曟煡璇�
                           </a>
                       </dd>
+                      <dd>
+                          <a href="妯℃不鍏风鐞�/妯″叿鐢熶骇棰嗙敤鍗�/Sc_MouldProdOutBill_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="妯℃不鍏风鐞�/妯℃不鍏风偣妫�淇濆吇/Sc_MouldDotCheckBill_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>
                   </dl>
               </li>
               <!-- 妯℃不鍏风鐞� -->
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Add_Edit_Kf_MoveStockBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Add_Edit_Kf_MoveStockBill.html"
index 091b397..e8a956b 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Add_Edit_Kf_MoveStockBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Add_Edit_Kf_MoveStockBill.html"
@@ -354,7 +354,7 @@
 
             var allVal;
             //鍙屽嚮杩斿洖鍏ㄥ眬鍙橀噺
-            window.OptionData = {};
+            window.OptionData = [];
             //#endregion
 
 
@@ -431,8 +431,8 @@
             //#endregion
 
             var rowdata = [{
-                "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HPropertyID": "0", "杈呭姪灞炴��": "", "HSecUnitRate": "", "HUnitID": 0, "璁¢噺鍗曚綅": "", "HRemark": "",
-                "HOutPrice": "0", "HOutMoney": "0", "HQtyMust": "", "HQty": "", "HPrice": "0", "HMoney": "0", "HWHID": 0, "璋冨叆浠撳簱": "", "HSCWHID": 0, "璋冨嚭浠撳簱": "",
+                "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HPropertyID": "0", "杈呭姪灞炴��": "", "HSecUnitRate": "1", "HUnitID": 0, "璁¢噺鍗曚綅": "", "HRemark": "",
+                "HOutPrice": "0", "HOutMoney": "0", "HQtyMust": "0", "HQty": "0", "HPrice": "0", "HMoney": "0", "HWHID": 0, "璋冨叆浠撳簱": "", "HSCWHID": 0, "璋冨嚭浠撳簱": "",
                 "HSPID": 0, "HSPGroupID": 0, "浠撲綅鍚嶇О": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
                 "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
                 "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
@@ -446,8 +446,8 @@
                     , data = checkStatus.data;
                 //鏂板琛岃〃鏍兼暟鎹�
                 var NewRow = {
-                    "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HPropertyID": "0", "杈呭姪灞炴��": "", "HSecUnitRate": "", "HUnitID": 0, "璁¢噺鍗曚綅": "", "HRemark": "",
-                    "HOutPrice": "0", "HOutMoney": "0", "HQtyMust": "", "HQty": "", "HPrice": "0", "HMoney": "0", "HWHID": 0, "璋冨叆浠撳簱": "", "HSCWHID": 0, "璋冨嚭浠撳簱": "",
+                    "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HPropertyID": "0", "杈呭姪灞炴��": "", "HSecUnitRate": "1", "HUnitID": 0, "璁¢噺鍗曚綅": "", "HRemark": "",
+                    "HOutPrice": "0", "HOutMoney": "0", "HQtyMust": "0", "HQty": "0", "HPrice": "0", "HMoney": "0", "HWHID": 0, "璋冨叆浠撳簱": "", "HSCWHID": 0, "璋冨嚭浠撳簱": "",
                     "HSPID": 0, "HSPGroupID": 0, "浠撲綅鍚嶇О": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
                     "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
                     "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
@@ -1209,18 +1209,17 @@
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
                                 , end: function () {
-                                    //if (OptionData.length>0) {
-                                    //    OptionData = [];
-                                    //}
-                                    obj.update({
-                                        "HMaterID": OptionData.HItemID
-                                        , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
-                                        , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
-                                        , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
-                                        , "HUnitID": OptionData.HUnitID
-                                        , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
-                                    })
-                                    
+                                    if (OptionData != null && OptionData.length == undefined) {
+                                        obj.update({
+                                            "HMaterID": OptionData.HItemID
+                                            , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
+                                            , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+                                            , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+                                            , "HUnitID": OptionData.HUnitID
+                                            , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
+                                        })
+                                        OptionData = [];
+                                    }
                                 }
                             });
                         }
@@ -1252,14 +1251,14 @@
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
                                 , end: function () {
-                                    //if (OptionData.length > 0) {
-                                    //    OptionData = [];
-                                    //}
-                                    obj.update({
-                                        "HPropertyID": OptionData.HItemID
-                                        , "杈呭姪灞炴��": OptionData.杈呭姪灞炴�у悕绉�
-                                    })
-                            }
+                                    if (OptionData != null && OptionData.length == undefined) {
+                                        obj.update({
+                                            "HPropertyID": OptionData.HItemID
+                                            , "杈呭姪灞炴��": OptionData.杈呭姪灞炴�у悕绉�
+                                        })
+                                        OptionData = [];
+                                    }
+                                }
                             })
                         }
                         //璁¢噺鍗曚綅
@@ -1272,7 +1271,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -1333,15 +1332,14 @@
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
                                 , end: function () {
-                                    //if (OptionData.length > 0) {
-                                    //    OptionData = [];
-                                    //}
-                                    obj.update({
-                                        "HWHID": OptionData.HItemID
-                                        , "璋冨叆浠撳簱": OptionData.浠撳簱鍚嶇О
-                                    })
-                                
-                            }
+                                    if (OptionData != null && OptionData.length == undefined) {
+                                        obj.update({
+                                            "HWHID": OptionData.HItemID
+                                            , "璋冨叆浠撳簱": OptionData.浠撳簱鍚嶇О
+                                        })
+                                        OptionData = [];
+                                    }
+                                }
                             })
                             
                         }
@@ -1374,14 +1372,13 @@
                                         layer.close(index);//鍏抽棴寮圭獥
                                     }
                                     , end: function () {
-                                        //if (OptionData.length > 0) {
-                                        //    OptionData = [];
-                                        //}
-                                        obj.update({
-                                            "HSCWHID": OptionData.HItemID
-                                            , "璋冨嚭浠撳簱": OptionData.浠撳簱鍚嶇О
-                                        })
-                                       
+                                        if (OptionData != null && OptionData.length == undefined) {
+                                            obj.update({
+                                                "HSCWHID": OptionData.HItemID
+                                                , "璋冨嚭浠撳簱": OptionData.浠撳簱鍚嶇О
+                                            })
+                                            OptionData = [];
+                                        }
                                     }
                                 })
                             }
@@ -1414,15 +1411,14 @@
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
                                 , end: function () {
-                                    //if (OptionData.length > 0) {
-                                    //    OptionData = [];
-                                    //}
-                                    obj.update({
-                                        "HSPID": OptionData.HMainID
-                                        , "浠撲綅鍚嶇О": OptionData.浠撲綅鍚嶇О
-                                    })
-                               
-                            }
+                                    if (OptionData != null && OptionData.length == undefined) {
+                                        obj.update({
+                                            "HSPID": OptionData.HMainID
+                                            , "浠撲綅鍚嶇О": OptionData.浠撲綅鍚嶇О
+                                        })
+                                        optiondata = [];
+                                    }
+                                }
                             })
                         }
                        
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillEdit.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillEdit.html"
index 1c4612a..b83c602 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillEdit.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillEdit.html"
@@ -96,7 +96,7 @@
                                             </div>
                                         </div>
                                         <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">渚涘簲鍟�</label>
+                                            <label class="layui-form-label">渚涘簲鍟�<label style="color:red"> * </label></label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
                                                 <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -106,7 +106,7 @@
                                             </div>
                                         </div>
                                         <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">浠撶鍛�</label>
+                                            <label class="layui-form-label">浠撶鍛�<label style="color:red"> * </label></label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
                                                 <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -118,7 +118,7 @@
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">璐熻矗浜�</label>
+                                            <label class="layui-form-label">璐熻矗浜�<label style="color:red"> * </label></label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
                                                 <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -128,7 +128,7 @@
                                             </div>
                                         </div>
                                         <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">璋冨叆浠撳簱</label>
+                                            <label class="layui-form-label">璋冨叆浠撳簱<label style="color:red"> * </label></label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
                                                 <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -138,7 +138,7 @@
                                             </div>
                                         </div>
                                         <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">璋冨嚭浠撳簱</label>
+                                            <label class="layui-form-label">璋冨嚭浠撳簱<label style="color:red"> * </label></label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HSCWHName" id="HSCWHName" class="layui-input" value="" style="float:left;width:150px;">
                                                 <input type="hidden" name="HSCWHID" id="HSCWHID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -150,7 +150,7 @@
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">楠屾敹</label>
+                                            <label class="layui-form-label">楠屾敹<label style="color:red"> * </label></label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
                                                 <input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -160,7 +160,7 @@
                                             </div>
                                         </div>
                                         <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">淇濈鍛�</label>
+                                            <label class="layui-form-label">淇濈鍛�<label style="color:red"> * </label></label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
                                                 <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -170,7 +170,7 @@
                                             </div>
                                         </div>
                                         <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">閮ㄩ棬</label>
+                                            <label class="layui-form-label">閮ㄩ棬<label style="color:red"> * </label></label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
                                                 <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -311,7 +311,7 @@
             var shijian = year + "-" + month + "-" + day;
             var allVal;
             //鍙屽嚮杩斿洖鍏ㄥ眬鍙橀噺
-            window.OptionData = {};
+            window.OptionData = [];
             //#endregion
 
 
@@ -552,6 +552,109 @@
                 table.render(option);
             }
 
+            //#region 鐩戝惉鍗曞厓鏍肩紪杈�  鍗曞厓鏍肩紪杈戝悗 鍙樻洿
+            table.on('edit(mainTable)', function (obj) {
+                //鏁板�兼牸寮忔牎楠屽伐鍏�
+                var ref = /^\d+(\.\d+)?$/;          //闈炶礋鏁版鍒欒〃杈惧紡
+                var temp = "";
+
+                // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+                var oldText = $(this).prev().text();
+                var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+                    , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+                    , field = obj.field; //寰楀埌瀛楁
+
+                switch (field) {
+                    case "HQty":                                         //鏁伴噺
+                        //鏁版嵁鏍煎紡鏍¢獙
+                        temp = value + "";
+                        if (!ref.test(temp) || temp == 0) {
+                            //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                            obj.update({
+                                HQty: oldText
+                            });
+                            table.render(option);
+
+                            layer.msg("鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+                            return;
+                        }
+
+
+                        //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                        var HQty = value * 1;                           //鏁伴噺
+                        var HPrice = obj.data.HPrice * 1;               //鍗曚环
+                        var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
+
+
+
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HQty: HQty
+                            , HPrice: HPrice
+                            , HMoney: HMoney
+                        });
+                        /* table.render(option);*/
+                        break;
+                    case "HPrice":                                         //鍗曚环
+                        //鏁版嵁鏍煎紡鏍¢獙
+                        temp = value + "";
+                        if (!ref.test(temp) || temp == 0) {
+                            //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                            obj.update({
+                                HPrice: oldText
+                            });
+                            /* table.render(option);*/
+
+                            layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+                            return;
+                        }
+
+                        //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                        var HQty = obj.data.HQty * 1;                   //鏁伴噺
+                        var HPrice = value * 1;
+                        var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
+
+
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HQty: HQty
+                            , HPrice: HPrice
+                            , HMoney: HMoney
+                        });
+                        break;
+                    case "HMoney":                                         //閲戦
+                        //鏁版嵁鏍煎紡鏍¢獙
+                        temp = value + "";
+                        if (!ref.test(temp) || temp == 0) {
+                            //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                            obj.update({
+                                HMoney: oldText
+                            });
+                            /* table.render(option);*/
+
+                            layer.msg("閲戦璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+                            return;
+                        }
+
+                        //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                        var HQty = obj.data.HQty * 1;                   //鏁伴噺
+                        var HMoney = value * 1;
+                        var HPrice = (HMoney / HQty).toFixed(2);       //鍗曚环=閲戦/鏁伴噺
+
+
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HQty: HQty
+                            , HPrice: HPrice
+                            , HMoney: HMoney
+                        });
+                        break;
+                        table.render(option);
+                    default:
+                }
+            });
+            //#endregion
+
             //#region 鍔犺浇琛ㄥご
             function RoadBillMain(linterid) {
                 //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
@@ -651,7 +754,30 @@
             //#region 淇濆瓨鏂规硶
             function set_SaveBill(data) {
 
-
+                if ($("#HSupID").val() == 0) {
+                    layer.msg("璇烽�夋嫨渚涘簲鍟嗭紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if ($("#HEmpID").val() == 0) {
+                    layer.msg("璇烽�夋嫨浠撶鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if ($("#HManagerID").val() == 0) {
+                    layer.msg("璇烽�夋嫨璐熻矗浜猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if ($("#HSecManagerID").val() == 0) {
+                    layer.msg("璇烽�夋嫨楠屾敹鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if ($("#HKeeperID").val() == 0) {
+                    layer.msg("璇烽�夋嫨淇濈鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if ($("#HDeptID").val() == 0) {
+                    layer.msg("璇烽�夋嫨閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
                 if ($("#HWHID").val() == 0) {
                     layer.msg("璇烽�夋嫨璋冨叆浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
@@ -670,24 +796,24 @@
                     }
                 }
 
-                checkDuplicateData(num);
-                const duplicateRows = checkDuplicateData(num);
-                if (duplicateRows.length > 0) {
-                    let message = '琛ㄦ牸涓瓨鍦ㄩ噸澶嶆暟鎹紝閲嶅琛屾暟涓猴細';
+                //checkDuplicateData(num);
+                //const duplicateRows = checkDuplicateData(num);
+                //if (duplicateRows.length > 0) {
+                //    let message = '琛ㄦ牸涓瓨鍦ㄩ噸澶嶆暟鎹紝閲嶅琛屾暟涓猴細';
 
-                    for (let i = 0; i < duplicateRows.length; i++) {
-                        const { row1, row2 } = duplicateRows[i];
-                        message += `绗�${row1}琛屼笌绗�${row2}琛岀浉鍚宍;
+                //    for (let i = 0; i < duplicateRows.length; i++) {
+                //        const { row1, row2 } = duplicateRows[i];
+                //        message += `绗�${row1}琛屼笌绗�${row2}琛岀浉鍚宍;
 
-                        if (i !== duplicateRows.length - 1) {
-                            message += '锛�';
-                        }
-                    }
+                //        if (i !== duplicateRows.length - 1) {
+                //            message += '锛�';
+                //        }
+                //    }
 
-                    message += '锛岃鍒犻櫎鍏朵腑涓�琛�';
-                    layer.alert(message);
-                    return;
-                }
+                //    message += '锛岃鍒犻櫎鍏朵腑涓�琛�';
+                //    layer.alert(message);
+                //    return;
+                //}
 
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(num);
@@ -759,17 +885,18 @@
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
                                 , end: function () {
-                                    //if (OptionData.length>0) {
-                                    //    OptionData = [];
-                                    //}
-                                    obj.update({
-                                        "HMaterID": OptionData.HItemID
-                                        , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
-                                        , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
-                                        , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
-                                        , "HUnitID": OptionData.HUnitID
-                                        , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
-                                    })
+                                    if (OptionData != null && OptionData.length == undefined) {
+                                        obj.update({
+                                            "HMaterID": OptionData.HItemID
+                                            , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
+                                            , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+                                            , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+                                            , "HUnitID": OptionData.HUnitID
+                                            , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
+                                        })
+                                        OptionData = [];
+                                    }
+                                   
                                     
                                 }
                             })
@@ -880,13 +1007,14 @@
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
                                 , end: function () {
-                                    //if (OptionData.length > 0) {
-                                    //    OptionData = [];
-                                    //}
-                                    obj.update({
-                                        "HWHID": OptionData.HItemID
-                                        , "璋冨叆浠撳簱": OptionData.浠撳簱鍚嶇О
-                                    })
+                                    if (OptionData != null && OptionData.length == undefined) {
+                                        obj.update({
+                                            "HWHID": OptionData.HItemID
+                                            , "璋冨叆浠撳簱": OptionData.浠撳簱鍚嶇О
+                                        })
+                                        OptionData = [];
+                                    }
+                                    
                                 
                             }
                             })
@@ -919,13 +1047,14 @@
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
                                 , end: function () {
-                                    //if (OptionData.length > 0) {
-                                    //    OptionData = [];
-                                    //}
-                                    obj.update({
-                                        "HSCWHID": OptionData.HItemID
-                                        , "璋冨嚭浠撳簱": OptionData.浠撳簱鍚嶇О
-                                    })
+                                    if (OptionData != null && OptionData.length == undefined) {
+                                        obj.update({
+                                            "HSCWHID": OptionData.HItemID
+                                            , "璋冨嚭浠撳簱": OptionData.浠撳簱鍚嶇О
+                                        })
+                                        OptionData = [];
+                                    }
+                                   
                                
                             }
                             })
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_MaintainLev.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_MaintainLev.html"
new file mode 100644
index 0000000..8d5a83a
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_MaintainLev.html"
@@ -0,0 +1,279 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鏂板/缂栬緫淇濆吇绾у埆</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+
+                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+
+                            </div>
+
+                        </div>
+                        <div class="layui-card-body">
+                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                             
+                                <h1 style="text-align:center;"><b>淇濆吇绾у埆</b></h1>
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">浠g爜锛�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
+                                                    <input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">鍚嶇О锛�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HName" id="HName" autocomplete="off">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">鍔╄鐮侊細</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label" style="width: 120px">浣跨敤缁勭粐锛�</label>
+                                            <div class="layui-input-inline">
+                                                <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+                                                </select>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">浣跨敤鐘舵�侊細</label>
+                                                <div class="layui-input-inline">
+                                                    <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag">
+                                                        <option value="鏈娴�" selected>鏈娴�</option>
+                                                        <option value="鏈娇鐢�">鏈娇鐢�</option>
+                                                        <option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
+                                                    </select>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px"> 绂佺敤鏍囧織:</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value="">
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-col-xs11">
+                                                <label class="layui-form-label"> 澶囨敞锛�</label>
+                                                <div class="layui-input-block">
+                                                    <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script>
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+        }
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+            //#endregion
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
+            }
+            else if (OperationType == 3) {//缂栬緫
+                set_EditFromGrid();
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {//淇濆瓨
+
+                var isEndCheck = document.getElementById("HStopflag").checked;
+                isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+
+                var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
+                $.ajax(
+                    {
+                        type: "POST",
+                        url: GetWEBURL() + "SaveGy_MaintainLevList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: { "msg": sMainStr },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                layer.msg(data.Message, { icon: 1 });
+                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                            }
+                            else {
+                                f_alert(data.Message);
+                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                            }
+                            layer.closeAll("loading");
+                        },
+                        error: function (err) {
+
+                            f_alert("閿欒:" + err);
+                            console.log("Reason" + sMainStr);
+                        }
+                    });
+            });
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {//
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
+            });
+           
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+            //#endregion
+
+
+            //#region 褰撳墠椤甸潰闈㈡墍鏈夌殑鏂规硶
+
+            //鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                Organ();
+            }
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                $("#HItemID").val("0");
+                $("#HNumber").val("");
+            }
+            //缂栬緫
+            function set_EditFromGrid() {
+                $("#HItemID").val(linterid);
+                set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
+            }
+            //缂栬緫鍔犺浇琛ㄥご
+            function set_EditForm(linterid) {
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                $.ajax({
+                    url: GetWEBURL() + "GetGy_MaintainLevDetail",
+                    type: "GET",
+                    data: {
+                        "HID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data.h_v_Gy_MaintainLev[0];
+                            $("#HItemID").val(data.HItemID);//浠g爜ID
+                            $("#HNumber").val(data.淇濆吇绾у埆浠g爜);//浠g爜
+                            $("#HName").val(data.淇濆吇绾у埆鍚嶇О);//鍚嶇О
+                            $("#HHelpCode").val(data.鍔╄鐮�);//鍔╄鐮�
+                            $("#HUSEORGID").val(data.鍒涘缓缁勭粐);//浣跨敤缁勭粐
+                            $("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵��
+                            $("#HRemark").val(data.澶囨敞);//澶囨敞
+                            $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織 == "鏄�" ? true : false);//true:閫変腑 false:涓嶉�変腑
+                            layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+            
+            //
+            function f_alert(sMsg) {
+                layer.alert(sMsg, { icon: 5 });
+
+            }
+             //鑾峰彇鐧诲綍椤电粍缁囧垪
+            function Organ() {
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HUSEORGID").append(Organization);
+                            $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+            //#endregion
+        });
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_PreventErrMould.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_PreventErrMould.html"
new file mode 100644
index 0000000..1736546
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_PreventErrMould.html"
@@ -0,0 +1,279 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鏂板/缂栬緫闃查敊瑁呯疆</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+
+                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+
+                            </div>
+
+                        </div>
+                        <div class="layui-card-body">
+                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                             
+                                <h1 style="text-align:center;"><b>闃查敊瑁呯疆</b></h1>
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">浠g爜锛�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
+                                                    <input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">鍚嶇О锛�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HName" id="HName" autocomplete="off">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">鍔╄鐮侊細</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label" style="width: 120px">浣跨敤缁勭粐锛�</label>
+                                            <div class="layui-input-inline">
+                                                <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+                                                </select>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">浣跨敤鐘舵�侊細</label>
+                                                <div class="layui-input-inline">
+                                                    <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag">
+                                                        <option value="鏈娴�" selected>鏈娴�</option>
+                                                        <option value="鏈娇鐢�">鏈娇鐢�</option>
+                                                        <option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
+                                                    </select>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px"> 绂佺敤鏍囧織:</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value="">
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-col-xs11">
+                                                <label class="layui-form-label"> 澶囨敞锛�</label>
+                                                <div class="layui-input-block">
+                                                    <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script>
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+        }
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+            //#endregion
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
+            }
+            else if (OperationType == 3) {//缂栬緫
+                set_EditFromGrid();
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {//淇濆瓨
+
+                var isEndCheck = document.getElementById("HStopflag").checked;
+                isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+
+                var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
+                $.ajax(
+                    {
+                        type: "POST",
+                        url: GetWEBURL() + "SaveGy_PreventErrMouldList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: { "msg": sMainStr },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                layer.msg(data.Message, { icon: 1 });
+                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                            }
+                            else {
+                                f_alert(data.Message);
+                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                            }
+                            layer.closeAll("loading");
+                        },
+                        error: function (err) {
+
+                            f_alert("閿欒:" + err);
+                            console.log("Reason" + sMainStr);
+                        }
+                    });
+            });
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {//
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
+            });
+           
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+            //#endregion
+
+
+            //#region 褰撳墠椤甸潰闈㈡墍鏈夌殑鏂规硶
+
+            //鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                Organ();
+            }
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                $("#HItemID").val("0");
+                $("#HNumber").val("");
+            }
+            //缂栬緫
+            function set_EditFromGrid() {
+                $("#HItemID").val(linterid);
+                set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
+            }
+            //缂栬緫鍔犺浇琛ㄥご
+            function set_EditForm(linterid) {
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                $.ajax({
+                    url: GetWEBURL() + "GetGy_PreventErrMouldDetail",
+                    type: "GET",
+                    data: {
+                        "HID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data.h_v_Gy_PreventErrMould[0];
+                            $("#HItemID").val(data.HItemID);//浠g爜ID
+                            $("#HNumber").val(data.闃查敊瑁呯疆浠g爜);//浠g爜
+                            $("#HName").val(data.闃查敊瑁呯疆鍚嶇О);//鍚嶇О
+                            $("#HHelpCode").val(data.鍔╄鐮�);//鍔╄鐮�
+                            $("#HUSEORGID").val(data.鍒涘缓缁勭粐);//浣跨敤缁勭粐
+                            $("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵��
+                            $("#HRemark").val(data.澶囨敞);//澶囨敞
+                            $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織 == "鏄�" ? true : false);//true:閫変腑 false:涓嶉�変腑
+                            layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+            
+            //
+            function f_alert(sMsg) {
+                layer.alert(sMsg, { icon: 5 });
+
+            }
+             //鑾峰彇鐧诲綍椤电粍缁囧垪
+            function Organ() {
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HUSEORGID").append(Organization);
+                            $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+            //#endregion
+        });
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainLev.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_MaintainLev.html"
new file mode 100644
index 0000000..7b1f7da
--- /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_MaintainLev.html"
@@ -0,0 +1,706 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>淇濆吇绾у埆</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/HideButton.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">淇濆吇绾у埆浠g爜</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">淇濆吇绾у埆鍚嶇О</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HName" id="HName">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="AddButton"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="EditButton"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="DeleteButton"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="AuditButton"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="DeAuditButton"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="StopButton"> <i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="DeStopButton"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideButton"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="ExitButton"><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 HModName = "Gy_MaintainLev";
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["HItemID", "鐭唬鐮伮�","鐖剁骇ID", "绛夌骇", "鏈骇鏍囧織", "鍔╄鐮�", "鍒涘缓缁勭粐"];
+
+
+            var ins;                        //鐢ㄤ簬瀵煎嚭excel
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus(obj.config.id);
+                switch (obj.event) {
+                    //鏂板
+                    case 'btn-Add': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'btn-Edit': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'btn-Delete': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit':
+                        set_CheckBill(0);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_CheckBill(1);
+                        break;
+                    //绂佺敤鎸夐挳
+                    case 'btn-Stop':
+                        set_De_Stop(0);
+                        break;
+                    //鍙嶇鐢ㄦ寜閽�
+                    case 'btn-DeStop':
+                        set_De_Stop(1);
+                        break;
+                    //瀵煎嚭excel
+                    case 'get_export':
+                        get_Export();
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumn();
+                        break;
+                    case 'set_HideButton':
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        var HBillType = "Gy_MaintainLev";
+                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+                        break;
+                };
+            });
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery( );
+            });
+            // 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+            //#endregion
+        
+            //#region 鍙屽嚮杩斿洖鏁版嵁
+            table.on('rowDouble(mainTable)', function (obj) {
+                var data = [];
+                data.push(obj.data);
+                parent.GetMaintainLevValue(data);
+                var index = parent.layer.getFrameIndex(window.name);
+                 btnrowDouble(obj);
+            });
+           
+            function btnrowDouble(obj) {
+                var index = parent.layer.getFrameIndex(window.name);
+                var data = obj.data;
+               //杩斿洖鏂规硶
+                parent.GetMaintainLevValue(data);
+                parent.layer.close(index);
+            }
+             //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                get_FastQuery();
+
+            }
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , limits: [50, 500, 5000, 50000]
+                    , limit: 50
+                    , cellMinWidth: 90
+                   
+                };
+            }
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var index = layer.load(0, { shade: false });
+                var ajaxLoad = layer.load();
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    
+                    url: GetWEBURL() + '/Gy_BadReason/Gy_MaintainLevList',
+                    type: "GET",
+                    async:false,
+                    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
+                            }
+                            ins = table.render(option);
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                            var HBillType = "Gy_MaintainLev";
+                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            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 });
+                    }
+                });
+                layer.close(index);
+            }
+            //蹇�熸煡璇�
+            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缂撳瓨
+            }
+            //閲嶇疆蹇�熸煡璇�
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                $("#btnSearch").click();
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                form.render('select');
+
+                sWhere = "";
+            }
+            //鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").trigger('click');
+            }
+
+            //#region 瀵煎嚭Execel
+            function get_Export() {
+                var ModRightNameCheck = "Gy_MaintainLev_ExportExcel";
+
+                //閫昏緫瀹℃牳鏂规硶
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            table.exportFile(ins.config.id, option.data, "xls");
+                        } else {
+                            layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板淇濆吇绾у埆',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_MaintainLev.html?OperationType=1&linterid=&HSouceBillType=',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].HItemID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫淇濆吇绾у埆'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_MaintainLev.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HItemID = data[0].HItemID.toString();
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "DeltetGy_MaintainLev", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HItemID": 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();
+                                    });
+
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+            function set_CheckBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HItemID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_BadReason/AuditGy_MaintainLev", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶇鐢�/绂佺敤鏁版嵁
+            function set_De_Stop(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HItemID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_BadReason/StopGy_MaintainLev", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+          
+            //#region 闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                var contentUrl = "";
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+                var urlLen = urlStr.split('/');
+                for (var i = 0; i < urlLen.length - 4; i++) {
+                    contentUrl += "../";
+                }
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: [contentUrl, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    async: false,
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                          
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 1; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                              
+                                //鏄剧ず鍒�
+                                if (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\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PreventErrMould.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_PreventErrMould.html"
new file mode 100644
index 0000000..4febf05
--- /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_PreventErrMould.html"
@@ -0,0 +1,706 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>闃查敊瑁呯疆</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/HideButton.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">闃查敊瑁呯疆浠g爜</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">闃查敊瑁呯疆鍚嶇О</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HName" id="HName">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="AddButton"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="EditButton"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="DeleteButton"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="AuditButton"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="DeAuditButton"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="StopButton"> <i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="DeStopButton"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideButton"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="ExitButton"><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 HModName = "Gy_PreventErrMould";
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["HItemID", "鐭唬鐮伮�","鐖剁骇ID", "绛夌骇", "鏈骇鏍囧織", "鍔╄鐮�", "鍒涘缓缁勭粐"];
+
+
+            var ins;                        //鐢ㄤ簬瀵煎嚭excel
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus(obj.config.id);
+                switch (obj.event) {
+                    //鏂板
+                    case 'btn-Add': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'btn-Edit': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'btn-Delete': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit':
+                        set_CheckBill(0);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_CheckBill(1);
+                        break;
+                    //绂佺敤鎸夐挳
+                    case 'btn-Stop':
+                        set_De_Stop(0);
+                        break;
+                    //鍙嶇鐢ㄦ寜閽�
+                    case 'btn-DeStop':
+                        set_De_Stop(1);
+                        break;
+                    //瀵煎嚭excel
+                    case 'get_export':
+                        get_Export();
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumn();
+                        break;
+                    case 'set_HideButton':
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        var HBillType = "Gy_PreventErrMould";
+                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+                        break;
+                };
+            });
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery( );
+            });
+            // 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+            //#endregion
+        
+            //#region 鍙屽嚮杩斿洖鏁版嵁
+            table.on('rowDouble(mainTable)', function (obj) {
+                var data = [];
+                data.push(obj.data);
+                parent.GetPreventErrMouldValue(data);
+                var index = parent.layer.getFrameIndex(window.name);
+                 btnrowDouble(obj);
+            });
+           
+            function btnrowDouble(obj) {
+                var index = parent.layer.getFrameIndex(window.name);
+                var data = obj.data;
+               //杩斿洖鏂规硶
+                parent.GetPreventErrMouldValue(data);
+                parent.layer.close(index);
+            }
+             //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                get_FastQuery();
+
+            }
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , limits: [50, 500, 5000, 50000]
+                    , limit: 50
+                    , cellMinWidth: 90
+                   
+                };
+            }
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var index = layer.load(0, { shade: false });
+                var ajaxLoad = layer.load();
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    
+                    url: GetWEBURL() + '/Gy_BadReason/Gy_PreventErrMouldList',
+                    type: "GET",
+                    async:false,
+                    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
+                            }
+                            ins = table.render(option);
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                            var HBillType = "Gy_PreventErrMould";
+                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            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 });
+                    }
+                });
+                layer.close(index);
+            }
+            //蹇�熸煡璇�
+            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缂撳瓨
+            }
+            //閲嶇疆蹇�熸煡璇�
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                $("#btnSearch").click();
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                form.render('select');
+
+                sWhere = "";
+            }
+            //鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").trigger('click');
+            }
+
+            //#region 瀵煎嚭Execel
+            function get_Export() {
+                var ModRightNameCheck = "Gy_PreventErrMould_ExportExcel";
+
+                //閫昏緫瀹℃牳鏂规硶
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            table.exportFile(ins.config.id, option.data, "xls");
+                        } else {
+                            layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板闃查敊瑁呯疆',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_PreventErrMould.html?OperationType=1&linterid=&HSouceBillType=',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].HItemID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫闃查敊瑁呯疆'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_PreventErrMould.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HItemID = data[0].HItemID.toString();
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "DeltetGy_PreventErrMould", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HItemID": 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();
+                                    });
+
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+            function set_CheckBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HItemID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_BadReason/AuditGy_PreventErrMould", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶇鐢�/绂佺敤鏁版嵁
+            function set_De_Stop(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HItemID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_BadReason/StopGy_PreventErrMould", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+          
+            //#region 闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                var contentUrl = "";
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+                var urlLen = urlStr.split('/');
+                for (var i = 0; i < urlLen.length - 4; i++) {
+                    contentUrl += "../";
+                }
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: [contentUrl, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    async: false,
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                          
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 1; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                              
+                                //鏄剧ず鍒�
+                                if (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_DotCheckEdit.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_DotCheckEdit.html"
index e13c352..4edd8fd 100644
--- "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_DotCheckEdit.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_DotCheckEdit.html"
@@ -29,12 +29,9 @@
                     <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                         <div class="layui-card-header">
                             <div class="layui-btn-group">
-
                                 <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
                                 <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
-
                             </div>
-
                         </div>
                         <div class="layui-card-body">
                             <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
@@ -64,6 +61,18 @@
                                                 <label class="layui-form-label">澶囨敞</label>
                                                 <div class="layui-input-inline">
                                                     <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+                                                </div>
+                                            </div>                                            
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鐐规椤圭洰<br />鍒嗙被</label>
+                                                <div class="layui-input-inline" style="margin-top:10px;">
+                                                    <input type="text" readonly name="HDotCheckItemClassName" id="HDotCheckItemClassName" class="layui-input" value="" style="float: left; width: 150px;">
+                                                    <input type="hidden" name="HDotCheckItemClassID" id="HDotCheckItemClassID" class="layui-input" value="0" style="float:left;">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHDotCheckItemClass" id="btnHDotCheckItemClass" style="width:40px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                    </button>
                                                 </div>
                                             </div>
                                         </div>
@@ -125,12 +134,14 @@
                     success: function (d) {
 
                         ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
-                        $("#HNumber").val(d.data[0].HNumber);
-                        $("#HName").val(d.data[0].HName);
-                        $("#HHelpCode").val(d.data[0].HHelpCode);
-                        $("#HRemark").val(d.data[0].HRemark);
-                        $("#HLevel").val(d.data[0].HLevel);
-                        $("input[name='HStopflag']").prop("checked", d.data[0].HStopflag);//true:閫変腑 false:涓嶉�変腑
+                        $("#HNumber").val(d.data[0].鐐规椤圭洰浠g爜);
+                        $("#HName").val(d.data[0].鐐规椤圭洰鍚嶇О);
+                        $("#HHelpCode").val(d.data[0].鍔╄鐮�);
+                        $("#HRemark").val(d.data[0].澶囨敞);
+                        $("#HLevel").val(d.data[0].绛夌骇);
+                        $("#HDotCheckItemClassID").val(d.data[0].HDotCheckItemClassID);
+                        $("#HDotCheckItemClassName").val(d.data[0].鐐规椤圭洰鍒嗙被鍚嶇О);
+                        $("input[name='HStopflag']").prop("checked", d.data[0].绂佺敤鏍囪 == 'Y' ? true : false);//true:閫変腑 false:涓嶉�変腑
                         layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
                         $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
                         //table.reload(layTableId, {
@@ -142,7 +153,7 @@
             }
 
             //#region 宸ュ叿鎸夐挳
-            
+
             //閫�鍑烘寜閽�
             form.on('submit(Exit)', function (data) {
                 Pub_Close(1);
@@ -161,7 +172,7 @@
 
                 var oMain = JSON.stringify(data.field)
 
-                var sMainSub = oMain + ';' + user +';' + linterid ;
+                var sMainSub = oMain + ';' + user + ';' + linterid;
 
                 if (OperationType == 3) {
                     //淇敼
@@ -228,6 +239,34 @@
 
             //#endregion
 
+            //鐐规椤圭洰鍒嗙被
+            form.on('submit(btnHDotCheckItemClass)', function () {//
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']//澶у皬
+                    , title: '鐐规椤圭洰鍒嗙被鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemClassList.html', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HDotCheckItemClassName").val(checkStatus.data[0].鐐规椤圭洰鍒嗙被鍚嶇О);
+                        $("#HDotCheckItemClassID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            });
 
             function f_alert(sMsg) {
                 layer.alert(sMsg, { icon: 5 });
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_DotCheckItemClassEdit.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_DotCheckItemClassEdit.html"
new file mode 100644
index 0000000..bce76e2
--- /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_DotCheckItemClassEdit.html"
@@ -0,0 +1,194 @@
+锘�<!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 id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+
+                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+
+                            </div>
+
+                        </div>
+                        <div class="layui-card-body">
+                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">浠g爜</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber">
+                                                    <input id="HItemID" name="HItemID" type="hidden" />
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鍚嶇О</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HName" lay-verify="HName" id="HName">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鍔╄鐮�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode" id="HHelpCode">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">澶囨敞</label>
+                                                <div class="layui-input-inline">
+                                                    <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label">绂佺敤鏍囧織</label>
+                                            <div class="layui-input-block">
+                                                <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+            var closeType = 2;  //鍏抽棴绫诲瀷
+        } else {
+            debugger;
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+            var closeType = params[params[3]];  //鍏抽棴绫诲瀷
+        }
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+            //#endregion
+            //甯歌鐢ㄦ硶
+
+
+            if (OperationType == 3) {
+                $.ajax({
+                    url: GetWEBURL() + "/Gy_DotCheckItemClass/EditDotCheckItemClass",
+                    type: "GET",
+                    data: {
+                        "HInterID": linterid
+                    },
+                    success: function (d) {
+                        ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
+                        $("#HNumber").val(d.data[0].鐐规椤圭洰鍒嗙被浠g爜);
+                        $("#HName").val(d.data[0].鐐规椤圭洰鍒嗙被鍚嶇О);
+                        $("#HHelpCode").val(d.data[0].鍔╄鐮�);
+                        $("#HRemark").val(d.data[0].澶囨敞);
+                        $("input[name='HStopflag']").prop("checked", d.data[0].绂佺敤鏍囪 == 'Y' ? true : false);//true:閫変腑 false:涓嶉�変腑
+                        layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+                        $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
+                    }
+                });
+            }
+
+            //#region 宸ュ叿鎸夐挳
+            
+            //閫�鍑烘寜閽�
+            form.on('submit(Exit)', function (data) {
+                Pub_Close(1);
+            })
+
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {//淇濆瓨
+                //debugger;
+                var user = sessionStorage["HUserName"];
+                var isEndCheck = document.getElementById("HStopflag").checked;
+                data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+
+                data.field.HItemID = linterid == "" ? 0 : linterid;            
+
+                var oMain = JSON.stringify(data.field)
+
+                var sMainSub = oMain + ';' + user + ';' + sessionStorage["OrganizationID"] + ';' + OperationType ;
+
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Gy_DotCheckItemClass/SaveGy_DotCheckItemClassList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: true,
+                    data: { "msg": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                            });
+                        }
+                        else {
+                            f_alert(data.Message);
+                        }
+                        layer.closeAll("loading");
+                    },
+                    error: function (err) {
+                        f_alert("閿欒:" + err);
+                    }
+                });
+            });
+
+            //#endregion
+
+
+            function f_alert(sMsg) {
+                layer.alert(sMsg, { icon: 5 });
+
+            }
+
+        });
+    </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_DotCheckItemClassList.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_DotCheckItemClassList.html"
new file mode 100644
index 0000000..4da0044
--- /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_DotCheckItemClassList.html"
@@ -0,0 +1,652 @@
+锘�<!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 class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">浠g爜</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">鍚嶇О</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HName" id="HName">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_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-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="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_DotCheckItemClassList";
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["HItemID"];
+            //#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': set_ClearQuery();
+                        break;
+                    //娴忚
+                    case 'btn-view':
+                        get_ViewReport();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit':
+                        set_CheckBill(1);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_CheckBill(2);
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumn();
+                        break;
+                };
+            });
+
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //鍙屽嚮琛ㄦ牸浜嬩欢
+            table.on('rowDouble(mainTable)', function (obj) {
+                var index = parent.layer.getFrameIndex(window.name);
+                var data = obj.data;
+                //杩斿洖鏂规硶
+                parent.GetDotCheckListValue(data);
+                parent.layer.close(index);
+            })
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            //#endregion
+
+            //浠g爜鍥炶溅鏂规硶
+            $('#HNumber').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    get_FastQuery();
+                }
+            });
+
+            //鍚嶇О鍥炶溅鏂规硶
+            $('#HName').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    get_FastQuery();
+                }
+            });
+
+            //鍒濆鍖栬〃鏍�
+
+            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                  
+                };
+            }
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_DotCheckItemClass/GetDotCheckItemClassList',
+                    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 });
+                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(data1.list[key].ColmCols)) {
+                                    titleData[key] = data1.list[key].ColmCols;
+                                }
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            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("");
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                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: ['100%', '100%'],
+                    maxmin: true,
+                    content: ['../鍩虹璧勬枡/Gy_DotCheckItemClassEdit.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_DotCheckItemClassEdit.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_DotCheckItemClass/DeleteDotCheckItemClass',
+                                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();
+            }
+
+            //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+            function set_CheckBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HItemID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_DotCheckItemClass/AuditGy_DotCheckItemClass", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                var contentUrl = "";
+                for (var i = 1; i < option.cols[0].length - 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/\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_DotCheckItemMethodEdit.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_DotCheckItemMethodEdit.html"
new file mode 100644
index 0000000..14ee784
--- /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_DotCheckItemMethodEdit.html"
@@ -0,0 +1,194 @@
+锘�<!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 id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+
+                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+
+                            </div>
+
+                        </div>
+                        <div class="layui-card-body">
+                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">浠g爜</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber">
+                                                    <input id="HItemID" name="HItemID" type="hidden" />
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鍚嶇О</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HName" lay-verify="HName" id="HName">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鍔╄鐮�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode" id="HHelpCode">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">澶囨敞</label>
+                                                <div class="layui-input-inline">
+                                                    <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label">绂佺敤鏍囧織</label>
+                                            <div class="layui-input-block">
+                                                <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+            var closeType = 2;  //鍏抽棴绫诲瀷
+        } else {
+            debugger;
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+            var closeType = params[params[3]];  //鍏抽棴绫诲瀷
+        }
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+            //#endregion
+            //甯歌鐢ㄦ硶
+
+
+            if (OperationType == 3) {
+                $.ajax({
+                    url: GetWEBURL() + "/Gy_DotCheckItemMethod/EditDotCheckItemMethod",
+                    type: "GET",
+                    data: {
+                        "HInterID": linterid
+                    },
+                    success: function (d) {
+                        ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
+                        $("#HNumber").val(d.data[0].鐐规鏂规硶浠g爜);
+                        $("#HName").val(d.data[0].鐐规鏂规硶鍚嶇О);
+                        $("#HHelpCode").val(d.data[0].鍔╄鐮�);
+                        $("#HRemark").val(d.data[0].澶囨敞);
+                        $("input[name='HStopflag']").prop("checked", d.data[0].绂佺敤鏍囪 == 'Y' ? true : false);//true:閫変腑 false:涓嶉�変腑
+                        layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+                        $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
+                    }
+                });
+            }
+
+            //#region 宸ュ叿鎸夐挳
+            
+            //閫�鍑烘寜閽�
+            form.on('submit(Exit)', function (data) {
+                Pub_Close(1);
+            })
+
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {//淇濆瓨
+                //debugger;
+                var user = sessionStorage["HUserName"];
+                var isEndCheck = document.getElementById("HStopflag").checked;
+                data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+
+                data.field.HItemID = linterid == "" ? 0 : linterid;
+
+                var oMain = JSON.stringify(data.field)
+
+                var sMainSub = oMain + ';' + user + ';' + sessionStorage["OrganizationID"] + ';' + OperationType;
+
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Gy_DotCheckItemMethod/SaveGy_DotCheckItemMethodList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: true,
+                    data: { "msg": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                            });
+                        }
+                        else {
+                            f_alert(data.Message);
+                        }
+                        layer.closeAll("loading");
+                    },
+                    error: function (err) {
+                        f_alert("閿欒:" + err);
+                    }
+                });
+            });
+
+            //#endregion
+
+
+            function f_alert(sMsg) {
+                layer.alert(sMsg, { icon: 5 });
+
+            }
+
+        });
+    </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_DotCheckItemMethodList.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_DotCheckItemMethodList.html"
new file mode 100644
index 0000000..b005af9
--- /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_DotCheckItemMethodList.html"
@@ -0,0 +1,666 @@
+锘�<!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 class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">浠g爜</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">鍚嶇О</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HName" id="HName">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_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-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="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_DotCheckItemMethodList";
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["HItemID"];
+            //#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': set_ClearQuery();
+                        break;
+                    //娴忚
+                    case 'btn-view':
+                        get_ViewReport();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit':
+                        set_CheckBill(1);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_CheckBill(2);
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumn();
+                        break;
+                };
+            });
+
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //鍙屽嚮琛ㄦ牸浜嬩欢
+            table.on('rowDouble(mainTable)', function (obj) {
+                var index = parent.layer.getFrameIndex(window.name);
+                var data = obj.data;
+                //杩斿洖鏂规硶
+                parent.GetDotCheckListValue(data);
+                parent.layer.close(index);
+            })
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            //#endregion
+
+            //浠g爜鍥炶溅鏂规硶
+            $('#HNumber').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    get_FastQuery();
+                }
+            });
+
+            //鍚嶇О鍥炶溅鏂规硶
+            $('#HName').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    get_FastQuery();
+                }
+            });
+
+            //鍒濆鍖栬〃鏍�
+
+            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                  
+                };
+            }
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_DotCheckItemMethod/GetDotCheckItemMethodList',
+                    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 });
+                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(data1.list[key].ColmCols)) {
+                                    titleData[key] = data1.list[key].ColmCols;
+                                }
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            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("");
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                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: ['100%', '100%'],
+                    maxmin: true,
+                    content: ['../鍩虹璧勬枡/Gy_DotCheckItemMethodEdit.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_DotCheckItemMethodEdit.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_DotCheckItemMethod/DeleteDotCheckItemMethod',
+                                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=HDotCheck&OpenTmp=鐐规椤圭洰");
+
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+                }
+            }
+
+            //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+            function set_CheckBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HItemID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_DotCheckItemMethod/AuditGy_DotCheckItemMethod", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                var contentUrl = "";
+                for (var i = 1; i < option.cols[0].length - 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/\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_DotCheckList.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_DotCheckList.html"
index 8e2bada..3e54945 100644
--- "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_DotCheckList.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_DotCheckList.html"
@@ -273,6 +273,11 @@
                             //缁欑┖鐨勬暟缁勮祴鍊�
                             for (var key in data1.list) {
                                 data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(data1.list[key].ColmCols)) {
+                                    titleData[key] = data1.list[key].ColmCols;
+                                }
                             }
                             //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
                             col.push({ type: 'checkbox', fixed: 'left' });
@@ -393,7 +398,7 @@
                     title: '鏂板鐐规椤圭洰',
                     closeBtn: 1,
                     shift: 2,
-                    area: ['80%', '80%'],
+                    area: ['100%', '100%'],
                     maxmin: true,
                     content: ['../鍩虹璧勬枡/Gy_DotCheckEdit.html?OperationType=1&linterid=&HSouceBillType='],
                     end: function () {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\202\271\346\243\200\350\247\204\347\250\213\345\215\225/Sc_MouldDotCheckRuleBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\202\271\346\243\200\350\247\204\347\250\213\345\215\225/Sc_MouldDotCheckRuleBillEdit.html"
index 42c0452..fc5c194 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\202\271\346\243\200\350\247\204\347\250\213\345\215\225/Sc_MouldDotCheckRuleBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\202\271\346\243\200\350\247\204\347\250\213\345\215\225/Sc_MouldDotCheckRuleBillEdit.html"
@@ -224,7 +224,7 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HDotCheckItemID": 0, "HDotCheckItemNumber": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " };
+                var NewRow = { "HDotCheckItemID": 0, "HDotCheckItemNumber": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""  };
                 switch (obj.event) {
                     //鏂板涓�琛�
                     case 'btn-AddLine': btnAddLine(NewRow);
@@ -368,6 +368,10 @@
                     , { field: 'HDotCheckItemID', title: '鐐规椤圭洰ID', edit: 'text', hide: true }
                     , { field: 'HDotCheckItemNumber', title: '鐐规椤圭洰浠g爜', edit: 'text', event: 'HDotCheckItemNumber' }
                     , { field: 'HDotCheckItem', title: '鐐规椤圭洰' }
+                    , { field: 'HDotCheckItemClassID', title: '鐐规椤圭洰鍒嗙被ID', edit: 'text', hide: true }
+                    , { field: 'HDotCheckItemClassName', title: '鐐规椤圭洰鍒嗙被', edit: 'text', event: 'HDotCheckItemClassName' }
+                    , { field: 'HDotCheckItemMethodID', title: '鐐规鏂规硶ID', edit: 'text', hide: true }
+                    , { field: 'HDotCheckItemMethodName', title: '鐐规鏂规硶', edit: 'text', event: 'HDotCheckItemMethodName' }
                     , { field: 'HDotCheckPart', title: '鐐规閮ㄤ綅', edit: 'text' }
                     , { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
                     , { field: 'HManagerID', title: '璐熻矗浜篒D', edit: 'text', hide: true }
@@ -396,7 +400,7 @@
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
                 get_MAXNum();
-                option.data = [{ "HDotCheckItemID": 0, "HDotCheckItemNumber": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
+                option.data = [{ "HDotCheckItemID": 0, "HDotCheckItemNumber": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""  }];
                 table.render(option);
             }
             //鑾峰彇鏈�澶у崟鎹彿
@@ -421,7 +425,7 @@
             function set_EditFromGrid(linterid) {
                 set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
                 set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
-                option.data = [{ "HDotCheckItemID": 0, "HDotCheckItemNumber": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
+                option.data = [{ "HDotCheckItemID": 0, "HDotCheckItemNumber": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""  }];
                 table.render(option);
             }
             //缂栬緫鑾峰彇琛ㄥご
@@ -469,9 +473,15 @@
                     type: "GET",
                     data: { "HInterID": linterid },
                     success: function (result) {
-                        console.log(result);
                         if (result.count == 1) {
-                            option.data = result.list[0];
+                            var data = result.data;
+                            var subarr = [];
+
+                            for (var i = 0; i < data.length; i++) {
+                                subarr.push({ "HDotCheckItemID": data[i].鐐规椤圭洰ID, "HDotCheckItemNumber": data[i].鐐规椤圭洰浠g爜, "HDotCheckItem": data[i].鐐规椤圭洰, "HDotCheckPart": data[i].鐐规閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerNumber": data[i].璐熻矗浜轰唬鐮�, "HManagerName": data[i].璐熻矗浜哄悕绉�, "HRemark": data[i].瀛愬娉�, "HDotCheckItemClassID": data[i].HDotCheckItemClassID, "HDotCheckItemClassName": data[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": data[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": data[i].鐐规鏂规硶鍚嶇О });
+                            }
+
+                            option.data = subarr;
                             table.render(option);
                         } else {
                             layer.alert(result.code + result.Message, { icon: 5 });
@@ -578,6 +588,8 @@
                                         HDotCheckItemID: checkStatus.data[0].HItemID,
                                         HDotCheckItemNumber: checkStatus.data[0].鐐规椤圭洰浠g爜,
                                         HDotCheckItem: checkStatus.data[0].鐐规椤圭洰鍚嶇О,
+                                        HDotCheckItemClassID: checkStatus.data[0].HDotCheckItemClassID,
+                                        HDotCheckItemClassName: checkStatus.data[0].鐐规椤圭洰鍒嗙被鍚嶇О,
                                     });
                                     layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                                 }
@@ -629,6 +641,73 @@
                                 }
                             });
                         }
+                        if (obj.event === 'HDotCheckItemClassName')  //鐐规椤圭洰鍒嗙被
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '鐐规椤圭洰鍒嗙被鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true
+                                , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemClassList.html', 'yes']
+                                , btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HDotCheckItemClassID: checkStatus.data[0].HItemID,
+                                        HDotCheckItemClassName: checkStatus.data[0].鐐规椤圭洰鍒嗙被鍚嶇О
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                }
+                            });
+                        }
+                        if (obj.event === 'HDotCheckItemMethodName')  //鐐规鏂规硶
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '鐐规鏂规硶鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true
+                                , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemMethodList.html', 'yes']
+                                , btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HDotCheckItemMethodID: checkStatus.data[0].HItemID,
+                                        HDotCheckItemMethodName: checkStatus.data[0].鐐规鏂规硶鍚嶇О
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                }
+                            });
+                        }
+
                         obj.event = "";
                         return false;
                     }
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\242\206\347\224\250\345\215\225/Sc_MouldProdOutBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\242\206\347\224\250\345\215\225/Sc_MouldProdOutBill_PDA.html"
index 8784302..3f00294 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\242\206\347\224\250\345\215\225/Sc_MouldProdOutBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\242\206\347\224\250\345\215\225/Sc_MouldProdOutBill_PDA.html"
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>鍣ㄥ叿鐢熶骇棰嗙敤鍗�</title>
+    <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">
@@ -14,509 +14,1501 @@
     <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>
-        .maintitle {
-            background-color: #1492ff;
-            color: #fff;
-            padding: 5px 10px;
-            border: none;
-            border-radius: 4px;
-        }
-
-        .title {
-            border-left: 4px solid #1492ff;
-            padding-left: 6px;
-            margin: 20px 10px 4px;
-            font-size: 16px;
-            color: #333;
-        }
-
-        .buttom_box_little {
-            width: 60px;
-            height: 36px;
-            color: #fff;
-            background-color: #1492ff;
-            border-radius: 4px;
-            border: none;
-            margin: 10px;
-        }
-
-        .layui-input {
-            width: 93%;
-        }
-        .layui-inline, img {
-            display: block;
-            vertical-align: middle
-        }
-        .layui-input, .layui-textarea {
-            display: inline-block;
-            width: 100%;
-            padding-left: 10px;
-        }
-       
-        .laydate-time-list ol {
-            overflow-x: hidden !important;
-            overflow-y: auto !important;
-        }
-        .layui-form-label {
-            padding: 9px 5px;
-        }
-        .layui-input-block {
-            margin-left: 85px;
-            min-height: 36px;
+        .layui-col-xs8 {
+            width: 55.666667%;
         }
     </style>
 </head>
-
 <body>
-    <div class="layui-fluid" style="padding: 0;">
-        <div class="layui-card" style="padding: 15px;background-color: #efefef;">
-            <div class="layui-card-body" style="padding: 1px;">
-                <form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
-                    <div class="maintitle">鍣ㄥ叿鐢熶骇棰嗙敤鍗�</div>
-                    <div class="layui-form-item" style="padding-top: 10px;">
+    <div class="layui-fluid" style="padding:0">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 0px; height:800px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <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="padding:15px;margin:0px">
                         <div class="layui-row">
-                            <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍣ㄥ叿鏉$爜</label>
-                            <div class="layui-input-block" style="margin-left: 100px;width:46%;">
-                                <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
-                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
+                            <div class="layui-col-xs3">
+                                <label class="layui-form-label" style="width: 30px;padding-left: 0px;">鏉$爜</label>
+                            </div>
+                            <div class="layui-col-xs7">
+                                <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                            </div>
+                            <div class="layui-col-xs2">
+                                <button type="button" lay-submit="" lay-filter="HBarCode-BT" class="layui-btn layui_btn_sm" id="HBarCode-BT">纭畾</button>
                             </div>
                         </div>
-                    </div>
-                    <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
-                        <ul class="layui-tab-title">
-                            <li class="layui-this">鍩烘湰淇℃伅</li>
-                            <li>鍏朵粬淇℃伅</li>
-                        </ul>
-                        <div class="layui-tab-content">
-                            <div class="layui-tab-item layui-show">
-                                <div class="layui-form-item" style="padding-top: 10px;">
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">浠撳簱:</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" name="HWHName" id="HWHName" class="layui-input" style="width:80%;">
-                                                <input type="hidden" name="HWHID" id="HWHID" value="0" class="layui-input">
-                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Warehouse" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
+                        <div class="layui-tab layui-col-xs12" style="margin-top:5px;" lay-filter="tab-Sc_MouldProdOutBill_PDA">
+                            <ul class="layui-tab-title" lay-filter="tab-all">
+                                <li lay-id="1" style="padding:1px;">鍩烘湰淇℃伅</li>
+                                <li lay-id="2" style="padding:1px;">妯″叿淇℃伅</li>
+                            </ul>
+                            <div class="layui-tab-content">
+                                <!--鍩烘湰淇℃伅-->
+                                <div class="layui-tab-item">
+                                    <div class="layui-form-item" style="padding:0px;margin:0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">浠撳簱</label>
                                             </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">浠撲綅:</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" name="HSPName" id="HSPName" class="layui-input" style="width:80%;">
-                                                <input type="hidden" name="HSPID" id="HSPID" value="0" class="layui-input">
-                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="StockPlace" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍗曟嵁鍙�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HInterID" id="HInterID">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍗曟嵁鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HDate" id="HDate" placeholder="璇烽�夋嫨鏃ユ湡" readonly disabled>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">閮ㄩ棬:</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" name="HDeptName" id="HDeptName" class="layui-input" style="width:80%;">
-                                                <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input">
-                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Department" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
+                                            <div class="layui-col-xs10">
+                                                <div class="layui-col-xs10">
+                                                    <input type="text" name="HWHName" id="HWHName" lay-verify="HWHName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                                    <input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
+                                                </div>
+                                                <div class="layui-col-xs2">
+                                                    <button type="button" lay-submit="" lay-filter="HWHID-BT" class="layui-btn" id="HWHID-BT">...</button>
+                                                </div>
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">鎿嶄綔鍛�:</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" name="HManagerName" id="HManagerName" class="layui-input" style="width:80%;">
-                                                <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input">
-                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HManager" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
+                                    <div class="layui-form-item" style="padding:0px;margin:0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">浠撲綅</label>
+                                            </div>
+                                            <div class="layui-col-xs10">
+                                                <div class="layui-col-xs10">
+                                                    <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                                    <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
+                                                </div>
+                                                <div class="layui-col-xs2">
+                                                    <button type="button" lay-submit="" lay-filter="HSpID-BT" class="layui-btn" id="HSpID-BT">...</button>
+                                                </div>
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍚嶇О:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input">
+                                    <div class="layui-form-item" style="padding:0px;margin:0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">鍙戞枡</label>
+                                            </div>
+                                            <div class="layui-col-xs10">
+                                                <div class="layui-col-xs10">
+                                                    <input type="text" name="HKeeperName" id="HKeeperName" lay-verify="HKeeperName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                                    <input type="hidden" name="HKeeperID" id="HKeeperID" lay-verify="HKeeperID" value="0" autocomplete="off" class="layui-input">
+                                                </div>
+                                                <div class="layui-col-xs2">
+                                                    <button type="button" lay-submit="" lay-filter="HKeeperID-BT" class="layui-btn" id="HKeeperID-BT">...</button>
+                                                </div>
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿瑙勬牸:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" name="HBarSpec" id="HBarSpec" class="layui-input" style="background-color:#efefef4d;" readonly>
+                                    </div>
+                                    <div class="layui-form-item" style="padding:0px;margin:0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">棰嗘枡</label>
+                                            </div>
+                                            <div class="layui-col-xs10">
+                                                <div class="layui-col-xs10">
+                                                    <input type="text" name="HSecManagerName" id="HSecManagerName" lay-verify="HSecManagerName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                                    <input type="hidden" name="HSecManagerID" id="HSecManagerID" lay-verify="HSecManagerID" value="0" autocomplete="off" class="layui-input">
+                                                </div>
+                                                <div class="layui-col-xs2">
+                                                    <button type="button" lay-submit="" lay-filter="HSecManagerID-BT" class="layui-btn" id="HSecManagerID-BT">...</button>
+                                                </div>
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鏁伴噺:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" name="HQty" id="HQty" value="1" class="layui-input" style="background-color:#efefef4d;" readonly>
+                                    </div>
+                                    <div class="layui-form-item" style="padding:0px;margin:0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">閮ㄩ棬</label>
+                                            </div>
+                                            <div class="layui-col-xs10">
+                                                <div class="layui-col-xs10">
+                                                    <input type="text" name="HDeptName" id="HDeptName" lay-verify="HDeptName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                                    <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0" autocomplete="off" class="layui-input">
+                                                </div>
+                                                <div class="layui-col-xs2">
+                                                    <button type="button" lay-submit="" lay-filter="HDeptID-BT" class="layui-btn" id="HDeptID-BT">...</button>
+                                                </div>
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍓╀綑瀵垮懡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" name="HLeaveLife" id="HLeaveLife" class="layui-input" style="background-color:#efefef4d;" readonly>
+                                    </div>
+                                    <div class="layui-form-item" style="padding:0px;margin:0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">寰�鏉ョ被鍨�</label>
+                                            </div>
+                                            <div class="layui-col-xs10">
+                                                <select name="HSupTypeID" id="HSupTypeID" lay-filter="HSupTypeID">
+                                                    <option value="1">渚涘簲鍟�</option>
+                                                    <option value="2">瀹㈡埛</option>
+                                                    <option value="3">閮ㄩ棬</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item" style="padding:0px;margin:0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">寰�鏉ュ崟浣�</label>
+                                            </div>
+                                            <div class="layui-col-xs10">
+                                                <div class="layui-col-xs10">
+                                                    <input type="text" name="HSupName" id="HSupName" lay-verify="HSupName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                                    <input type="hidden" name="HSupID" id="HSupID" lay-verify="HSupID" value="0" autocomplete="off" class="layui-input">
+                                                </div>
+                                                <div class="layui-col-xs2">
+                                                    <button type="button" lay-submit="" lay-filter="HSupID-BT" class="layui-btn" id="HSupID-BT">...</button>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item" style="padding:0px;margin:0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">缁勭粐</label>
+                                            </div>
+                                            <div class="layui-col-xs10">
+                                                <input type="text" name="HStockOrgName" id="HStockOrgName" lay-verify="HStockOrgName" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                                <input type="hidden" name="HStockOrgID" id="HStockOrgID" lay-verify="HStockOrgID" value="0" autocomplete="off" class="layui-input">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item" style="padding:0px;margin:0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">鏃ユ湡</label>
+                                            </div>
+                                            <div class="layui-col-xs10">
+                                                <input name="HDate" id="HDate" autocomplete="off" class="layui-input">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item" style="padding:0px;margin:0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">鍒跺崟浜�</label>
+                                            </div>
+                                            <div class="layui-col-xs10">
+                                                <input type="text" name="HMaker" id="HMaker" lay-verify="HMaker" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item" style="padding:0px;margin:0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+                                            </div>
+                                            <div class="layui-col-xs10">
+                                                <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item" style="padding:0px;margin:0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁ID</label>
+                                            </div>
+                                            <div class="layui-col-xs10">
+                                                <input type="text" name="HInterID" id="HInterID" lay-verify="HInterID" value="0" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
                                             </div>
                                         </div>
                                     </div>
                                 </div>
-                            </div>
-                            <div class="layui-tab-item">
-                                <div class="layui-form-item" style="padding-top: 10px;">
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍒涘缓浜�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+                                <!--妯″叿淇℃伅-->
+                                <div class="layui-tab-item">
+                                    <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">鍣ㄥ叿鏉$爜</label>
                                             </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍒涘缓鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly disabled>
+                                            <div class="layui-col-xs10">
+                                                <input type="text" name="HMouldBarCode" id="HMouldBarCode" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">淇敼浜�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly disabled>
+                                    <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">鍣ㄥ叿鍚嶇О</label>
                                             </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">淇敼鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly disabled>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">瀹℃牳浜�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+                                            <div class="layui-col-xs10">
+                                                <input type="text" name="HMouldName" id="HMouldName" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">瀹℃牳鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly disabled>
+                                    <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">鍣ㄥ叿鍙�</label>
+                                            </div>
+                                            <div class="layui-col-xs10">
+                                                <input type="text" name="HMouldModel" id="HMouldModel" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">浣滃簾浜�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">浣滃簾鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly disabled>
+                                    </div>
+                                    <div class="layui-form-item" style="padding: 10px; margin: 0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs12">
+                                                <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                                <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
                                             </div>
                                         </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
+                        <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+                            <button type="button" lay-submit="" lay-filter="cmdSaver" class="layui-btn" id="cmdSaver">鎻愪氦</button>
+                            <button type="button" lay-submit="" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+                            <button type="button" lay-submit="" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+                        </div>
                     </div>
-               
-                   
-                    <div class="layer-footer" style="text-align: center;">
-                        <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Saver" id="Saver">鎻愪氦</button>
-                        <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Add">鏂板</button>
-                        <button type="button" class="layui-btn buttom_box_little" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
-                    </div>
-                    <!--闅愯棌瀛楁-->
-                    <input type="hidden" name="lngBillKey" id="lngBillKey">
-                    <input type="hidden" name="lngBillSubKey" id="lngBillSubKey">
 
+                    <!--闅愯棌瀛楁-->
+                    <input type="hidden" name="HBillType" id="HBillType">
+                    <input type="hidden" name="HRedBlueFlag" id="HRedBlueFlag">
+                    <!--澶辫触鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs" hidden controls>
+                            <source src="../../video/jingbao.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                    <!--鎴愬姛鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs2" hidden controls>
+                            <source src="../../video/success.wav" type="audio/ogg">
+                        </audio>
+                    </div>
                 </form>
             </div>
         </div>
     </div>
-
     <script>
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index' //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+            //#region 鍏叡鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
                 , table = layui.table
                 , form = layui.form
-                ,laydate = layui.laydate
+                , laydate = layui.laydate
                 , element = layui.element;
+            var HInterID = $('#HInterID').val()
+            var HBillNo = $('#HBillNo').val()
+            var HBillType = '3802'
+            var HRedBlueFlag = false
+            var HMaker = sessionStorage["HUserName"]
+            var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+            var HSourceFlag = false     //鏄惁宸叉壂鐮佹爣蹇�
+            var OperationType = 1       //鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
+            var listOption = [];
+            var columns = "";
+            var HModName = "Sc_MouldProdOutBill_PDA";
+            var ModRightName = "CE_MouldProdOut";    //妯″潡鏉冮檺鍙傛暟
+            var titleData = [];                 //涓嶉渶瑕佹樉绀虹殑瀛楁
+            var params = get_UrlVars();
+            var OperationType = params[params[0]] == null ? 1 : params[params[0]];  //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鏁版嵁绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
+            var HInterID_Temp = params[params[1]];  //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鍗曟嵁ID
+            var HBillNo_Temp = params[params[2]];  //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鍗曟嵁鍙�
 
-            //鏃ユ湡鏃堕棿閫夋嫨鍣�
-            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'
-            });
+            //#endregion
 
-            //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
-            $("#HBarCode").focus();
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            if (sessionStorage.login != "login") {
+                layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                }, function () { window.location.href = "../../user/login_pda.html"; });
+            }
 
-            //鍒濆鍩烘湰淇℃伅璧嬪��
-            $("#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"]);     //鍒涘缓浜�
-            $("#HManagerName").val(sessionStorage["HUserName"]);     //鎿嶄綔鍛�
-            $("#HManagerID").val(sessionStorage["Czybm"]);     //鎿嶄綔鍛業D
-            $("#HDeptName").val(sessionStorage["HDept"]);     //閮ㄩ棬
-            $("#HDeptID").val(sessionStorage["HDeptID"]);     //閮ㄩ棬ID
-            //妯℃不鍏锋潯鐮佹槸鍚︽壂鎻忔爣璁�
-            var HProcExchBillNoFlag = false;
+            //#region   鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
 
-            //鑾峰彇鏈�澶у崟鎹彿
-            $.ajax({
-                url: GetWEBURL() + "/Web/GetMAXNum",
-                type: "GET",
-                data: { "HBillType": '3796' },
-                success: function (d) {
-                    console.log(d.data);
-                    $("#HInterID").val(d.data[0].HInterID);
-                    $("#HBillNo").val(d.data[0].HBillNo);
-                }
-            });
-            //鏉″舰鐮佸洖杞︽柟娉�
-            $('#HBarCode').on('keydown', function (event) {
-                if (event.keyCode == 13) {
-                    GetMeesageByBarCode();
-                }
-            });
-            //纭畾
-            form.on('submit(QueDin)', function (data) {
-                GetMeesageByBarCode();
-            });
+            //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+            CheckModRight();
 
-           
-            //閫�鍑�-鍏抽棴椤甸潰鏂规硶
-            $('#Cancel').on('click', function () {
-                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
-                    parent.layui.admin.events.closeThisTabs(); //鍏抽棴椤电
-                });
-            })
-
-            //鎻愪氦
-            form.on('submit(Saver)', function (data) {
-                if (!$("#HBarCode").val()) {
-                    layer.msg("璇锋壂鎻忓櫒鍏锋潯鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                if (!$("#HWHID").val()) {
-                    layer.msg("璇烽�夋嫨浠撳簱!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                if ($("#HSPID").val() == "" || $("#HSPID").val() == null) {
-                    data.field.HSPID = "0";//搴撲綅
-                }
-                data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
-                var sMainSub = JSON.stringify(data.field);
-                //var sMainSub = { "HBarCode": "X60201609060002", "HWHName": "浜屽巶浜旈噾濉戣兌浠撳簱", "HWHID": "189470", "HSPName": "A1 - 2", "HSPID": "100228", "HBillNo": "MJLY00000091", "HInterID": "147", "HDate": "2021 - 08 - 02 15: 31: 41", "HDeptName": "宸ョ▼閮�", "HDeptID": "121472", "HManagerName": "Admin", "HManagerID": "001", "HBarName": "椤舵潌", "HMouldID": "", "HBarSpec": "16156 - 8", "HBarModel": "16156 - 8", "HQty": "1", "HLeaveLife": "0", "HMaker": "Admin", "HMakeDate": "2021 - 08 - 02 15: 31: 41", "HUpDater": "", "HUpDateDate": "", "HChecker": "", "HCheckDate": "", "HDeleteMan": "", "HDeleteDate": "", "lngBillKey": "", "lngBillSubKey": "" };
-                var index = layer.load();
+            function CheckModRight() {
+                layer.load(3);
                 $.ajax({
-                    type: "POST",
-                    url: GetWEBURL() + "/Sc_MouldProdOutBill/MouldProdOutBill_Save",
-                    async: true,
-                    data: { "sMainSub": sMainSub },
-                    dataType: "json",
-                    success: function (data) {
-                        if (data.count == 1) {
-                            layer.close(index);
-                            layer.msg(data.Message);
-                            $('#Saver').removeClass("buttom_box_little");
-                            $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/CheckModRight_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "ModRightName": ModRightName, "HUserName": HMaker },
+                    success: function (d) {
+                        if (d.count == 1) {
                         }
                         else {
-                            layer.close(index);
-                            layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            layer.msg(d.Message, {
+                                icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            }, function () { parent.location.href = "../../../views/index_Mobile.html"; });
                         }
                     },
-                    error: function (err) {
-                        layer.close(index);
-                        layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    }
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
                 });
-            });
-            //鏂板
-            form.on('submit(Add)', function () {
-                window.location.reload();
-            })
-            //閮ㄩ棬寮圭獥
-            form.on('submit(Department)', function () {
-                //椤甸潰灞�-鑷畾涔�
-                layer.open({
-                    type: 2,
-                    skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '閮ㄩ棬鍒楄〃',
-                    closeBtn: 1,
-                    shift: 2,
-                    area: ['80%', '80%'],
-                    maxmin: true,
-                    content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
-                    cancel: function (index, layero) {
-                    }
-                });
-            });
+                layer.closeAll("loading");
+            }
+            //#endregion
 
-            //璐熻矗浜哄脊绐�
-            form.on('submit(HManager)', function () {
-                //椤甸潰灞�-鑷畾涔�
-                layer.open({
-                    type: 2,
-                    skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '璐熻矗浜哄垪琛�',
-                    closeBtn: 1,
-                    shift: 2,
-                    area: ['80%', '80%'],
-                    maxmin: true,
-                    content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes'],
-                    cancel: function (index, layero) {
-                    }
-                });
-            });
+            //澶辫触鎻愮ず闊�
+            function playSound() {
+                console.log("playSound");
+                var audio = document.getElementById("cs");
+                audio.play();
+                audio.onended = function () {
+                    // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+                    audio.pause();
+                    audio.currentTime = 0;
+                };
+            }
+            //鎴愬姛鎻愮ず闊�
+            function playSound_OK() {
+                console.log("playSound_OK");
+                var audio = document.getElementById("cs2");
+                audio.play();
+                audio.onended = function () {
+                    // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+                    audio.pause();
+                    audio.currentTime = 0;
+                };
+            }
 
+            //#region 鍒濆鍖栫晫闈�
 
-            //浠撳簱
-            form.on('submit(Warehouse)', function () {
-                //椤甸潰灞�-鑷畾涔�
-                layer.open({
-                    type: 2,
-                    skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '浠撳簱鍒楄〃',
-                    closeBtn: 1,
-                    shift: 2,
-                    area: ['80%', '80%'],
-                    maxmin: true,
-                    content: ['../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes'],
-                    cancel: function (index, layero) {
-                    }
-                });
-            });
+            set_ClearBill();
 
-            //閫夋嫨浠撲綅
-            form.on('submit(StockPlace)', function () {//閫夋嫨浠撲綅
-                var HWHID = $("#HWHID").val();
-                if (HWHID == "") {
-                    layer.msg("璇峰厛閫夋嫨浠撳簱", { index: 0 });
-                    return;
+            function set_ClearBill() {
+                //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀鏂欍�佸彂鏂欍�佺粍缁囩瓑锛� new
+                $("#HWHID").val(sessionStorage["HWHID"]);
+                $("#HWHName").val(sessionStorage["HWHName"]);
+                $("#HDeptID").val(sessionStorage["HDeptID"]);
+                $("#HDeptName").val(sessionStorage["HDept"]);
+                $("#HSecManagerID").val(sessionStorage["HSecManagerID"]);
+                $("#HSecManagerName").val(sessionStorage["HSecManager"]);
+                $("#HKeeperID").val(sessionStorage["HKeeperID"]);
+                $("#HKeeperName").val(sessionStorage["HKeeper"]);
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                $("#HStockOrgID").val(sessionStorage["OrganizationID"]);
+                $("#HStockOrgName").val(sessionStorage["Organization"]);
+                $("#HBillType").val("3802");
+                $("#HRedBlueFlag").val("false");
+                if (sessionStorage["HWhSPFlag"]) {
+                    $("#HStockPlaceID").val("0");
+                    $("#HStockPlaceName").val("");
+                    $("#HStockPlaceName").attr("disabled", "disabled");
+                    $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
                 }
+                else {
+                    $("#HStockPlaceID").val(sessionStorage["HSPID"]);
+                    $("#HStockPlaceName").val(sessionStorage["HSPName"]);
+                    $("#HStockPlaceName").removeAttr("disabled");
+                    $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
+                }
+
+                //榛樿鏄剧ず椤甸潰
+                element.tabChange('tab-Sc_MouldProdOutBill_PDA', '1');
+                set_InitDate();         //鍒濆鍖栬〃鍗曟椂闂�
+                set_InitGrid();         //鍒濆鍖栬〃鏍�
+
+                var data = [];
+                listOption.cols = [[
+                    { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                    , { field: '鍣ㄥ叿鏉$爜', title: '鍣ㄥ叿鏉$爜', width: 100 }
+                    , { field: '鍣ㄥ叿浠g爜', title: '鍣ㄥ叿浠g爜', width: 100 }
+                    , { field: '鍣ㄥ叿鍚嶇О', title: '鍣ㄥ叿鍚嶇О', width: 100 }
+                    , { field: '鍣ㄥ叿鍙�', title: '鍣ㄥ叿鍙�', width: 100 }
+                ]];
+                listOption.data = data;
+                table.render(listOption);
+
+                //鍏夋爣榛樿鍦ㄦ潯鐮佷綅缃笂
+                var pFocus = $("#HBarCode");
+                pFocus.select();
+                pFocus.focus();     //鑾峰彇鍏夋爣
+            }
+
+            //鍒濆鍖栬〃鍗曟椂闂存彃浠�
+            function set_InitDate() {
+                //甯歌鐢ㄦ硶
+                laydate.render({
+                    elem: '#HDate'
+                });
+            }
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                listOption = {
+                    elem: '#wl-table'
+                    //, toolbar: '#toolbarDemo'
+                    , totalRow: true
+                    , height: 'full-60'
+                    , cellMinWidth: 90
+                    , limit: 50
+                };
+            }
+
+            //鍒ゆ柇鏄惁鏂板锛岃幏鍙栨渶澶у崟鎹彿
+            if (HInterID != 0) {
+                HSourceFlag = true;
+            }
+            //浠庣紦瀛樺垪琛ㄧ紪杈戝姛鑳借烦杞嚦鍗曟嵁妯″潡
+            else if (OperationType == 2) {
+                $("#HInterID").val(HInterID_Temp);
+                $("#HBillNo").val(HBillNo_Temp);
+                HInterID = $('#HInterID').val()
+                HBillNo = $('#HBillNo').val()
+                $("#HBarCode").select();
+                $("#HBarCode").focus();     //鑾峰彇鍏夋爣
+                //鏄剧ず琛ㄤ綋鏄庣粏
+                DisBillEntryList();
+                HSourceFlag = true;
+                element.tabChange('tab-Sc_MouldProdOutBill_PDA', '2');
+            }
+            else {
+                //鑾峰彇鏈�澶у崟鎹甀D銆佸崟鎹彿
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/GetMaxBillNoAndID_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HBillType": HBillType },
+                    success: function (d) {
+                        if (d.count == 1) {
+                            $("#HInterID").val(d.data[0].HInterID);
+                            $("#HBillNo").val(d.data[0].HBillNo);
+                            HInterID = $('#HInterID').val()
+                            HBillNo = $('#HBillNo').val()
+                        }
+                        else {
+                            layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                });
+                HSourceFlag = false;
+            }
+
+            //#endregion
+
+            //#region 鍩虹璧勬枡閫夋嫨
+
+            //#region 浠撳簱
+            //鎵弿浠撳簱鏉$爜
+            $('#HWHName').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    var HWHName = $('#HWHName').val()
+                    if (HWHName == '') {
+                        playSound();
+                        $("#HWHID").val("0");
+                        $("#HWHName").val("");
+                        $("#HStockPlaceID").val("0");
+                        $("#HStockPlaceName").val("");
+                        $("#HStockPlaceName").removeAttr("disabled");
+                        $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
+                        layer.msg("浠撳簱鏉$爜涓虹┖锛�", {
+                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HWHName").select();
+                            $("#HWHName").focus();
+                        });
+                        return;
+                    }
+
+                    layer.load(3);
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/WEBSController/GetWarehouse_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HBarCode": HWHName, "HStockOrgID": HStockOrgID },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $("#HWHID").val(result.data[0].HItemID);
+                                $("#HWHName").val(result.data[0].HName);
+                                $("#HStockPlaceID").val("0");
+                                $("#HStockPlaceName").val("");
+                                if (result.data[0].HSPFlag == 0) {
+                                    $("#HStockPlaceName").attr("disabled", "disabled");
+                                    $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                                }
+                                else {
+                                    $("#HStockPlaceName").removeAttr("disabled");
+                                    $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
+                                }
+                                element.tabChange('tab-Sc_MouldProdOutBill_PDA', '1');
+                                //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+                                $("#HBarCode").select();
+                                $("#HBarCode").focus();
+                            }
+                            else {
+                                playSound();
+                                $("#HWHID").val("0");
+                                $("#HWHName").val("");
+                                $("#HStockPlaceID").val("0");
+                                $("#HStockPlaceName").val("");
+                                $("#HStockPlaceName").removeAttr("disabled");
+                                $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
+                                layer.msg(result.Message, {
+                                    icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                }, function () {
+                                    $("#HWHName").select();
+                                    $("#HWHName").focus();
+                                });
+                            }
+                            layer.closeAll("loading");
+                        },
+                        complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                    });
+                }
+            });
+
+            //浠撳簱鎸夐挳
+            form.on('submit(HWHID-BT)', function () {
                 layer.open({
                     type: 2
-                    , area: ['80%', '80%']
-                    , title: '浠撲綅鍒楄〃'
+                    , area: ['100%', '100%']
+                    , title: '浠撳簱鍒楄〃'
                     , shade: 0.6 //閬僵閫忔槑搴�
                     , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                     , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + HWHID + '&Type=HSpID', 'yes']
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseListNew.html?Type=HWHID&HOrgID=' + HStockOrgID + '', 'yes']
                     , resize: false
                     , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
                     }
                 })
             });
 
-            //浠ヤ笂涓簂ayui妯″潡
-        });
+            //#endregion
 
-        //杩斿洖閮ㄩ棬
-        function GetHDeptNameValue(obj) {  
-            $("#HDeptName").val(obj[0].HName);
-            $("#HDeptID").val(obj[0].HItemID);
-        }
-        //杩斿洖璐熻矗浜�
-        function GetHWorkerValue(obj) {
-            $("#HManagerName").val(obj[0].HName);
-            $("#HManagerID").val(obj[0].HItemID);
-        }
-        //浠撳簱 
-        function GetHWHValue(obj) {
-            $("#HWHName").val(obj[0].HName);
-            $("#HWHID").val(obj[0].HItemID);
-        }
-        //杩斿洖浠撲綅
-        function GetHSpValue(obj) {  //杩斿洖浠撲綅
-            if (obj.length == 0) {
-                layer.msg("璇峰厛閫夋嫨浠撲綅", { index: 0 });
-            } else {
-                $("#HSPName").val(obj[0].HName);
-                $("#HSPID").val(obj[0].HItemID);
-            }
-        }
-        //鎵潯鐮�
-        function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
-            var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
-            if (!HBarCode) {
-                layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
-                return;
-            }
-            var index = layer.load();
-            $.ajax({
-                url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
-                type: "GET",
-                data: { "HBarCode": HBarCode },
-                success: function (result) {
-                    if (result.data.length == 1) {
-                        var data = result.data[0];
-                        $("#HMouldID").val(data.hinterid);
-                        $("#HBarName").val(data.HName);
-                        $("#HBarSpec").val(data.HModel);
-                        $("#HBarModel").val(data.HModel2);
-                        $("#HLeaveLife").val(data.HLeaveLife);
-                        $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
-                        $("#HBarCode").css("background-color", "#efefef4d");
+            //#region 浠撲綅
+            //鎵弿浠撲綅鏉$爜
+            $('#HStockPlaceName').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    //浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+                    if ($("#HWHName").val() == '') {
+                        $("#HWHID").val("0");
+                    }
+                    var sHWHID = $("#HWHID").val()
+                    var HStockPlaceName = $('#HStockPlaceName').val()
+                    if (HStockPlaceName == '') {
+                        playSound();
+                        $("#HWHID").val("0");
+                        $("#HWHName").val("");
+                        $("#HStockPlaceID").val("0");
+                        $("#HStockPlaceName").val("");
+                        layer.msg("浠撲綅鏉$爜涓虹┖锛�", {
+                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HStockPlaceName").select();
+                            $("#HStockPlaceName").focus();
+                        });
+                        return;
+                    }
 
-                        HProcExchBillNoFlag = true;
-                        layer.close(index);
-                    }
-                    else {
-                        layer.close(index);
-                        layer.msg("鏈煡鎵惧埌鏁版嵁", { 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: "娓╅Θ鎻愮ず" });
+                    layer.load(3);
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/WEBSController/GetStockPlace_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HBarCode": HStockPlaceName, "HWhID": sHWHID, "HStockOrgID": HStockOrgID },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $("#HStockPlaceName").val(result.data[0].HName);
+                                $("#HStockPlaceID").val(result.data[0].HItemID);
+                                $("#HWHName").val(result.data[0].HWhName);
+                                $("#HWHID").val(result.data[0].HWHID);
+                                element.tabChange('tab-Sc_MouldProdOutBill_PDA', '1');
+                                //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+                                $("#HBarCode").select();
+                                $("#HBarCode").focus();
+                            }
+                            else {
+                                playSound();
+                                $("#HWHID").val("0");
+                                $("#HWHName").val("");
+                                $("#HStockPlaceID").val("0");
+                                $("#HStockPlaceName").val("");
+                                layer.msg(result.Message, {
+                                    icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                }, function () {
+                                    $("#HStockPlaceName").select();
+                                    $("#HStockPlaceName").focus();
+                                });
+                            }
+                            layer.closeAll("loading");
+                        },
+                        complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                    });
                 }
             });
+
+            //浠撲綅鎸夐挳
+            form.on('submit(HSpID-BT)', function () {
+                //浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+                if ($("#HWHName").val() == '') {
+                    $("#HWHID").val("0");
+                }
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '浠撲綅鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceListNew.html?HWhID=' + $("#HWHID").val() + '&Type=HSpID&HOrgID=' + HStockOrgID + '', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+            //#endregion
+
+            //#region 鍙戞枡鍛�
+            //鎵弿鍙戞枡鍛樻潯鐮�
+            $('#HKeeperName').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    var HKeeperName = $('#HKeeperName').val()
+                    if (HKeeperName == '') {
+                        playSound();
+                        $("#HKeeperID").val("0");
+                        $("#HKeeperName").val("");
+                        layer.msg("鍙戞枡鍛樻潯鐮佷负绌猴紒", {
+                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HKeeperName").select();
+                            $("#HKeeperName").focus();
+                        });
+                        return;
+                    }
+
+                    layer.load(3);
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/WEBSController/GetEmployee_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HBarCode": HKeeperName },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $("#HKeeperID").val(result.data[0].HItemID);
+                                $("#HKeeperName").val(result.data[0].HName);
+                                element.tabChange('tab-Sc_MouldProdOutBill_PDA', '1');
+                                //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+                                $("#HBarCode").select();
+                                $("#HBarCode").focus();
+                            }
+                            else {
+                                playSound();
+                                $("#HKeeperID").val("0");
+                                $("#HKeeperName").val("");
+                                layer.msg(result.Message, {
+                                    icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                }, function () {
+                                    $("#HKeeperName").select();
+                                    $("#HKeeperName").focus();
+                                });
+                            }
+                            layer.closeAll("loading");
+                        },
+                        complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                    });
+                }
+            });
+
+            //鍙戞枡鍛樻寜閽�
+            form.on('submit(HKeeperID-BT)', function () {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '鑱屽憳鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+            //#endregion
+
+            //#region 棰嗘枡鍛�
+            //鎵弿棰嗘枡鍛樻潯鐮�
+            $('#HSecManagerName').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    var HSecManagerName = $('#HSecManagerName').val()
+                    if (HSecManagerName == '') {
+                        playSound();
+                        $("#HSecManagerID").val("0");
+                        $("#HSecManagerName").val("");
+                        layer.msg("棰嗘枡鍛樻潯鐮佷负绌猴紒", {
+                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HSecManagerName").select();
+                            $("#HSecManagerName").focus();
+                        });
+                        return;
+                    }
+
+                    layer.load(3);
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/WEBSController/GetEmployee_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HBarCode": HSecManagerName },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $("#HSecManagerID").val(result.data[0].HItemID);
+                                $("#HSecManagerName").val(result.data[0].HName);
+                                element.tabChange('tab-Sc_MouldProdOutBill_PDA', '1');
+                                //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+                                $("#HBarCode").select();
+                                $("#HBarCode").focus();
+                            }
+                            else {
+                                playSound();
+                                $("#HSecManagerID").val("0");
+                                $("#HSecManagerName").val("");
+                                layer.msg(result.Message, {
+                                    icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                }, function () {
+                                    $("#HSecManagerName").select();
+                                    $("#HSecManagerName").focus();
+                                });
+                            }
+                            layer.closeAll("loading");
+                        },
+                        complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                    });
+                }
+            });
+
+            //棰嗘枡鍛樻寜閽�
+            form.on('submit(HSecManagerID-BT)', function () {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '鑱屽憳鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+            //#endregion
+
+            //#region 閮ㄩ棬
+            //鎵弿閮ㄩ棬鏉$爜
+            $('#HDeptName').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    var HDeptName = $('#HDeptName').val()
+                    if (HDeptName == '') {
+                        playSound();
+                        $("#HDeptID").val("0");
+                        $("#HDeptName").val("");
+                        layer.msg("閮ㄩ棬鏉$爜涓虹┖锛�", {
+                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HDeptName").select();
+                            $("#HDeptName").focus();
+                        });
+                        return;
+                    }
+
+                    layer.load(3);
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/WEBSController/GetDepartment_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HBarCode": HDeptName },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $("#HDeptID").val(result.data[0].HItemID);
+                                $("#HDeptName").val(result.data[0].HName);
+                                element.tabChange('tab-Sc_MouldProdOutBill_PDA', '1');
+                                //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+                                $("#HBarCode").select();
+                                $("#HBarCode").focus();
+                            }
+                            else {
+                                playSound();
+                                $("#HDeptID").val("0");
+                                $("#HDeptName").val("");
+                                layer.msg(result.Message, {
+                                    icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                }, function () {
+                                    $("#HDeptName").select();
+                                    $("#HDeptName").focus();
+                                });
+                            }
+                            layer.closeAll("loading");
+                        },
+                        complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                    });
+                }
+            });
+
+            //閮ㄩ棬鎸夐挳
+            form.on('submit(HDeptID-BT)', function () {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '閮ㄩ棬鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+            //#endregion
+
+            //#region 寰�鏉ュ崟浣�
+            //鎵弿寰�鏉ュ崟浣嶆潯鐮�
+            $('#HSupName').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    var HSupName = $('#HSupName').val()
+                    if (HSupName == '') {
+                        playSound();
+                        $("#HSupID").val("0");
+                        $("#HSupName").val("");
+                        layer.msg("寰�鏉ュ崟浣嶆潯鐮佷负绌猴紒", {
+                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HSupName").select();
+                            $("#HSupName").focus();
+                        });
+                        return;
+                    }
+
+                    layer.load(3);
+                    if ($("#HSupTypeID").val() == '1') {    //渚涘簲鍟�
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/WEBSController/GetSupplier_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HBarCode": HSupName, "HStockOrgID": HStockOrgID },
+                            success: function (result) {
+                                if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    $("#HSupID").val(result.data[0].HItemID);
+                                    $("#HSupName").val(result.data[0].HName);
+                                    element.tabChange('tab-Sc_MouldProdOutBill_PDA', '1');
+                                    //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+                                    $("#HBarCode").select();
+                                    $("#HBarCode").focus();
+                                }
+                                else {
+                                    playSound();
+                                    $("#HSupID").val("0");
+                                    $("#HSupName").val("");
+                                    layer.msg(result.Message, {
+                                        icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                    }, function () {
+                                        $("#HSupName").select();
+                                        $("#HSupName").focus();
+                                    });
+                                }
+                                layer.closeAll("loading");
+                            },
+                            complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                        });
+                    }
+                    else if ($("#HSupTypeID").val() == '2') {   //瀹㈡埛
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/WEBSController/GetCustomer_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HBarCode": HSupName, "HStockOrgID": HStockOrgID },
+                            success: function (result) {
+                                if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    $("#HSupID").val(result.data[0].HItemID);
+                                    $("#HSupName").val(result.data[0].HName);
+                                    element.tabChange('tab-Sc_MouldProdOutBill_PDA', '1');
+                                    //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+                                    $("#HBarCode").select();
+                                    $("#HBarCode").focus();
+                                }
+                                else {
+                                    playSound();
+                                    $("#HSupID").val("0");
+                                    $("#HSupName").val("");
+                                    layer.msg(result.Message, {
+                                        icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                    }, function () {
+                                        $("#HSupName").select();
+                                        $("#HSupName").focus();
+                                    });
+                                }
+                                layer.closeAll("loading");
+                            },
+                            complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                        });
+                    }
+                    else {  //閮ㄩ棬
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/WEBSController/GetDepartment_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HBarCode": HSupName },
+                            success: function (result) {
+                                if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    $("#HSupID").val(result.data[0].HItemID);
+                                    $("#HSupName").val(result.data[0].HName);
+                                    element.tabChange('tab-Sc_MouldProdOutBill_PDA', '1');
+                                    //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+                                    $("#HBarCode").select();
+                                    $("#HBarCode").focus();
+                                }
+                                else {
+                                    playSound();
+                                    $("#HSupID").val("0");
+                                    $("#HSupName").val("");
+                                    layer.msg(result.Message, {
+                                        icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                    }, function () {
+                                        $("#HSupName").select();
+                                        $("#HSupName").focus();
+                                    });
+                                }
+                                layer.closeAll("loading");
+                            },
+                            complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                        });
+                    }
+                }
+            });
+
+            //寰�鏉ュ崟浣嶆寜閽�
+            form.on('submit(HSupID-BT)', function () {
+                var url = "";
+                var HSourceTitle = "";
+                if ($("#HSupTypeID").val() == '1') {
+                    url = '../../../views/Baseset/鍩虹璧勬枡/Gy_SupplierListNew.html?HStockOrgID=' + HStockOrgID + '';
+                    HSourceTitle = "渚涘簲鍟�";
+                }
+                else if ($("#HSupTypeID").val() == '2') {
+                    url = '../../../views/Baseset/鍩虹璧勬枡/Gy_CustomerListNew.html?HStockOrgID=' + HStockOrgID + '';
+                    HSourceTitle = "瀹㈡埛";
+                }
+                else {
+                    url = "../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html?Type=HDept2";
+                    HSourceTitle = "閮ㄩ棬";
+                }
+
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: HSourceTitle + '鍒楄〃'//鏍囬
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: [url, 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+            //#endregion
+
+            //#region 寰�鏉ョ被鍨嬮�夋嫨
+            form.on('select(HSupTypeID)', function (data) {
+                $("#HSupID").val("0");
+                $("#HSupName").val("");
+                $("#HSupName").select();
+                $("#HSupName").focus();
+            });
+            //#endregion
+
+            //#endregion
+
+
+            //#region 鍔熻兘鎺т欢
+
+            //#region 鎻愪氦
+            form.on('submit(cmdSaver)', function (data) {
+                //浠撳簱銆佷粨浣嶃�佸彂鏂欍�侀鏂欍�侀儴闂ㄣ�佸線鏉ュ崟浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+                if ($("#HWHName").val() == '') {
+                    $("#HWHID").val("0");
+                    data.field.HWHID = $('#HWHID').val()
+                }
+                if ($("#HStockPlaceName").val() == '') {
+                    $("#HStockPlaceID").val("0");
+                    data.field.HStockPlaceID = $('#HStockPlaceID').val()
+                }
+                if ($("#HKeeperName").val() == '') {
+                    $("#HKeeperID").val("0");
+                    data.field.HKeeperID = $('#HKeeperID').val()
+                }
+                if ($("#HSecManagerName").val() == '') {
+                    $("#HSecManagerID").val("0");
+                    data.field.HSecManagerID = $('#HSecManagerID').val()
+                }
+                if ($("#HDeptName").val() == '') {
+                    $("#HDeptID").val("0");
+                    data.field.HDeptID = $('#HDeptID').val()
+                }
+                if ($("#HSupName").val() == '') {
+                    $("#HSupID").val("0");
+                    data.field.HSupID = $('#HSupID').val()
+                }
+
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = table.cache['wl-table'];
+                if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
+                {
+                    layer.load(3);
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "/MouldController/set_SaveMouldProdOutBill_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "oMain": sMainStr },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                                    layer.confirm(data.Message, {
+                                        icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板','鍏抽棴'],
+                                        btn2: function () {
+                                            if (OperationType == 2) {
+                                                parent.location.href = "../../妯℃不鍏风鐞�/妯″叿鐢熶骇棰嗙敤鍗�/Sc_MouldProdOutBill_PDA.html";
+                                            }
+                                            else {
+                                                parent.location.href = "../../../views/index_Mobile.html";
+                                            }
+                                        }//鍏抽棴
+                                    }
+                                        , function () {
+                                            location.replace('Sc_MouldProdOutBill_PDA.html?OperationType=1&HInterID=0');
+                                        });//鏂板
+                                }
+                                else {
+                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                            },
+                            complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                            error: function (err) {
+                                layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    layer.closeAll("loading");
+                    return;
+                }
+            });
+
+            //#endregion
+
+            //#region 鍒犻櫎
+
+            form.on('submit(cmdDelete)', function () {
+                var checkStatus = table.checkStatus('wl-table')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length == 1) {
+                    layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+                        var HBarCode = data[0].鍣ㄥ叿鏉$爜
+
+                        layer.load(3)
+                        $.ajax(
+                            {
+                                type: "Get",
+                                url: GetWEBURL() + "/MouldController/set_DelMouldStockBillMain_Temp_Json",
+                                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                                data: { "HInterID": HInterID, "HBillType": HBillType, "HBarCode": HBarCode },
+                                dataType: "json",
+                                success: function (data) {
+                                    if (data.count == 1) {
+                                        layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                            //鏄剧ず琛ㄤ綋鏄庣粏
+                                            DisBillEntryList();
+                                        });
+                                    }
+                                    else {
+                                        playSound();
+                                        layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                    }
+                                },
+                                complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                                error: function (err) {
+                                    layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                            });
+                        layer.closeAll("loading");
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鍒犻櫎锛�');
+                }
+            });
+
+            //#endregion
+
+            //#region 閫�鍑�
+
+            form.on('submit(cmdCancel)', function () {
+                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    if (OperationType == 2) {
+                        var index = parent.layer.getFrameIndex(window.name);    //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                        parent.location.reload();                               //鍒锋柊鐖堕〉闈紝娉ㄦ剰涓�瀹氳鍦ㄥ叧闂綋鍓峣frame灞備箣鍓嶆墽琛屽埛鏂�
+                        parent.layer.close(index);                              //鍐嶆墽琛屽叧闂�
+                    }
+                    else {
+                        parent.location.href = "../../../views/index_Mobile.html";
+                    }
+                });
+            })
+
+            //#endregion
+
+            //#endregion
+
+
+            //#region 鎵弿鍣ㄥ叿鏉$爜
+
+            //鎵弿鏉$爜
+            $('#HBarCode').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    GetMeesageByBarCode();
+                    $("#HBarCode").select();
+                    $("#HBarCode").focus();     //鑾峰彇鍏夋爣
+                }
+            });
+
+            //鏉$爜鎸夐挳
+            form.on('submit(HBarCode-BT)', function (data) {
+                GetMeesageByBarCode();
+                $("#HBarCode").select();
+                $("#HBarCode").focus();     //鑾峰彇鍏夋爣
+            });
+
+            //鎵潯鐮�
+            function GetMeesageByBarCode(obj) {
+                //浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+                if ($("#HWHName").val() == '') {
+                    $("#HWHID").val("0");
+                }
+                if ($("#HStockPlaceName").val() == '') {
+                    $("#HStockPlaceID").val("0");
+                }
+                var sOldBarCode = $('#HBarCode').val()
+                var HDeleteFlag = sOldBarCode.substring(0, 1);
+                var sBarCode = sOldBarCode.slice(1);
+                var sHWHID = $("#HWHID").val()
+                var sHSPID = $("#HStockPlaceID").val()
+                var sSourceBillNo =""
+                var sSourceBillType ="-1"
+
+                if (HDeleteFlag == "*") {
+                    if (sBarCode == "") {
+                        playSound();
+                        layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
+                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HBarCode").select();
+                            $("#HBarCode").focus();
+                        });
+                        return;
+                    }
+                    else {
+                        $('#HBarCode').val("");
+                    }
+                    layer.load(3)
+                    $.ajax(
+                        {
+                            type: "GET",
+                            url: GetWEBURL() + "/MouldController/set_DelMouldStockBillMain_Temp_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HInterID": HInterID, "HBillType": HBillType, "HBarCode": sBarCode },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                                    playSound_OK();
+                                    //鏄剧ず琛ㄤ綋鏄庣粏
+                                    DisBillEntryList();
+                                }
+                                else {
+                                    playSound();
+                                    layer.msg(data.Message, {
+                                        icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                    }, function () {
+                                        $("#HBarCode").select();
+                                        $("#HBarCode").focus();
+                                    });
+                                }
+                            },
+                            complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                            error: function (err) {
+                                playSound();
+                                layer.msg('閿欒' + err, {
+                                    icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                }, function () {
+                                    $("#HBarCode").select();
+                                    $("#HBarCode").focus();
+                                });
+                            }
+                        });
+                    layer.closeAll("loading");
+                }
+                else {
+                    var sBarCode = $('#HBarCode').val()
+                    if (sBarCode == '') {
+                        playSound();
+                        layer.msg("鏉$爜涓虹┖锛岃鎵弿鏉$爜锛�", {
+                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HBarCode").select();
+                            $("#HBarCode").focus();
+                        });
+                        return;
+                    }
+                    if (sBarCode != "") {
+                        $('#HBarCode').val("");
+                    }
+                    layer.load(3)
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/MouldController/Get_CheckTypeByMouldBarCode_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "sBarCode": sBarCode, "HInterID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWhID": 0, "HSCSPID": 0, "HRedBlueFlag": HRedBlueFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sSourceBillType, "HStockOrgID": HStockOrgID },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                playSound_OK();
+                                element.tabChange('tab-Sc_MouldProdOutBill_PDA', '2');
+                                //鏄剧ず琛ㄤ綋鏄庣粏
+                                DisBillEntryList();
+                            }
+                            else {
+                                playSound();
+                                layer.msg(result.Message, {
+                                    icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                }, function () {
+                                    $("#HBarCode").select();
+                                    $("#HBarCode").focus();
+                                });
+                            }
+                        },
+                        complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                        error: function (err) {
+                            playSound();
+                            layer.msg("閿欒锛�" + err, {
+                                icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            }, function () {
+                                $("#HBarCode").select();
+                                $("#HBarCode").focus();
+                            });
+                        }
+                    });
+                    layer.closeAll("loading");
+                }
+            }
+
+            //#endregion
+
+
+            //#region 鏄剧ず鍣ㄥ叿鍒楄〃淇℃伅
+
+            function DisBillEntryList() {
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + '/MouldController/GetMouldBillEntryTmpList_Json',
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType },
+                    success: function (result) {
+                        var data = [];
+                        var col = [];
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in result.list) {
+                                //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                                data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(result.list[key].ColmCols)) {
+                                    titleData[key] = result.list[key].ColmCols;
+                                }
+                            }
+
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'radio', fixed: 'left', totalRowText: '鍚堣' });
+                            for (var i = 0; i < data.length; i++) {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        default:
+
+                                        if (data[i].name == '鏁伴噺') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 70, totalRow: true });
+                                        } else {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 200 });
+                                        }
+                                    }
+                                }
+                            }
+                            columns = col;
+                            listOption.cols = [columns];
+                            listOption.data = result.data;
+                            listOption.totalRow = true;
+                            table.cache['wl-table'] = null;         //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+                            table.render(listOption);
+
+                            //鏉$爜淇℃伅
+                            $("#HMouldBarCode").val(result.data[0].HBarCode);
+                            if ($("#HMouldBarCode").val() == '') {
+                                $("#HMouldName").val("");
+                                $("#HMouldModel").val("");
+                            }
+                            else {
+                                $("#HMouldName").val(result.data[0].HMouldName);
+                                $("#HMouldModel").val(result.data[0].HMouldNo);
+                            }
+                        }
+                        else {
+                            listOption.cols = [[
+                                { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                                , { field: '鍣ㄥ叿鏉$爜', title: '鍣ㄥ叿鏉$爜', width: 100 }
+                                , { field: '鍣ㄥ叿浠g爜', title: '鍣ㄥ叿浠g爜', width: 100 }
+                                , { field: '鍣ㄥ叿鍚嶇О', title: '鍣ㄥ叿鍚嶇О', width: 100 }
+                                , { field: '鍣ㄥ叿鍙�', title: '鍣ㄥ叿鍙�', width: 100 }
+                            ]];
+                            listOption.data = data;
+                            table.render(listOption);
+
+                            //鏉$爜淇℃伅
+                            $("#HMouldBarCode").val("");
+                            $("#HMouldName").val("");
+                            $("#HMouldModel").val("");
+                        }
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                });
+            }
+
+            //#endregion
+
+
+        });
+
+        //浠ヤ笂涓簂ayui妯″潡
+        //姝ゅ鏂规硶娑夊強鍒拌澶栭儴椤甸潰parent.鏂规硶鍚嶈皟鐢ㄧ殑蹇呴』鏀惧湪Layui鏂规硶澶栭儴
+
+        //鐐瑰嚮鎸夐挳閫夋嫨鍚�   杩斿洖浠撳簱淇℃伅
+        function GetHWHValue(obj)
+        {
+            if (obj.length > 0) {
+                $("#HWHName").val(obj[0].HName);
+                $("#HWHID").val(obj[0].HItemID);
+                $("#HStockPlaceName").val("");
+                $("#HStockPlaceID").val("0");
+                if (obj[0].HSPFlag == 0) {
+                    $("#HStockPlaceName").attr("disabled", "disabled");
+                    $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                }
+                else {
+                    $("#HStockPlaceName").removeAttr("disabled");
+                    $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
+                }
+            }
+        }
+        //鐐瑰嚮鎸夐挳閫夋嫨鍚�   杩斿洖浠撲綅淇℃伅
+        function GetHSpValue(obj) {
+            if (obj.length > 0) {
+                $("#HStockPlaceName").val(obj[0].HName);
+                $("#HStockPlaceID").val(obj[0].HItemID);
+                $("#HWHName").val(obj[0].HWhName);
+                $("#HWHID").val(obj[0].HWHID);
+            }
+        }
+        //鐐瑰嚮鎸夐挳閫夋嫨鍚�   杩斿洖鍙戞枡淇℃伅
+        function GetHKeeperValue(obj) {
+            if (obj.length > 0) {
+                $("#HKeeperName").val(obj[0].HName);
+                $("#HKeeperID").val(obj[0].HItemID);
+            }
+        }
+        //鐐瑰嚮鎸夐挳閫夋嫨鍚�   杩斿洖棰嗘枡淇℃伅
+        function GetHSecManagerValue(obj) {
+            if (obj.length > 0) {
+                $("#HSecManagerName").val(obj[0].HName);
+                $("#HSecManagerID").val(obj[0].HItemID);
+            }
+        }
+        //鐐瑰嚮鎸夐挳閫夋嫨鍚�   杩斿洖閮ㄩ棬淇℃伅
+        function GetHDeptNameValue(obj) {
+            if (obj.length > 0) {
+                $("#HDeptName").val(obj[0].HName);
+                $("#HDeptID").val(obj[0].HItemID);
+            }
+        }
+        //鐐瑰嚮鎸夐挳閫夋嫨鍚�   杩斿洖寰�鏉ュ崟浣嶄俊鎭�
+        function GetHSupValue(obj) {
+            if (obj.length > 0) {
+                $("#HSupName").val(obj[0].HName);
+                $("#HSupID").val(obj[0].HItemID);
+            }
+        }
+        //鐐瑰嚮鎸夐挳閫夋嫨鍚�   杩斿洖寰�鏉ュ崟浣嶄俊鎭�
+        function GetHDeptName2Value(obj) {
+            if (obj.length > 0) {
+                $("#HSupName").val(obj[0].HName);
+                $("#HSupID").val(obj[0].HItemID);
+            }
+        }
+
+        //鍗曟嵁涓婁紶鍓嶅垽鏂�
+        function AllowLoadData(sSubStr) {
+            if (HInterID == 0) {
+                layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if (HBillNo == '') {
+                layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if ($("#HKeeperID").val() == "undefined" || $("#HKeeperID").val() == '0') {
+                layer.msg("鍙戞枡鍛樻病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if ($("#HSecManagerID").val() == "undefined" || $("#HSecManagerID").val() == '0') {
+                layer.msg("棰嗘枡鍛樻病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if (typeof (sSubStr) == "undefined") {
+                layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            //鍒ゆ柇鏄惁宸叉壂鎻忓櫒鍏锋潯鐮�
+            if (!typeof (sSubStr) == "undefined") {
+                for (var i = 0; i <= sSubStr.length - 1; i++) { 
+                    if (parseFloat(sSubStr[i].HQty) > 0) {
+                        s = 1;
+                    }
+                }
+                if (s == 0) {
+                    layer.msg("娌℃湁鎵弿鍣ㄥ叿鏉$爜锛岃鍏堟壂鎻忓櫒鍏锋潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+            }
+            else {
+                return true;
+            }
         }
     </script>
+
 </body>
 </html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\242\206\347\224\250\345\215\225/Sc_MouldProdOutBill_PDA_old.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\242\206\347\224\250\345\215\225/Sc_MouldProdOutBill_PDA_old.html"
new file mode 100644
index 0000000..8784302
--- /dev/null
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\242\206\347\224\250\345\215\225/Sc_MouldProdOutBill_PDA_old.html"
@@ -0,0 +1,522 @@
+锘�<!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>
+    <!--鑷畾涔夋牱寮�-->
+    <style>
+        .maintitle {
+            background-color: #1492ff;
+            color: #fff;
+            padding: 5px 10px;
+            border: none;
+            border-radius: 4px;
+        }
+
+        .title {
+            border-left: 4px solid #1492ff;
+            padding-left: 6px;
+            margin: 20px 10px 4px;
+            font-size: 16px;
+            color: #333;
+        }
+
+        .buttom_box_little {
+            width: 60px;
+            height: 36px;
+            color: #fff;
+            background-color: #1492ff;
+            border-radius: 4px;
+            border: none;
+            margin: 10px;
+        }
+
+        .layui-input {
+            width: 93%;
+        }
+        .layui-inline, img {
+            display: block;
+            vertical-align: middle
+        }
+        .layui-input, .layui-textarea {
+            display: inline-block;
+            width: 100%;
+            padding-left: 10px;
+        }
+       
+        .laydate-time-list ol {
+            overflow-x: hidden !important;
+            overflow-y: auto !important;
+        }
+        .layui-form-label {
+            padding: 9px 5px;
+        }
+        .layui-input-block {
+            margin-left: 85px;
+            min-height: 36px;
+        }
+    </style>
+</head>
+
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 15px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
+                    <div class="maintitle">鍣ㄥ叿鐢熶骇棰嗙敤鍗�</div>
+                    <div class="layui-form-item" style="padding-top: 10px;">
+                        <div class="layui-row">
+                            <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍣ㄥ叿鏉$爜</label>
+                            <div class="layui-input-block" style="margin-left: 100px;width:46%;">
+                                <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                        <ul class="layui-tab-title">
+                            <li class="layui-this">鍩烘湰淇℃伅</li>
+                            <li>鍏朵粬淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">浠撳簱:</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" name="HWHName" id="HWHName" class="layui-input" style="width:80%;">
+                                                <input type="hidden" name="HWHID" id="HWHID" value="0" class="layui-input">
+                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Warehouse" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">浠撲綅:</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" name="HSPName" id="HSPName" class="layui-input" style="width:80%;">
+                                                <input type="hidden" name="HSPID" id="HSPID" value="0" class="layui-input">
+                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="StockPlace" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">鍗曟嵁鍙�:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">鍗曟嵁鏃ユ湡:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="datetime" class="layui-input" name="HDate" id="HDate" placeholder="璇烽�夋嫨鏃ユ湡" readonly disabled>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">閮ㄩ棬:</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" name="HDeptName" id="HDeptName" class="layui-input" style="width:80%;">
+                                                <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input">
+                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Department" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">鎿嶄綔鍛�:</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" name="HManagerName" id="HManagerName" class="layui-input" style="width:80%;">
+                                                <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input">
+                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HManager" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍚嶇О:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿瑙勬牸:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="text" name="HBarSpec" id="HBarSpec" class="layui-input" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">鏁伴噺:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="text" name="HQty" id="HQty" value="1" class="layui-input" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">鍓╀綑瀵垮懡:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="text" name="HLeaveLife" id="HLeaveLife" class="layui-input" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">鍒涘缓浜�:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">鍒涘缓鏃ユ湡:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly disabled>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">淇敼浜�:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly disabled>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">淇敼鏃ユ湡:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly disabled>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">瀹℃牳浜�:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">瀹℃牳鏃ユ湡:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly disabled>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">浣滃簾浜�:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">浣滃簾鏃ユ湡:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly disabled>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+               
+                   
+                    <div class="layer-footer" style="text-align: center;">
+                        <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Saver" id="Saver">鎻愪氦</button>
+                        <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Add">鏂板</button>
+                        <button type="button" class="layui-btn buttom_box_little" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+                    </div>
+                    <!--闅愯棌瀛楁-->
+                    <input type="hidden" name="lngBillKey" id="lngBillKey">
+                    <input type="hidden" name="lngBillSubKey" id="lngBillSubKey">
+
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        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;
+
+            //鏃ユ湡鏃堕棿閫夋嫨鍣�
+            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'
+            });
+
+            //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
+            $("#HBarCode").focus();
+
+            //鍒濆鍩烘湰淇℃伅璧嬪��
+            $("#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"]);     //鍒涘缓浜�
+            $("#HManagerName").val(sessionStorage["HUserName"]);     //鎿嶄綔鍛�
+            $("#HManagerID").val(sessionStorage["Czybm"]);     //鎿嶄綔鍛業D
+            $("#HDeptName").val(sessionStorage["HDept"]);     //閮ㄩ棬
+            $("#HDeptID").val(sessionStorage["HDeptID"]);     //閮ㄩ棬ID
+            //妯℃不鍏锋潯鐮佹槸鍚︽壂鎻忔爣璁�
+            var HProcExchBillNoFlag = false;
+
+            //鑾峰彇鏈�澶у崟鎹彿
+            $.ajax({
+                url: GetWEBURL() + "/Web/GetMAXNum",
+                type: "GET",
+                data: { "HBillType": '3796' },
+                success: function (d) {
+                    console.log(d.data);
+                    $("#HInterID").val(d.data[0].HInterID);
+                    $("#HBillNo").val(d.data[0].HBillNo);
+                }
+            });
+            //鏉″舰鐮佸洖杞︽柟娉�
+            $('#HBarCode').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    GetMeesageByBarCode();
+                }
+            });
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
+            });
+
+           
+            //閫�鍑�-鍏抽棴椤甸潰鏂规硶
+            $('#Cancel').on('click', function () {
+                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    parent.layui.admin.events.closeThisTabs(); //鍏抽棴椤电
+                });
+            })
+
+            //鎻愪氦
+            form.on('submit(Saver)', function (data) {
+                if (!$("#HBarCode").val()) {
+                    layer.msg("璇锋壂鎻忓櫒鍏锋潯鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if (!$("#HWHID").val()) {
+                    layer.msg("璇烽�夋嫨浠撳簱!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if ($("#HSPID").val() == "" || $("#HSPID").val() == null) {
+                    data.field.HSPID = "0";//搴撲綅
+                }
+                data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
+                var sMainSub = JSON.stringify(data.field);
+                //var sMainSub = { "HBarCode": "X60201609060002", "HWHName": "浜屽巶浜旈噾濉戣兌浠撳簱", "HWHID": "189470", "HSPName": "A1 - 2", "HSPID": "100228", "HBillNo": "MJLY00000091", "HInterID": "147", "HDate": "2021 - 08 - 02 15: 31: 41", "HDeptName": "宸ョ▼閮�", "HDeptID": "121472", "HManagerName": "Admin", "HManagerID": "001", "HBarName": "椤舵潌", "HMouldID": "", "HBarSpec": "16156 - 8", "HBarModel": "16156 - 8", "HQty": "1", "HLeaveLife": "0", "HMaker": "Admin", "HMakeDate": "2021 - 08 - 02 15: 31: 41", "HUpDater": "", "HUpDateDate": "", "HChecker": "", "HCheckDate": "", "HDeleteMan": "", "HDeleteDate": "", "lngBillKey": "", "lngBillSubKey": "" };
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Sc_MouldProdOutBill/MouldProdOutBill_Save",
+                    async: true,
+                    data: { "sMainSub": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) {
+                            layer.close(index);
+                            layer.msg(data.Message);
+                            $('#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 () {
+                window.location.reload();
+            })
+            //閮ㄩ棬寮圭獥
+            form.on('submit(Department)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '閮ㄩ棬鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+                    cancel: function (index, layero) {
+                    }
+                });
+            });
+
+            //璐熻矗浜哄脊绐�
+            form.on('submit(HManager)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '璐熻矗浜哄垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes'],
+                    cancel: function (index, layero) {
+                    }
+                });
+            });
+
+
+            //浠撳簱
+            form.on('submit(Warehouse)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '浠撳簱鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes'],
+                    cancel: function (index, layero) {
+                    }
+                });
+            });
+
+            //閫夋嫨浠撲綅
+            form.on('submit(StockPlace)', function () {//閫夋嫨浠撲綅
+                var HWHID = $("#HWHID").val();
+                if (HWHID == "") {
+                    layer.msg("璇峰厛閫夋嫨浠撳簱", { index: 0 });
+                    return;
+                }
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '浠撲綅鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + HWHID + '&Type=HSpID', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                    }
+                })
+            });
+
+            //浠ヤ笂涓簂ayui妯″潡
+        });
+
+        //杩斿洖閮ㄩ棬
+        function GetHDeptNameValue(obj) {  
+            $("#HDeptName").val(obj[0].HName);
+            $("#HDeptID").val(obj[0].HItemID);
+        }
+        //杩斿洖璐熻矗浜�
+        function GetHWorkerValue(obj) {
+            $("#HManagerName").val(obj[0].HName);
+            $("#HManagerID").val(obj[0].HItemID);
+        }
+        //浠撳簱 
+        function GetHWHValue(obj) {
+            $("#HWHName").val(obj[0].HName);
+            $("#HWHID").val(obj[0].HItemID);
+        }
+        //杩斿洖浠撲綅
+        function GetHSpValue(obj) {  //杩斿洖浠撲綅
+            if (obj.length == 0) {
+                layer.msg("璇峰厛閫夋嫨浠撲綅", { index: 0 });
+            } else {
+                $("#HSPName").val(obj[0].HName);
+                $("#HSPID").val(obj[0].HItemID);
+            }
+        }
+        //鎵潯鐮�
+        function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+            var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+            if (!HBarCode) {
+                layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+                return;
+            }
+            var index = layer.load();
+            $.ajax({
+                url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
+                type: "GET",
+                data: { "HBarCode": HBarCode },
+                success: function (result) {
+                    if (result.data.length == 1) {
+                        var data = result.data[0];
+                        $("#HMouldID").val(data.hinterid);
+                        $("#HBarName").val(data.HName);
+                        $("#HBarSpec").val(data.HModel);
+                        $("#HBarModel").val(data.HModel2);
+                        $("#HLeaveLife").val(data.HLeaveLife);
+                        $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                        $("#HBarCode").css("background-color", "#efefef4d");
+
+                        HProcExchBillNoFlag = true;
+                        layer.close(index);
+                    }
+                    else {
+                        layer.close(index);
+                        layer.msg("鏈煡鎵惧埌鏁版嵁", { 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: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
+    </script>
+</body>
+</html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldDotCheckBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldDotCheckBill_PDA.html"
index a07128d..d1171e0 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldDotCheckBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldDotCheckBill_PDA.html"
@@ -14,257 +14,312 @@
     <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>
-        .maintitle {
-            background-color: #1492ff;
-            color: #fff;
-            padding: 5px 10px;
-            border: none;
-            border-radius: 4px;
-        }
-
-        .title {
-            border-left: 4px solid #1492ff;
-            padding-left: 6px;
-            margin: 20px 10px 4px;
-            font-size: 16px;
-            color: #333;
-        }
-
-        .buttom_box_little {
-            width: 60px;
-            height: 36px;
-            color: #fff;
-            background-color: #1492ff;
-            border-radius: 4px;
-            border: none;
-            margin: 10px;
-        }
-
-        .layui-input {
-            width: 93%;
-        }
-        .layui-inline, img {
-            display: block;
-            vertical-align: middle
-        }
-        .layui-input, .layui-textarea {
-            display: inline-block;
-            width: 100%;
-            padding-left: 10px;
-        }
-       
-        .laydate-time-list ol {
-            overflow-x: hidden !important;
-            overflow-y: auto !important;
-        }
         .layui-form-label {
-            padding: 9px 5px;
+            font-size: 14px;
+            width: 85px;
+            text-align: inherit;
         }
-        .layui-input-block {
-            margin-left: 85px;
-            min-height: 36px;
+        /*鍏ㄥ眬璁剧疆杈撳叆妗嗛珮搴�*/
+        .LineHeight {
+            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;
+        }
+
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+
+        .layui-form-item .layui-inline {
+            margin-top: 0px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+
+        .layui-form-label {
+            width: 25%;
+        }
+        /*鏄庣粏琛屽閫夋灞呬腑*/
+        .layui-table-cell .layui-form-checkbox[lay-skin="primary"] {
+            margin-left: 15%;
         }
     </style>
 </head>
 
 <body>
     <div class="layui-fluid" style="padding: 0;">
-        <div class="layui-card" style="padding: 15px;background-color: #efefef;">
+        <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 class="maintitle">鍣ㄥ叿鐐规璁板綍鍗�</div>
-                    <div class="layui-form-item" style="padding-top: 10px;">
-                        <div  class="layui-inline">
-                            <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍣ㄥ叿鏉$爜</label>
-                            <div class="layui-input-block" style="margin-left: 100px;width:46%;">
-                                <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
-                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
-                            </div>
-                        </div>
+                    <div style="background-color:#0085E8;">
+                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>鍣ㄥ叿鐐规璁板綍鍗�</span>
                     </div>
-                    <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
-                        <ul class="layui-tab-title">
-                            <li class="layui-this">鍩烘湰淇℃伅</li>
-                            <li>鍏朵粬淇℃伅</li>
-                        </ul>
+                    <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="Saver" id="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">
-                                <div class="layui-form-item" style="padding-top: 10px;">
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鐐规寮�濮�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HBeginDate" id="HBeginDate" placeholder="璇烽�夋嫨鏃ユ湡">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鐐规缁撴潫:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HEndDate" id="HEndDate" placeholder="璇烽�夋嫨鏃ユ湡">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鐐规瑕佹眰:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <textarea name="HClaim" id="HClaim" placeholder="璇疯緭鍏ュ唴瀹�" class="layui-textarea"></textarea>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍗曟嵁鍙�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HInterID" id="HInterID">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍗曟嵁鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HDate" id="HDate" placeholder="璇烽�夋嫨鏃ユ湡" readonly disabled>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">閮ㄩ棬:</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" name="HDeptName" id="HDeptName" class="layui-input" style="width:80%;">
-                                                <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input">
-                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Department" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">璐熻矗浜�:</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" name="HManagerName" id="HManagerName" class="layui-input" style="width:80%;">
-                                                <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input">
-                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HManager" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">鐐规椤圭洰:</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" name="HDotCheckItem" id="HDotCheckItem" class="layui-input" style="width:80%;">
-                                                <input type="hidden" name="HDotCheckItemID" id="HDotCheckItemID" class="layui-input">
-                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HDotCheckItemList" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鐐规閮ㄤ綅:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HDotCheckPart" id="HDotCheckPart" >
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍚嶇О:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿瑙勬牸:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" name="HBarSpec" id="HBarSpec" class="layui-input" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍨嬪彿:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" name="HBarModel" id="HBarModel" class="layui-input" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
+                                <table style="width:80%;">
+                                    <tbody>
+                                        <tr>
+                                            <th>鍣ㄥ叿鏉$爜</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HBarCode" class="layui-input LineHeight" 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="bz_td">
+                                                <input type="datetime" name="HBeginDate" class="layui-input LineHeight" id="HBeginDate" placeholder="璇烽�夋嫨鏃ユ湡" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鐐规缁撴潫</th>
+                                            <td class="bz_td">
+                                                <input type="datetime" name="HEndDate" class="layui-input LineHeight" id="HEndDate" placeholder="璇烽�夋嫨鏃ユ湡" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鐐规瑕佹眰</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HClaim" class="layui-input LineHeight" id="HClaim" placeholder="璇疯緭鍏ョ偣妫�瑕佹眰" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鏈�缁堢粨璁�</th>
+                                            <td class="bz_td">
+                                                <input type="radio" name="HLastResult" value="OK" title="OK" checked="">
+                                                <input type="radio" name="HLastResult" value="NG" title="NG">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>寮傚父鎯呭喌<br />璁板綍</th>
+                                            <td class="bz_td" style="margin-top:10px;">
+                                                <input type="text" name="HErrNote" class="layui-input LineHeight" id="HErrNote" placeholder="璇疯緭鍏ュ紓甯告儏鍐佃褰�" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>閲嶅ぇ瀹夊叏<br />闅愭偅璁板綍</th>
+                                            <td class="bz_td" style="margin-top:10px;">
+                                                <input type="text" name="HBigSafeNote" class="layui-input LineHeight" id="HBigSafeNote" placeholder="璇疯緭鍏ラ噸澶у畨鍏ㄩ殣鎮h褰�" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鐐规鏁版嵁</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HDotCheckNote" class="layui-input LineHeight" id="HDotCheckNote" placeholder="璇疯緭鍏ョ偣妫�鏁版嵁" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鐢熶骇鐝</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HShiftsName" class="layui-input LineHeight" id="HShiftsName" placeholder="閫夋嫨鐢熶骇鐝" style="background-color:#efefef4d;">
+                                                <input type="hidden" name="HShiftsID" id="HShiftsID" value="0" autocomplete="off" class="layui-input">
+                                                <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="btnShifts" id="btnShifts" style="font-weight:bolder">...</button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鍗�&ensp;鎹�&ensp;鍙�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HBillNo" class="layui-input LineHeight" id="HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" style="border-radius: 50px;background-color:#EDEDED;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID" value="0" autocomplete="off" class="layui-input">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鍗曟嵁鏃ユ湡</th>
+                                            <td class="bz_td">
+                                                <input type="datetime" name="HDate" class="layui-input LineHeight" id="HDate" placeholder="璇烽�夋嫨鏃ユ湡" style="border-radius: 50px;background-color:#EDEDED;" readonly>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>閮�&ensp;&ensp;&ensp;&ensp;闂�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HDeptName" class="layui-input LineHeight" 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>澶�&ensp;&ensp;&ensp;&ensp;娉�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HRemark" class="layui-input LineHeight" id="HRemark" placeholder="璇疯緭鍏ュ娉�" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鍣ㄥ叿鍚嶇О</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HBarName" class="layui-input LineHeight" id="HBarName" style="border-radius: 50px;background-color:#EDEDED;" readonly>
+                                                <input type="hidden" name="HMouldID" id="HMouldID" value="0" autocomplete="off" class="layui-input">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鍣ㄥ叿瑙勬牸</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HBarSpec" class="layui-input LineHeight" id="HBarSpec" 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 LineHeight" id="HBarModel" style="border-radius: 50px;background-color:#EDEDED;" readonly>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鐐规璁″垝</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HPlanNo" class="layui-input LineHeight" id="HPlanNo" style="border-radius: 50px;background-color:#EDEDED;" readonly>
+                                                <input type="hidden" name="HPlanInterID" class="layui-input LineHeight" id="HPlanInterID" style="border-radius: 50px;background-color:#EDEDED;" readonly>
+                                                <input type="hidden" name="HPlanEntryID" class="layui-input LineHeight" id="HPlanEntryID" style="border-radius: 50px;background-color:#EDEDED;" readonly>
+                                                <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="btnMouldDotCheckPlan" id="btnMouldDotCheckPlan" style="font-weight:bolder">...</button>
+                                            </td>
+                                        </tr>
+                                    </tbody>
+                                </table>
                             </div>
                             <div class="layui-tab-item">
-                                <div class="layui-form-item" style="padding-top: 10px;">
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍒涘缓浜�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍒涘缓鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly disabled>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">淇敼浜�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly disabled>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">淇敼鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly disabled>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">瀹℃牳浜�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">瀹℃牳鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly disabled>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">浣滃簾浜�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">浣滃簾鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly disabled>
-                                            </div>
-                                        </div>
+                                <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="HMouldDotCheckRuleID" id="HMouldDotCheckRuleID" class="layui-input" value="0" style="float:left;width:150px;">
+                                        <input type="text" name="HMouldDotCheckRuleNo" id="HMouldDotCheckRuleNo" class="layui-input" value="" style="float:left;width:150px;" readonly="readonly">
+                                        <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEquipDotCheckRuleInterist" style="width:40px;display:none;">
+                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                        </button>
                                     </div>
                                 </div>
+                                <table class="" id="mainTable" lay-filter="mainTable"></table>
+                                <script type="text/html" id="toolbarDemo">
+                                    <div class="layui-btn-container">
+                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><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 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>
-                    </div>
-               
-                   
-                    <div class="layer-footer" style="text-align: center;">
-                        <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Saver" id="Saver">鎻愪氦</button>
-                        <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Add">鏂板</button>
-                        <button type="button" class="layui-btn buttom_box_little" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+                        <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 type="text/html" id="HDotCheckResult">
+        <select name="HDotCheckResult" lay-filter="HDotCheckResult" id="HDotCheckResult{{d.LAY_TABLE_INDEX+1}}" style="height:30px;">
+            <option value="OK">OK</option>
+            <option value="NG">NG</option>
+        </select>
+    </script>-->
+    <!--澶嶉�夋锛堢偣妫�缁撴灉锛�-->
+    <script type="text/html" id="HDotCheckResult">
+        <input type="checkbox" value="{{d.HDotCheckResult}}" lay-skin="primary" id="HDotCheckResult{{d.LAY_TABLE_INDEX+1}}" lay-filter="HDotCheckResult" {{ d.HDotCheckResult == 1 ? 'checked' : '' }}>
+    </script>
+    <!--琛屼笅鎷夐�夋嫨(鐐规缁撴灉)-->
+    <!--<script type="text/html" id="HDotCheckResult">
+        <select name="HDotCheckResult" lay-filter="HDotCheckResult" id="HDotCheckResult{{d.LAY_TABLE_INDEX+1}}">-->
+    <!--<option value="">璇烽�夋嫨</option>-->
+    <!--<option value="Y" selected>Y</option>
+            <option value="X">X</option>
+        </select>
+    </script>-->
     <script>
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -278,8 +333,9 @@
                 , form = layui.form
                 , laydate = layui.laydate
                 , element = layui.element;
+            var option = [];
 
-            //鏃ユ湡鏃堕棿閫夋嫨鍣�
+            //#region 鍒濆鍖栭〉闈�
             laydate.render({
                 elem: '#HBeginDate'
                 , type: 'datetime'
@@ -308,6 +364,50 @@
                 elem: '#HDeleteDate'
                 , type: 'datetime'
             });
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            //鑾峰彇鏈�澶у崟鎹彿
+            $.ajax({
+                url: GetWEBURL() + "/Web/GetMAXNum",
+                type: "GET",
+                data: { "HBillType": '3821' },
+                success: function (d) {
+                    //console.log(d.data);
+                    $("#HInterID").val("0");
+                    $("#HBillNo").val(d.data[0].HBillNo);
+                }
+            });
+
+            //褰撳墠鎵�鍦ㄩ〉绛�
+            var cur_title = "鍩烘湰淇℃伅";
+            var HCheckNum = 0;
+            //鐩戝惉褰撳墠澶勪簬鍝竴涓〉绛撅紝浼� HModName 鍊�
+            element.on('tab(TabTest)', function (data) {
+                cur_title = data.elem.context.innerText;
+                if (cur_title == "鏄庣粏淇℃伅") {
+                    HCheckNum++;
+                }
+            })
+
+            //#endregion
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                var NewRow = { "HDotCheckResult": false,"HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" };
+
+                switch (obj.event) {
+                    //鏂板涓�琛�
+                    case 'btn-AddLine': btnAddLine(NewRow);
+                        break;
+                }
+            });
+            //琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+            });
 
             //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
             $("#HBarCode").focus();
@@ -316,28 +416,16 @@
             $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鐐规寮�濮嬫椂闂�
             $("#HEndDate").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"));  //鍒涘缓鏃ユ湡   
-            
+            $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒涘缓鏃ユ湡
+
             $("#HDeptID").val(sessionStorage["HDeptID"]);            //閮ㄩ棬ID
             $("#HDeptName").val(sessionStorage["HDept"]);            //閮ㄩ棬
             $("#HManagerID").val(sessionStorage["HBillerID"]);       //璐熻矗浜篒D
             $("#HManagerName").val(sessionStorage["HUserName"]);     //璐熻矗浜�
             $("#HMaker").val(sessionStorage["HUserName"]);     //鍒涘缓浜�
+
             //妯℃不鍏锋潯鐮佹槸鍚︽壂鎻忔爣璁�
             var HProcExchBillNoFlag = false;
-
-            //鑾峰彇鏈�澶у崟鎹彿
-            $.ajax({
-                url: GetWEBURL() + "/Web/GetMAXNum",
-                type: "GET",
-                data: { "HBillType": '3903' },
-                success: function (d) {
-                    //console.log(d.data);
-                    $("#HInterID").val("0");
-                    $("#HBillNo").val(d.data[0].HBillNo);
-                }
-            });
-           
 
             //鏉″舰鐮佸洖杞︽柟娉�
             $('#HBarCode').on('keydown', function (event) {
@@ -345,71 +433,91 @@
                     GetMeesageByBarCode();
                 }
             });
-         
 
-            //閫�鍑�-鍏抽棴椤甸潰鏂规硶
-            $('#Cancel').on('click', function () {
-                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
-                    parent.layui.admin.events.closeThisTabs(); //鍏抽棴椤电
+            //琛岄�夋嫨澶勭悊锛堟楠岀粨鏋滐級
+            //form.on('select(HDotCheckResult)', function (data) {
+            //    //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+            //    var elem = data.othis.parents('tr');
+            //    var dataindex = elem.attr("data-index");
+            //    $.each(option.data, function (index, value) {
+            //        if (value.LAY_TABLE_INDEX == dataindex) {
+            //            value.HDotCheckResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+            //        }
+            //    });
+            //});
+
+            //鏄惁鍚堟牸
+            form.on('checkbox(HDotCheckResult)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HDotCheckResult = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
                 });
-            })
-
+            });
 
             //纭畾
             form.on('submit(QueDin)', function (data) {
                 GetMeesageByBarCode();
             });
+
+            //閫�鍑�-鍏抽棴椤甸潰鏂规硶
+            $('#Cancel').on('click', function () {
+                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    parent.location.href = "../../../views/index_Mobile.html";
+                });
+            })
+
             //鎻愪氦
             form.on('submit(Saver)', function (data) {//鎻愪氦
-                //var tableData = data.field;
                 data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
                 var oMain = JSON.stringify(data.field);
-                //var oMain = data.field;
-                var index = layer.load();
-                $.ajax({
-                    type: "POST",
-                    url: GetWEBURL() + "/Sb_EquipDotCheckBill/savebill",//Mj_PDA_MoudlCheckBill/SaveGetMoudlCheckBillList
-                    //url:"http://localhost:12761/Cj_StationEntrustOutBill/AddBill",
-                    async: true,
-                    data: { "msg": oMain },
-                    dataType: "json",
-                    success: function (data) {
-                        if (data.count == 1) {
-                            //layer.confirm(data.Message, {
-                            //    icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
-                            //    btn2: function () {
-                            //        //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
-                            //        //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
-                            //        parent.location.href = "../../../views/index.html"
-                            //    }//鍏抽棴
-                            //}, function () { window.location.reload(); });//鏂板
+                var sSubStr = JSON.stringify(table.cache['mainTable']);
+                var sMainSub = oMain + ';' + sSubStr + ";" + sessionStorage["HUserName"];
+
+                if (AllowLoadData(sSubStr)) {
+                    $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳绂佺敤
+
+                    $.ajax({
+                        type: "POST",
+                        url: GetWEBURL() + "/Sc_MouldDotCheckBill/SaveGetMouldDotCheckBillList",
+                        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 {
+                                $('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);//淇濆瓨鎸夐挳鍚敤
+                                layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        },
+                        error: function (err) {
                             layer.close(index);
-                            layer.msg("鎻愪氦鎴愬姛");
-                            $('#Saver').removeClass("buttom_box_little");
-                            $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
+                            layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         }
-                        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 = [{ "HDotCheckResult": false,"HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
+                table.render(option);
 
                 $("#HBarCode").focus();
                 //鑾峰彇鏈�澶у崟鎹彿
@@ -426,9 +534,18 @@
                 $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鐐规寮�濮嬫椂闂�
                 $("#HEndDate").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"));  //鍒涘缓鏃ユ湡           
+                $("#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) {
+                    parent.location.href = "../../../views/index_Mobile.html";
+                });
+            })
+            //#endregion
+
             //閮ㄩ棬寮圭獥
             form.on('submit(Department)', function () {
                 //椤甸潰灞�-鑷畾涔�
@@ -440,24 +557,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
-                    cancel: function (index, layero) {
-                    }
-                });
-            });
-
-            //璐熻矗浜哄脊绐�
-            //椤甸潰灞�-鑷畾涔�
-            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.html?TreeFlag=false', 'yes'],
+                    content: ['../../../views/PublicPage/DeptInformation_PDA.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
                         //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -466,8 +566,8 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HManagerName").val(checkStatus.data[0].HName);
-                        $("#HManagerID").val(checkStatus.data[0].HItemID);
+                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        $("#HDeptID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) {
@@ -483,73 +583,455 @@
                 });
             });
 
-            //鐐规椤圭洰寮圭獥
-            form.on('submit(HDotCheckItemList)', function () {
+            //鍣ㄥ叿鐐规璁″垝寮圭獥
+            form.on('submit(btnMouldDotCheckPlan)', function () {
                 //椤甸潰灞�-鑷畾涔�
                 layer.open({
                     type: 2,
                     skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '鐐规椤圭洰鍒楄〃',
+                    title: '鍣ㄥ叿鐐规璁″垝鍒楄〃',
                     closeBtn: 1,
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../Baseset/鍩虹璧勬枡/Gy_CheckItemList.html', 'yes'],
-                    cancel: function (index, layero) {
+                    content: ['../../../views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldDotCheckPlanBillList.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('璇烽�夋嫨鏁版嵁');
+                        }
+
+                        $("#HPlanNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+                        $("#HPlanInterID").val(checkStatus.data[0].hmainid);
+                        $("#HPlanEntryID").val(checkStatus.data[0].hsubid);
+
+                        get_DocCheckItemByPlan(checkStatus.data[0].hmainid);
+
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
                     }
                 });
             });
-            
 
+            //琛ㄥご淇℃伅鐢熶骇鐝寮圭獥
+            form.on('submit(btnShifts)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鐢熶骇鐝鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true
+                    , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ShiftsList.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HShiftsID").val(checkStatus.data[0].HItemID);
+                        $("#HShiftsName").val(checkStatus.data[0].鐝鍚嶇О);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+                    },
+                    success: function (layero, index) {
+                    }
+                });
+            });
+
+            //琛ㄥご淇℃伅璁惧淇濆吇瑙勭▼
+            form.on('submit(HEquipDotCheckRuleInterist)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '璁惧鐐规瑙勭▼鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../../璁惧绠$悊/璁惧瑙勭▼鍗�/Sb_EquipDotCheckRuleList_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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HMouldDotCheckRuleNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+                        $("#HMouldDotCheckRuleID").val(checkStatus.data[0].hmainid);
+                        get_DocCheckItem2();
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+                    },
+                    success: function (layero, index) {
+                    }
+                });
+            });
+
+            function get_DocCheckItemByPlan(HPlanID) {
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetItemByMouldDotCheckPlan",
+                    type: "GET",
+                    data: { "HInterID": HPlanID },
+                    success: function (result) {
+                        if (result.code == 1) {
+                            var data = result.data;
+                            $("#HMouldDotCheckRuleID").val(data[0].鐐规瑙勭▼ID);
+                            $("#HMouldDotCheckRuleNo").val(data[0].鐐规瑙勭▼鍗曞彿);
+                            $("#HPlanNo").val(data[0].鐐规璁″垝鍗�);
+                            $("#HPlanInterID").val(data[0].鐐规璁″垝ID);
+                            $("#HPlanEntryID").val(data[0].鐐规璁″垝瀛怚D);
+                            var rowdata = [];
+                            for (let i = 0; i < data.length; i++) {
+                                rowdata.push(
+                                    {
+                                        "HDotCheckResult": data[i].榛樿缁撹, "HDotCheckItemID": data[i].鐐规椤圭洰ID, "HDotCheckCode": data[i].鐐规椤圭洰浠g爜, "HDotCheckItem": data[i].鐐规椤圭洰鍚嶇О,
+                                        "HDotCheckPart": data[i].鐐规閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerCode": data[i].璐熻矗浜轰唬鐮�,
+                                        "HManagerName": data[i].璐熻矗浜哄悕绉�, "HSourceInterID": data[i].鐐规璁″垝ID, "HSourceEntryID": data[i].鐐规璁″垝瀛怚D, "HSourceBillNo": data[i].鐐规璁″垝鍗�, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""
+                                    }
+                                );
+                            }
+                            option.data = rowdata;
+                            table.render(option);
+                        }
+                    }
+                })
+            }
+
+            function get_DocCheckItem2() {
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetDotCheckRuleItemByDotCheckRuleID",
+                    type: "GET",
+                    data: { "HDotCheckRuleInterID": $("#HMouldDotCheckRuleID").val() },
+                    success: function (result) {
+                        if (result != null) {
+                            if (result.count == 1) {
+                                var BYData = result;//
+                                var rowdate1 = layui.table.cache["mainTable"];
+                                var data = result.data;
+                                option.data = [{ "HDotCheckResult": false,"HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
+                                table.render(option);
+
+                                if (BYData.data.length != 0)  //琛ㄤ綋鏁版嵁涓虹┖鏃�
+                                {
+                                    buttonArr = [];//娓呯┖鏁扮粍
+
+                                    for (var i = 0; i < BYData.data.length; i++) {
+                                        var checkrow = {
+                                            "HDotCheckItemID": data[i].HDotCheckItemID, "HDotCheckCode": data[i].HDotCheckCode, "HDotCheckItem": data[i].HDotCheckItem,
+                                            "HDotCheckPart": data[i].HDotCheckPart, "HClaim": rowdate1[i].HClaim, "HManagerID": data[i].HManagerID, "HManagerCode": data[i].HManagerCode,
+                                            "HManagerName": data[i].HManagerName, "HSourceInterID": data[i].鐐规璁″垝ID, "HSourceEntryID": data[i].鐐规璁″垝瀛怚D, "HSourceBillNo": data[i].鐐规璁″垝鍗�, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": false
+                                        };
+                                        buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+                                    }
+                                    table.reload("mainTable", {
+                                        data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+                                    })
+                                }
+                            }
+                            else {
+                                option.data = [{ "HDotCheckResult": false,"HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
+                                table.render(option);
+                                layer.alert("璇ヨ澶囨殏鏃犻粯璁ょ偣妫�璁板綍", { icon: 5 });
+                            }
+                        }
+                    }
+                })
+            }
+
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                //琛ㄥご
+                columns = [
+                    //{ type: 'checkbox' }
+                    { templet: '#xuhao', title: '搴忓彿', event: "qwe", width: 45 }
+                    , { field: 'HDotCheckResult', title: '缁撴灉', templet: '#HDotCheckResult', width: 55 }
+                    , { field: 'HDotCheckItemID', title: '鐐规椤圭洰ID', edit: 'text', hide: true }
+                    , { field: 'HDotCheckCode', title: '鐐规椤圭洰浠g爜', edit: 'text', event: "HDotCheckCode", width: 115, hide: true }
+                    , { field: 'HDotCheckItem', title: '鐐规椤圭洰', edit: 'text', event: "" }
+                    , { field: 'HDotCheckItemClassID', title: '鐐规椤圭洰鍒嗙被ID', edit: 'text', hide: true }
+                    , { field: 'HDotCheckItemClassName', title: '鐐规椤圭洰鍒嗙被', edit: 'text', event: 'HDotCheckItemClassName' }
+                    , { field: 'HDotCheckItemMethodID', title: '鐐规鏂规硶ID', edit: 'text', hide: true }
+                    , { field: 'HDotCheckItemMethodName', title: '鐐规鏂规硶', edit: 'text', event: 'HDotCheckItemMethodName' }
+                    //, { field: 'HDotCheckResult', title: '鐐规缁撴灉', templet: '#HDotCheckResult', event: 'HDotCheckResult' }
+                    , { field: 'HDotCheckPart', title: '鐐规閮ㄤ綅', edit: 'text', event: "" }
+                    , { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
+                    , { field: 'HManagerID', title: '璐熻矗浜轰唬鐮�', edit: 'text', hide: true }
+                    , { field: 'HManagerCode', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: 'HManagerCode', width: 150, hide: true }
+                    , { field: 'HManagerName', title: '璐熻矗浜哄悕绉�', edit: 'text' }
+                    , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+                    , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', edit: 'text', hide: true }
+                    , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', edit: 'text', hide: true }
+                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', edit: 'text', hide: true }
+                    , { title: '鎿嶄綔', toolbar: '#barDemo', width: 80 }
+                ];
+                option = {
+                    id: 'mainTable'
+                    , elem: '#mainTable'
+                    //, toolbar: '#toolbarDemo'
+                    , page: false
+                    , cellMinWidth: 100
+                    , limit: 100
+                    , height: 'full-205'
+                    , cols: [columns]
+                    , done: function (res, curr, count) {
+
+                    }
+                };
+
+                option.data = [{ "HDotCheckResult": false, "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
+                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 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 (HCheckNum < 1) {
+                    layer.msg("璇峰埌 鏄庣粏淇℃伅 椤电涓牳瀵硅繃涓�娆′俊鎭悗鍐嶇偣鍑讳繚瀛樻寜閽�", { icon: 5, btn: ['纭'], time: 10000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+
+                if ($("#HBarName").val() == '') {
+                    layer.msg("璁惧娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+
+                if ($("#HMouldDotCheckRuleID").val() == 0 || $("#HMouldDotCheckRuleNo").val() == '') {
+                    layer.msg("鐐规瑙勭▼涓虹┖", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                //鍒ゆ柇鏄庣粏椤�
+                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].HDotCheckCode == "" || sSubStr[i].HDotCheckItemID == "") {
+                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐐规椤圭洰浠g爜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return false;
+                        }
+                        if (sSubStr[i].HManagerCode == "") {
+                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璐熻矗浜轰唬鐮佷俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return false;
+                        }
+                        else {
+                            return true;
+                        }
+                    }
+                }
+                else {
+                    return true;
+                }
+            }
+            //鎵潯鐮�
+            function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+                var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+                if (!HBarCode) {
+                    layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+                    return;
+                }
+                var index = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "/QJ_PDA_MouldDotCheckBill/txtHBarCode_KeyDown",
+                    type: "GET",
+                    data: { "HBarCode": HBarCode },
+                    success: function (result) {
+                        if (result.data.length == 1) {
+                            var data = result.data[0];
+                            $("#HMouldID").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;
+                            //get_DocCheckItem();
+                            layer.close(index);
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg("鏈煡鎵惧埌鏁版嵁", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+            function get_DocCheckItem() {
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetItemByEquipFile",
+                    type: "GET",
+                    data: { "MouldProjectID": $("#HMouldID").val(), "Type": "DJ", "HDate": $("#HBeginDate").val() },
+                    success: function (result) {
+                        if (result.code == 1) {
+                            var data = result.data;
+                            $("#HMouldDotCheckRuleID").val(data[0].鐐规瑙勭▼ID);
+                            $("#HMouldDotCheckRuleNo").val(data[0].鐐规瑙勭▼鍗曞彿);
+                            $("#HPlanNo").val(data[0].鐐规璁″垝鍗�);
+                            $("#HPlanInterID").val(data[0].鐐规璁″垝ID);
+                            $("#HPlanEntryID").val(data[0].鐐规璁″垝瀛怚D);
+                            var rowdata = [];
+                            for (let i = 0; i < data.length; i++) {
+                                rowdata.push(
+                                    {
+                                        "HDotCheckResult": data[i].榛樿缁撹, "HDotCheckItemID": data[i].鐐规椤圭洰ID, "HDotCheckCode": data[i].鐐规椤圭洰浠g爜, "HDotCheckItem": data[i].鐐规椤圭洰鍚嶇О,
+                                        "HDotCheckPart": data[i].鐐规閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerCode": data[i].璐熻矗浜轰唬鐮�,
+                                        "HManagerName": data[i].璐熻矗浜哄悕绉�, "HSourceInterID": data[i].鐐规璁″垝ID, "HSourceEntryID": data[i].鐐规璁″垝瀛怚D, "HSourceBillNo": data[i].鐐规璁″垝鍗�, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""
+                                    }
+                                );
+                            }
+                            option.data = rowdata;
+                            table.render(option);
+                        }
+                    }
+                })
+            }
+
+            //琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
+            function set_GridCellCheck(obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        if (obj.event === 'HDotCheckItemClassName')  //鐐规椤圭洰鍒嗙被
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '鐐规椤圭洰鍒嗙被鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true
+                                , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemClassList.html', 'yes']
+                                , btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HDotCheckItemClassID: checkStatus.data[0].HItemID,
+                                        HDotCheckItemClassName: checkStatus.data[0].鐐规椤圭洰鍒嗙被鍚嶇О
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                }
+                            });
+                        }
+                        if (obj.event === 'HDotCheckItemMethodName')  //鐐规鏂规硶
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '鐐规鏂规硶鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true
+                                , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemMethodList.html', 'yes']
+                                , btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HDotCheckItemMethodID: checkStatus.data[0].HItemID,
+                                        HDotCheckItemMethodName: checkStatus.data[0].鐐规鏂规硶鍚嶇О
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                }
+                            });
+                        }
+
+                        obj.event = "";
+                        return false;
+
+                    }
+
+                })
+            }
             //浠ヤ笂涓簂ayui妯″潡
         });
-
-        //杩斿洖閮ㄩ棬
-        function GetHDeptNameValue(obj) {  
-            $("#HDeptName").val(obj[0].HName);
-            $("#HDeptID").val(obj[0].HItemID);
-        }
-        //杩斿洖鐐规椤圭洰
-        function GetHCheckNameValue(obj) {
-            $("#HDotCheckItem").val(obj[0].HName);
-            $("#HDotCheckItemID").val(obj[0].HItemID);
-        }
-        //鎵潯鐮�
-        function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
-            var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
-            if (!HBarCode) {
-                layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
-                return;
-            }
-            var index = layer.load();
-            $.ajax({
-                url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
-                type: "GET",
-                data: { "HBarCode": HBarCode },
-                success: function (result) {
-                    if (result.data.length == 1) {
-                        var data = result.data[0];
-                        $("#HMouldID").val(data.hinterid);
-                        $("#HBarName").val(data.HName);
-                        $("#HBarSpec").val(data.HModel);
-                        $("#HBarModel").val(data.HModel2);
-                        $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
-                        $("#HBarCode").css("background-color", "#efefef4d");
-
-                        HProcExchBillNoFlag = true;
-                        layer.close(index);
-                    }
-                    else {
-                        layer.close(index);
-                        layer.msg("鏈煡鎵惧埌鏁版嵁", { 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: "娓╅Θ鎻愮ず" });
-                }
-            });
-        }
     </script>
 </body>
 </html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldDotCheckBill_PDA_OLD.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldDotCheckBill_PDA_OLD.html"
new file mode 100644
index 0000000..a07128d
--- /dev/null
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldDotCheckBill_PDA_OLD.html"
@@ -0,0 +1,555 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鍣ㄥ叿鐐规璁板綍鍗�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <!--寮曠敤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>
+    <!--鑷畾涔夋牱寮�-->
+    <style>
+        .maintitle {
+            background-color: #1492ff;
+            color: #fff;
+            padding: 5px 10px;
+            border: none;
+            border-radius: 4px;
+        }
+
+        .title {
+            border-left: 4px solid #1492ff;
+            padding-left: 6px;
+            margin: 20px 10px 4px;
+            font-size: 16px;
+            color: #333;
+        }
+
+        .buttom_box_little {
+            width: 60px;
+            height: 36px;
+            color: #fff;
+            background-color: #1492ff;
+            border-radius: 4px;
+            border: none;
+            margin: 10px;
+        }
+
+        .layui-input {
+            width: 93%;
+        }
+        .layui-inline, img {
+            display: block;
+            vertical-align: middle
+        }
+        .layui-input, .layui-textarea {
+            display: inline-block;
+            width: 100%;
+            padding-left: 10px;
+        }
+       
+        .laydate-time-list ol {
+            overflow-x: hidden !important;
+            overflow-y: auto !important;
+        }
+        .layui-form-label {
+            padding: 9px 5px;
+        }
+        .layui-input-block {
+            margin-left: 85px;
+            min-height: 36px;
+        }
+    </style>
+</head>
+
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 15px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
+                    <div class="maintitle">鍣ㄥ叿鐐规璁板綍鍗�</div>
+                    <div class="layui-form-item" style="padding-top: 10px;">
+                        <div  class="layui-inline">
+                            <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍣ㄥ叿鏉$爜</label>
+                            <div class="layui-input-block" style="margin-left: 100px;width:46%;">
+                                <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                        <ul class="layui-tab-title">
+                            <li class="layui-this">鍩烘湰淇℃伅</li>
+                            <li>鍏朵粬淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">鐐规寮�濮�:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="datetime" class="layui-input" name="HBeginDate" id="HBeginDate" placeholder="璇烽�夋嫨鏃ユ湡">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">鐐规缁撴潫:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="datetime" class="layui-input" name="HEndDate" id="HEndDate" placeholder="璇烽�夋嫨鏃ユ湡">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">鐐规瑕佹眰:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <textarea name="HClaim" id="HClaim" placeholder="璇疯緭鍏ュ唴瀹�" class="layui-textarea"></textarea>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">鍗曟嵁鍙�:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">鍗曟嵁鏃ユ湡:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="datetime" class="layui-input" name="HDate" id="HDate" placeholder="璇烽�夋嫨鏃ユ湡" readonly disabled>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">閮ㄩ棬:</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" name="HDeptName" id="HDeptName" class="layui-input" style="width:80%;">
+                                                <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input">
+                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Department" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">璐熻矗浜�:</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" name="HManagerName" id="HManagerName" class="layui-input" style="width:80%;">
+                                                <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input">
+                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HManager" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">鐐规椤圭洰:</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" name="HDotCheckItem" id="HDotCheckItem" class="layui-input" style="width:80%;">
+                                                <input type="hidden" name="HDotCheckItemID" id="HDotCheckItemID" class="layui-input">
+                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HDotCheckItemList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">鐐规閮ㄤ綅:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="text" class="layui-input" name="HDotCheckPart" id="HDotCheckPart" >
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍚嶇О:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿瑙勬牸:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="text" name="HBarSpec" id="HBarSpec" class="layui-input" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍨嬪彿:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="text" name="HBarModel" id="HBarModel" class="layui-input" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">鍒涘缓浜�:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">鍒涘缓鏃ユ湡:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly disabled>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">淇敼浜�:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly disabled>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">淇敼鏃ユ湡:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly disabled>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">瀹℃牳浜�:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">瀹℃牳鏃ユ湡:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly disabled>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">浣滃簾浜�:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 75px;">浣滃簾鏃ユ湡:</label>
+                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                                <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly disabled>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+               
+                   
+                    <div class="layer-footer" style="text-align: center;">
+                        <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Saver" id="Saver">鎻愪氦</button>
+                        <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Add">鏂板</button>
+                        <button type="button" class="layui-btn buttom_box_little" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+                    </div>
+                    <!--闅愯棌瀛楁-->
+                    <input type="hidden" name="lngBillKey" id="lngBillKey">
+                    <input type="hidden" name="lngBillSubKey" id="lngBillSubKey">
+
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        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;
+
+            //鏃ユ湡鏃堕棿閫夋嫨鍣�
+            laydate.render({
+                elem: '#HBeginDate'
+                , type: 'datetime'
+            });
+            laydate.render({
+                elem: '#HEndDate'
+                , type: 'datetime'
+            });
+            laydate.render({
+                elem: '#HDate'
+                , type: 'datetime'
+            });
+            laydate.render({
+                elem: '#HMakeDate'
+                , type: 'datetime'
+            });
+            laydate.render({
+                elem: '#HUpDateDate'
+                , type: 'datetime'
+            });
+            laydate.render({
+                elem: '#HCheckDate'
+                , type: 'datetime'
+            });
+            laydate.render({
+                elem: '#HDeleteDate'
+                , type: 'datetime'
+            });
+
+            //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
+            $("#HBarCode").focus();
+
+            //鍒濆鍩烘湰淇℃伅璧嬪��
+            $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鐐规寮�濮嬫椂闂�
+            $("#HEndDate").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"]);            //閮ㄩ棬
+            $("#HManagerID").val(sessionStorage["HBillerID"]);       //璐熻矗浜篒D
+            $("#HManagerName").val(sessionStorage["HUserName"]);     //璐熻矗浜�
+            $("#HMaker").val(sessionStorage["HUserName"]);     //鍒涘缓浜�
+            //妯℃不鍏锋潯鐮佹槸鍚︽壂鎻忔爣璁�
+            var HProcExchBillNoFlag = false;
+
+            //鑾峰彇鏈�澶у崟鎹彿
+            $.ajax({
+                url: GetWEBURL() + "/Web/GetMAXNum",
+                type: "GET",
+                data: { "HBillType": '3903' },
+                success: function (d) {
+                    //console.log(d.data);
+                    $("#HInterID").val("0");
+                    $("#HBillNo").val(d.data[0].HBillNo);
+                }
+            });
+           
+
+            //鏉″舰鐮佸洖杞︽柟娉�
+            $('#HBarCode').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    GetMeesageByBarCode();
+                }
+            });
+         
+
+            //閫�鍑�-鍏抽棴椤甸潰鏂规硶
+            $('#Cancel').on('click', function () {
+                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    parent.layui.admin.events.closeThisTabs(); //鍏抽棴椤电
+                });
+            })
+
+
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
+            });
+            //鎻愪氦
+            form.on('submit(Saver)', function (data) {//鎻愪氦
+                //var tableData = data.field;
+                data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
+                var oMain = JSON.stringify(data.field);
+                //var oMain = data.field;
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Sb_EquipDotCheckBill/savebill",//Mj_PDA_MoudlCheckBill/SaveGetMoudlCheckBillList
+                    //url:"http://localhost:12761/Cj_StationEntrustOutBill/AddBill",
+                    async: true,
+                    data: { "msg": oMain },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) {
+                            //layer.confirm(data.Message, {
+                            //    icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
+                            //    btn2: function () {
+                            //        //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
+                            //        //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
+                            //        parent.location.href = "../../../views/index.html"
+                            //    }//鍏抽棴
+                            //}, function () { window.location.reload(); });//鏂板
+                            layer.close(index);
+                            layer.msg("鎻愪氦鎴愬姛");
+                            $('#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();
+
+
+                $("#HBarCode").focus();
+                //鑾峰彇鏈�澶у崟鎹彿
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '3903' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HInterID").val("0");
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                    }
+                });
+                $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鐐规寮�濮嬫椂闂�
+                $("#HEndDate").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"]);     //鍒涘缓浜�
+            })
+            //閮ㄩ棬寮圭獥
+            form.on('submit(Department)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '閮ㄩ棬鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+                    cancel: function (index, layero) {
+                    }
+                });
+            });
+
+            //璐熻矗浜哄脊绐�
+            //椤甸潰灞�-鑷畾涔�
+            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.html?TreeFlag=false', '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(HDotCheckItemList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鐐规椤圭洰鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../Baseset/鍩虹璧勬枡/Gy_CheckItemList.html', 'yes'],
+                    cancel: function (index, layero) {
+                    }
+                });
+            });
+            
+
+            //浠ヤ笂涓簂ayui妯″潡
+        });
+
+        //杩斿洖閮ㄩ棬
+        function GetHDeptNameValue(obj) {  
+            $("#HDeptName").val(obj[0].HName);
+            $("#HDeptID").val(obj[0].HItemID);
+        }
+        //杩斿洖鐐规椤圭洰
+        function GetHCheckNameValue(obj) {
+            $("#HDotCheckItem").val(obj[0].HName);
+            $("#HDotCheckItemID").val(obj[0].HItemID);
+        }
+        //鎵潯鐮�
+        function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+            var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+            if (!HBarCode) {
+                layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+                return;
+            }
+            var index = layer.load();
+            $.ajax({
+                url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
+                type: "GET",
+                data: { "HBarCode": HBarCode },
+                success: function (result) {
+                    if (result.data.length == 1) {
+                        var data = result.data[0];
+                        $("#HMouldID").val(data.hinterid);
+                        $("#HBarName").val(data.HName);
+                        $("#HBarSpec").val(data.HModel);
+                        $("#HBarModel").val(data.HModel2);
+                        $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                        $("#HBarCode").css("background-color", "#efefef4d");
+
+                        HProcExchBillNoFlag = true;
+                        layer.close(index);
+                    }
+                    else {
+                        layer.close(index);
+                        layer.msg("鏈煡鎵惧埌鏁版嵁", { 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: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
+    </script>
+</body>
+</html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html"
index 8d5fb35..c686dfa 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html"
@@ -12,10 +12,19 @@
         .layui-form-label {
             width: 85px;
         }
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
     </style>
 </head>
 <body>
-
     <div id="layout1" class="layui-fluid">
         <div class="layui-row layui-col-space15">
             <div class="layui-col-md12">
@@ -107,6 +116,36 @@
                                             </div>
                                         </div>
                                         <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">寮傚父鎯呭喌璁板綍</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HErrNote" id="HErrNote" class="layui-input">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">閲嶅ぇ瀹夊叏<br />闅愭偅璁板綍</label>
+                                                <div class="layui-input-inline" style="margin-top:10px;">
+                                                    <input type="text" name="HBigSafeNote" id="HBigSafeNote" class="layui-input">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鐐规鏁版嵁</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HDotCheckNote" id="HDotCheckNote" class="layui-input">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鐢熶骇鐝</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="hidden" name="HShiftsID" id="HShiftsID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                    <input type="text" name="HShiftsName" id="HShiftsName" class="layui-input" value="" style="float:left;width:150px;background-color:#efefef4d;" readonly="readonly">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHShifts" style="width:40px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                    </button>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
 
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">鎽樿</label>
@@ -118,6 +157,13 @@
                                                 <label class="layui-form-label">澶囨敞</label>
                                                 <div class="layui-input-inline">
                                                     <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鏈�缁堢粨璁�</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="radio" name="HLastResult" id="HLastResult" value="OK" title="OK" checked>
+                                                    <input type="radio" name="HLastResult" id="HLastResult" value="NG" title="NG">
                                                 </div>
                                             </div>
                                         </div>
@@ -162,6 +208,14 @@
     <script type="text/html" id="barDemo1">
         <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
         <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del1">鍒犻櫎</a>
+    </script>
+    <!--琛屼笅鎷夐�夋嫨(鐐规缁撴灉)-->
+    <script type="text/html" id="HDotCheckResult">
+        <select name="HDotCheckResult" lay-filter="HDotCheckResult" id="HDotCheckResult{{d.LAY_TABLE_INDEX+1}}">
+            <!--<option value="">璇烽�夋嫨</option>-->
+            <option value="Y" selected>Y</option>
+            <option value="X">X</option>
+        </select>
     </script>
     <script src="../../../layuiadmin/layui/layui.js"></script>
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
@@ -209,7 +263,7 @@
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
             var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
             $("h1").html('<b>' + HPageTitle + '</b>');
-			//#endregion
+            //#endregion
 
             //鍒濆鍖栬〃鍗曟彃浠�
             set_InitFrom();
@@ -238,7 +292,7 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "" };
+                var NewRow = { "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" };
                 switch (obj.event) {
                     //鏂板涓�琛�
                     case 'btn-AddLine': btnAddLine(NewRow);
@@ -301,6 +355,41 @@
                     }
                 });
 
+            });
+
+            //琛ㄥご淇℃伅鐢熶骇鐝寮圭獥
+            form.on('submit(btnHShifts)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鐢熶骇鐝鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true
+                    , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ShiftsList.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HShiftsID").val(checkStatus.data[0].HItemID);
+                        $("#HShiftsName").val(checkStatus.data[0].鐝鍚嶇О);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+                    },
+                    success: function (layero, index) {
+                    }
+                });
             });
 
             //琛ㄥご浜у搧妯″叿淇℃伅
@@ -370,7 +459,32 @@
                 });
             });
 
+            //琛岄�夋嫨澶勭悊锛堢偣妫�缁撴灉锛�
+            form.on('select(HDotCheckResult)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HDotCheckResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
 
+                var HQty = 0;//琛ㄤ綋琛屼笉鍚堟牸鏁伴噺
+                for (let i = 0; i < table.cache['mainTable'].length; i++) {
+                    if (table.cache['mainTable'][i].HDotCheckResult == "X") {
+                        HQty++;
+                    }
+                }
+                if (HQty > 0) {
+                    document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+                    $("input:radio[name=HLastResult][value=" + "NG" + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+                } else {
+                    document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+                    $("input:radio[name=HLastResult][value=" + "OK" + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+                }
+                form.render('radio');
+            });
 
 
             //琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
@@ -449,6 +563,73 @@
                                 }
                             });
                         }
+                        if (obj.event === 'HDotCheckItemClassName')  //鐐规椤圭洰鍒嗙被
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '鐐规椤圭洰鍒嗙被鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true
+                                , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemClassList.html', 'yes']
+                                , btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HDotCheckItemClassID: checkStatus.data[0].HItemID,
+                                        HDotCheckItemClassName: checkStatus.data[0].鐐规椤圭洰鍒嗙被鍚嶇О
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                }
+                            });
+                        }
+                        if (obj.event === 'HDotCheckItemMethodName')  //鐐规鏂规硶
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '鐐规鏂规硶鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true
+                                , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemMethodList.html', 'yes']
+                                , btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HDotCheckItemMethodID: checkStatus.data[0].HItemID,
+                                        HDotCheckItemMethodName: checkStatus.data[0].鐐规鏂规硶鍚嶇О
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                }
+                            });
+                        }
+
                         obj.event = "";
                         return false;
 
@@ -547,6 +728,11 @@
                     , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
                     , { field: 'HDotCheckItemID', title: '鐐规ID', edit: 'text', hide: true }
                     , { field: 'HDotCheckItem', title: '鐐规椤圭洰', edit: 'text', event: 'HDotCheckItem' }
+                    , { field: 'HDotCheckItemClassID', title: '鐐规椤圭洰鍒嗙被ID', edit: 'text', hide: true }
+                    , { field: 'HDotCheckItemClassName', title: '鐐规椤圭洰鍒嗙被', edit: 'text', event: 'HDotCheckItemClassName' }
+                    , { field: 'HDotCheckItemMethodID', title: '鐐规鏂规硶ID', edit: 'text', hide: true }
+                    , { field: 'HDotCheckItemMethodName', title: '鐐规鏂规硶', edit: 'text', event: 'HDotCheckItemMethodName' }
+                    , { field: 'HDotCheckResult', title: '鐐规缁撴灉', templet: '#HDotCheckResult', event: 'HDotCheckResult' }
                     , { field: 'HDotCheckPart', title: '鐐规閮ㄤ綅', edit: 'text' }
                     , { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
                     , { field: 'HManagerID', title: '璐熻矗浜篒D', edit: 'text', hide: true }
@@ -577,7 +763,7 @@
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
                 get_MAXNum();
-                option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "" }];
+                option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" }];
                 table.render(option);
             }
 
@@ -585,7 +771,7 @@
             function set_EditFromGrid() {
                 set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
                 set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
-                option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "" }];
+                option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" }];
                 table.render(option);
             }
 
@@ -610,7 +796,7 @@
             }
 
             // 鐐规璁″垝 鐐规淇℃伅 閰嶄欢淇℃伅
-            window.get_DocCheckItem = function(data) {
+            window.get_DocCheckItem = function (data) {
                 $.ajax({
                     url: GetWEBURL() + "/Sc_MouldDotCheckPlanBill/Sc_MouldDotCheckPlanBillListProjectDetai",
                     type: "GET",
@@ -622,7 +808,7 @@
                                 var BYData = result.list[0];//鐐规
                                 var PJData = result.list[1];//閰嶄欢
                                 var rowdate1 = layui.table.cache["mainTable"];
-                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "" }];
+                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" }];
                                 table.render(option);
 
                                 if (BYData.length != 0)  //琛ㄤ綋鏁版嵁涓嶄负绌烘椂
@@ -632,16 +818,14 @@
                                         var checkrow = {
                                             "HDotCheckItemID": BYData[i].HDotCheckItemID, "HDotCheckItem": BYData[i].HDotCheckItem, "HDotCheckPart": BYData[i].HDotCheckPart,
                                             "HClaim": BYData[i].HClaim, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerCode,
-                                            "HManagerName": BYData[i].HManagerName, "HRemark": BYData[i].HRemark
+                                            "HManagerName": BYData[i].HManagerName, "HRemark": BYData[i].HRemark, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"
                                         };
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
-                                    table.reload("mainTable", {
-                                        data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
-                                    })
+
+                                    option.data = buttonArr;
+                                    table.render(option);
                                 }
-
-
                             } else {
                                 layer.alert(result.code + result.Message, { icon: 5 });
                             }
@@ -651,7 +835,7 @@
             }
 
             //鐐规瑙勭▼ 鐐规淇℃伅 閰嶄欢淇℃伅
-            window.get_DocCheckItem2 = function(data) {
+            window.get_DocCheckItem2 = function (data) {
                 $.ajax({
                     url: GetWEBURL() + "/Sc_MouldDotCheckRuleBill/Sc_MouldDotCheckRuleBillSubAndSubItem",
                     type: "GET",
@@ -663,7 +847,7 @@
                                 var BYData = result.list[0];//鐐规
                                 var PJData = result.list[1];//閰嶄欢
                                 var rowdate1 = layui.table.cache["mainTable"];
-                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "" }];
+                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" }];
                                 table.render(option);
 
                                 if (BYData.length != 0)  //琛ㄤ綋鏁版嵁涓嶄负绌烘椂
@@ -673,13 +857,12 @@
                                         var checkrow = {
                                             "HDotCheckItemID": BYData[i].HDotCheckItemID, "HDotCheckItem": BYData[i].HDotCheckItem, "HDotCheckPart": BYData[i].HDotCheckPart,
                                             "HClaim": BYData[i].HClaim, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerNumber,
-                                            "HManagerName": BYData[i].HManagerName, "HRemark": BYData[i].HRemark
+                                            "HManagerName": BYData[i].HManagerName, "HRemark": BYData[i].HRemark, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"
                                         };
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
-                                    table.reload("mainTable", {
-                                        data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
-                                    })
+                                    option.data = buttonArr;
+                                    table.render(option);
                                 }
 
                             } else {
@@ -719,7 +902,20 @@
                                 , "HMouldID": data.HMouldID
                                 , "HMouldDotCheckRuleName": data.鍣ㄥ叿鐐规瑙勭▼鍗曟嵁鍙�
                                 , "HMouldDotCheckRuleID": data.HMouldDotCheckRuleID
+                                , "HErrNote": data.寮傚父鎯呭喌璁板綍 //寮傚父鎯呭喌璁板綍
+                                , "HBigSafeNote": data.閲嶅ぇ瀹夊叏闅愭偅璁板綍 //閲嶅ぇ瀹夊叏闅愭偅璁板綍
+                                , "HDotCheckNote": data.鐐规鏁版嵁 //鐐规鏁版嵁
+                                , "HShiftsID": data.HShiftsID //
+                                , "HShiftsName": data.鐝鍚嶇О //鐝鍚嶇О
                             });
+                            if (data.鏈�缁堢粨璁� == "涓嶅悎鏍�") {
+                                document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+                                $("input:radio[name=HLastResult][value=" + "NG" + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+                            } else {
+                                document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+                                $("input:radio[name=HLastResult][value=" + "OK" + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+                            }
+                            form.render('radio');
 
                         } else {
                             layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
@@ -753,10 +949,18 @@
                     data: { "sqlWhere": "and HInterID=" + linterid },
                     success: function (result) {
                         if (result.count == 1) {
-                            option.data = result.list[0];
+                            var data = result.data;
+                            var subarr = [];
+                            for (var i = 0; i < data.length; i++) {
+                                subarr.push({ "HDotCheckItemID": data[i].鐐规椤圭洰ID, "HDotCheckItem": data[i].鐐规椤圭洰, "HDotCheckPart": data[i].鐐规閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerNumber": data[i].璐熻矗浜轰唬鐮�, "HManagerName": data[i].璐熻矗浜哄悕绉�, "HRemark": data[i].瀛愬娉�2, "HDotCheckItemClassID": data[i].HDotCheckItemClassID, "HDotCheckItemClassName": data[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": data[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": data[i].鐐规鏂规硶鍚嶇О, "HDotCheckResult": data[i].鐐规缁撴灉 == "鍚堟牸" ? 'Y' : 'X'  });
+                            }
+
+                            option.data = subarr;
                             table.render(option);
-                            option1.data = result.list[1];
-                            table.render(option1);
+                            for (let j = 0; j < data.length; j++) {
+                                $("#HDotCheckResult" + (j + 1)).val(data[j].鐐规缁撴灉 == "鍚堟牸" ? 'Y' : 'X')
+                            }
+                            form.render('select');
 
                         } else {
                             layer.alert(result.code + result.Message, { icon: 5 });
@@ -771,15 +975,14 @@
 
             //澧炲姞涓�琛�
             function btnAddLine(NewRow) {
-                var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
-                buttonArr = [];//娓呯┖鏁扮粍
-                for (var i = 0; i < tableBak.length; i++) {
-                    buttonArr.push(tableBak[i]);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+                table.cache["mainTable"].push(NewRow);
+                option.data = table.cache["mainTable"];
+                table.render(option);
+
+                for (var i = 1; i <= option.data.length; i++) {
+                    $('#HDotCheckResult' + i + '').find("option[value='" + option.data[i - 1].HDotCheckResult + "']").attr("selected", true);
                 }
-                buttonArr.push(NewRow);  //鍦ㄥ熬閮ㄥ姞涓�琛�
-                table.reload("mainTable", {
-                    data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
-                })
+                form.render('select');
             }
 
             //澶嶅埗涓�琛�
@@ -797,6 +1000,11 @@
                     table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
                     option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
                     table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+
+                    for (var i = 1; i <= option.data.length; i++) {
+                        $('#HDotCheckResult' + i + '').find("option[value='" + option.data[i - 1].HDotCheckResult + "']").attr("selected", true);
+                    }
+                    form.render('select');
                 }
             }
 
@@ -861,7 +1069,7 @@
 
         function GetMouldDotCheckPlanValue(obj) {  //鍣ㄥ叿鐐规璁″垝
             $("#HPlanNo").val(obj[0].鍗曟嵁鍙�);
-            $("#HPlanInterID").val(obj[0].hmainid);           
+            $("#HPlanInterID").val(obj[0].hmainid);
             get_DocCheckItem(obj[0].hmainid);
         }
 
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckPlanBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckPlanBillList.html"
index bb2d9c0..a8488e9 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckPlanBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckPlanBillList.html"
@@ -102,7 +102,7 @@
                                                     <label class="layui-form-label" style="width:95px;">鍣ㄥ叿鐐规瑙勭▼<label style="color:red"> * </label></label>
                                                     <div class="layui-input-inline">
                                                         <input type="text" name="HMouldDotCheckRuleName" id="HMouldDotCheckRuleName" class="layui-input" value="" style="float:left;width:150px;">
-                                                        <input type="hidden" name="HMouldDotCheckRuleID" id="HMouldDotCheckRuleID" class="layui-input" value="" style="float:left;width:150px;">
+                                                        <input type="hidden" name="HMouldDotCheckRuleID" id="HMouldDotCheckRuleID" class="layui-input" value="0" style="float:left;width:150px;">
                                                         <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHMouldDotCheckRule" style="width:40px;">
                                                             <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                         </button>
@@ -296,7 +296,7 @@
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
-                var NewRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" };
+                var NewRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" };
                 switch (obj.event) {
                     //澧炲姞涓�琛�
                     case 'btn-AddLine': set_AddLine(NewRow);
@@ -398,6 +398,10 @@
                     , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
                     , { field: 'HDotCheckItemID', title: '鐐规椤圭洰ID', edit: 'text', hide: true }
                     , { field: 'HDotCheckItem', title: '鐐规椤圭洰', edit: 'text', event: "HDotCheckCode" }
+                    , { field: 'HDotCheckItemClassID', title: '鐐规椤圭洰鍒嗙被ID', edit: 'text', hide: true }
+                    , { field: 'HDotCheckItemClassName', title: '鐐规椤圭洰鍒嗙被', edit: 'text', event: 'HDotCheckItemClassName' }
+                    , { field: 'HDotCheckItemMethodID', title: '鐐规鏂规硶ID', edit: 'text', hide: true }
+                    , { field: 'HDotCheckItemMethodName', title: '鐐规鏂规硶', edit: 'text', event: 'HDotCheckItemMethodName' }
                     , { field: 'HDotCheckPart', title: '鐐规閮ㄤ綅', edit: 'text', event: "" }
                     , { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
                     , { field: 'HManagerID', title: '璐熻矗浜轰唬鐮�', edit: 'text', hide: true }
@@ -431,21 +435,21 @@
                     success: function (result) {
                         if (result != null) {
                             if (result.count == 1) {
-                                var BYData = result.list[0];//鐐规
+                                var DJData = result.list[0];//鐐规
                                 var PJData = result.list[1];//閰嶄欢
                                 var rowdate1 = layui.table.cache["mainTable"];
                                 var rowdate2 = layui.table.cache["mainTable1"];
-                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
+                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
                                 table.render(option);
 
-                                if (BYData.length != 0)  //琛ㄤ綋鏁版嵁涓嶄负绌烘椂
+                                if (DJData.length != 0)  //琛ㄤ綋鏁版嵁涓嶄负绌烘椂
                                 {
                                     buttonArr = [];//娓呯┖鏁扮粍
-                                    for (var i = 0; i < BYData.length; i++) {
+                                    for (var i = 0; i < DJData.length; i++) {
                                         var checkrow = {
-                                            "HDotCheckItemID": BYData[i].HDotCheckItemID, "HDotCheckItem": BYData[i].HDotCheckItem, "HDotCheckPart": BYData[i].HDotCheckPart,
-                                            "HClaim": BYData[i].HClaim, "HManagerID": BYData[i].HManagerID, "HManagerCode": BYData[i].HManagerNumber,
-                                            "HManagerName": BYData[i].HManagerName, "HRemark": BYData[i].HRemark
+                                            "HDotCheckItemID": DJData[i].鐐规椤圭洰ID, "HDotCheckItem": DJData[i].鐐规椤圭洰, "HDotCheckPart": DJData[i].鐐规閮ㄤ綅,
+                                            "HClaim": DJData[i].鍏蜂綋瑕佹眰, "HManagerID": DJData[i].璐熻矗浜篒D, "HManagerCode": DJData[i].璐熻矗浜轰唬鐮�,
+                                            "HManagerName": DJData[i].璐熻矗浜哄悕绉�, "HRemark": DJData[i].瀛愬娉�, "HDotCheckItemClassID": DJData[i].HDotCheckItemClassID, "HDotCheckItemClassName": DJData[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": DJData[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": DJData[i].鐐规鏂规硶鍚嶇О
                                         };
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
@@ -466,7 +470,7 @@
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
                 get_MAXNum();
-                option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
+                option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
                 table.render(option);
             }
             //鑾峰彇鏈�澶у崟鎹彿鍙婇粯璁ゅ�艰祴鍊�
@@ -494,7 +498,7 @@
             function set_EditFromGrid() {
                 set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
                 set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
-                option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
+                option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
                 table.render(option);
             }
             //缂栬緫鍔犺浇琛ㄥご
@@ -544,9 +548,14 @@
                     type: "GET",
                     data: { "sqlWhere": "and HInterID=" + linterid },
                     success: function (result) {
-                        //console.log('gouba' + result);
                         if (result.count == 1) {
-                            option.data = result.list[0];
+                            var data = result.data;
+                            var subarr = [];
+                            for (var i = 0; i < data.length; i++) {
+                                subarr.push({ "HDotCheckItemID": data[i].鐐规椤圭洰ID, "HDotCheckCode": "", "HDotCheckItem": data[i].鐐规椤圭洰, "HDotCheckPart": data[i].鐐规閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerCode": data[i].璐熻矗浠g爜, "HManagerName": data[i].璐熻矗浜哄悕绉�, "HRemark": data[i].琛ㄤ綋澶囨敞, "HDotCheckItemClassID": data[i].HDotCheckItemClassID, "HDotCheckItemClassName": data[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": data[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": data[i].鐐规鏂规硶鍚嶇О });
+                            }
+
+                            option.data = subarr;
                             table.render(option);
 
                         } else {
@@ -654,7 +663,9 @@
                                     obj.update({
                                         HDotCheckItemID: checkStatus.data[0].HItemID,
                                         HDotCheckCode: checkStatus.data[0].鐐规椤圭洰浠g爜,
-                                        HDotCheckItem: checkStatus.data[0].鐐规椤圭洰鍚嶇О
+                                        HDotCheckItem: checkStatus.data[0].鐐规椤圭洰鍚嶇О,
+                                        HDotCheckItemClassID: checkStatus.data[0].HDotCheckItemClassID,
+                                        HDotCheckItemClassName: checkStatus.data[0].鐐规椤圭洰鍒嗙被鍚嶇О,
                                     });
                                     layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                                 }
@@ -702,6 +713,73 @@
                                 }
                             });
                         }
+                        if (obj.event === 'HDotCheckItemClassName')  //鐐规椤圭洰鍒嗙被
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '鐐规椤圭洰鍒嗙被鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true
+                                , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemClassList.html', 'yes']
+                                , btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HDotCheckItemClassID: checkStatus.data[0].HItemID,
+                                        HDotCheckItemClassName: checkStatus.data[0].鐐规椤圭洰鍒嗙被鍚嶇О
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                }
+                            });
+                        }
+                        if (obj.event === 'HDotCheckItemMethodName')  //鐐规鏂规硶
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '鐐规鏂规硶鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true
+                                , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemMethodList.html', 'yes']
+                                , btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HDotCheckItemMethodID: checkStatus.data[0].HItemID,
+                                        HDotCheckItemMethodName: checkStatus.data[0].鐐规鏂规硶鍚嶇О
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                }
+                            });
+                        }
+
                         obj.event = "";
                         return false;
 
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldDotCheckPlanBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldDotCheckPlanBillList.html"
index a5bb8da..96882fa 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldDotCheckPlanBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldDotCheckPlanBillList.html"
@@ -205,6 +205,25 @@
             });
             //#endregion
 
+            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;
+                    }
+                });
+            })
+
             //蹇�熻繃婊�
             function get_FastQuery(table, option) {
                 var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
index 8b3a19e..dd2cca3 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
@@ -302,7 +302,7 @@
                                                 <div class="layui-inline">
                                                     <label class="layui-form-label" style="width:110px;">瀵瑰簲CLOUD瀵嗙爜</label>
                                                     <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HCloudUserPsd" id="HCloudUserPsd">
+                                                        <input type="password" class="layui-input" name="HCloudUserPsd" id="HCloudUserPsd">
                                                     </div>
                                                 </div>
                                             </div>
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 2cafb20..204f376 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"
@@ -18,10 +18,19 @@
         .layui-form-label {
             width: 95px;
         }
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
     </style>
 </head>
 <body>
-
     <div id="layout1" class="layui-fluid">
         <div class="layui-row layui-col-space15">
             <div class="layui-col-md12">
@@ -29,13 +38,9 @@
                     <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                         <div class="layui-card-header">
                             <div class="layui-btn-group">
-
                                 <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
                                 <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
-
-
                             </div>
-
                         </div>
                         <div class="layui-card-body">
                             <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
@@ -50,7 +55,7 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">鍗曟嵁鍙�</label>
                                                 <div class="layui-input-inline">
-                                                    <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo"  style="background-color:#efefef4d;" readonly>
+                                                    <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
                                                     <input id="HInterID" name="HInterID" type="hidden" />
                                                     <input id="HMaker" name="HMaker" type="hidden" /><!--鍒跺崟浜�-->
                                                 </div>
@@ -71,7 +76,7 @@
                                                 <label class="layui-form-label">璁惧<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input type="hidden" name="HEquipID" id="HEquipID" class="layui-input" value="" style="float:left;width:150px;">
-                                                    <input type="text" name="HEquipName" id="HEquipName" class="layui-input" value="" style="float:left;width:150px;background-color:#efefef4d;"readonly="readonly">
+                                                    <input type="text" name="HEquipName" id="HEquipName" class="layui-input" value="" style="float:left;width:150px;background-color:#efefef4d;" readonly="readonly">
                                                     <button type="button" lay-submit="" class="layui-btn" lay-filter="ProductModulList" style="width:40px;">
                                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                     </button>
@@ -117,6 +122,36 @@
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
+                                                <label class="layui-form-label">寮傚父鎯呭喌璁板綍</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HErrNote" id="HErrNote" class="layui-input">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">閲嶅ぇ瀹夊叏<br />闅愭偅璁板綍</label>
+                                                <div class="layui-input-inline" style="margin-top:10px;">
+                                                    <input type="text" name="HBigSafeNote" id="HBigSafeNote" class="layui-input">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鐐规鏁版嵁</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HDotCheckNote" id="HDotCheckNote" class="layui-input">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鐢熶骇鐝</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="hidden" name="HShiftsID" id="HShiftsID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                    <input type="text" name="HShiftsName" id="HShiftsName" class="layui-input" value="" style="float:left;width:150px;background-color:#efefef4d;" readonly="readonly">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHShifts" style="width:40px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                    </button>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
                                                 <label class="layui-form-label">鎽樿</label>
                                                 <div class="layui-input-inline">
                                                     <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
@@ -126,6 +161,13 @@
                                                 <label class="layui-form-label">澶囨敞</label>
                                                 <div class="layui-input-inline">
                                                     <textarea placeholder="璇疯緭鍏ュ娉�" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鏈�缁堢粨璁�</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="radio" name="HLastResult" id="HLastResult" value="OK" title="OK" checked>
+                                                    <input type="radio" name="HLastResult" id="HLastResult" value="NG" title="NG">
                                                 </div>
                                             </div>
                                         </div>
@@ -154,6 +196,14 @@
     <script type="text/html" id="barDemo">
         <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
         <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+    </script>
+    <!--琛屼笅鎷夐�夋嫨(鐐规缁撴灉)-->
+    <script type="text/html" id="HDotCheckResult">
+        <select name="HDotCheckResult" lay-filter="HDotCheckResult" id="HDotCheckResult{{d.LAY_TABLE_INDEX+1}}">
+            <!--<option value="">璇烽�夋嫨</option>-->
+            <option value="Y" selected>Y</option>
+            <option value="X">X</option>
+        </select>
     </script>
     <script>
         var OptionData = [];
@@ -221,7 +271,7 @@
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
-                var NewRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" };
+                var NewRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "","HDotCheckResult":"Y"};
                 switch (obj.event) {
                     //鏂板涓�琛�
                     case 'btn-AddLine': btnAddLine(NewRow);
@@ -272,6 +322,42 @@
                     }
                 });
             });
+
+            //琛ㄥご淇℃伅鐢熶骇鐝寮圭獥
+            form.on('submit(btnHShifts)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鐢熶骇鐝鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true
+                    , content: ['../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ShiftsList.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HShiftsID").val(checkStatus.data[0].HItemID);
+                        $("#HShiftsName").val(checkStatus.data[0].鐝鍚嶇О);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+                    },
+                    success: function (layero, index) {
+                    }
+                });
+            });
+
             //鑾峰彇璁惧鐐规瑙勭▼
             function get_DocCheckItem() {
                 $.ajax({
@@ -283,7 +369,7 @@
                             if (result.count == 1) {
                                 var DJData = result;//
                                 var rowdate1 = layui.table.cache["mainTable"];
-                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": 0, "HManagerCode": " ", "HManagerName": " ", "HRemark": " " }];
+                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": 0, "HManagerCode": " ", "HManagerName": " ", "HRemark": " ", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"}];
                                 table.render(option);
                                 $("#HEquipDotCheckRuleInterID").val(DJData.data[0].HInterID);
                                 $("#HEquipDotCheckRuleInterNo").val(DJData.data[0].HBillNo);
@@ -294,17 +380,20 @@
                                         var checkrow = {
                                             "HDotCheckItemID": DJData.data[i].HDotCheckItemID, "HDotCheckCode": DJData.data[i].HDotCheckCode, "HDotCheckItem": DJData.data[i].HDotCheckItem,
                                             "HDotCheckPart": DJData.data[i].HDotCheckPart, "HManagerID": DJData.data[i].HManagerID, "HManagerCode": DJData.data[i].HManagerCode,
-                                            "HManagerName": DJData.data[i].HManagerName
+                                            "HManagerName": DJData.data[i].HManagerName, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"
                                         };
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
-                                    table.reload("mainTable", {
-                                        data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
-                                    })
+
+                                    option.data = buttonArr;
+                                    table.render(option);
+                                    //table.reload("mainTable", {
+                                    //    data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+                                    //})
                                 }
                             }
                             else {
-                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
+                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" }];
                                 table.render(option);
                                 //layer.alert("璇ヨ澶囨殏鏃犻粯璁ょ偣妫�璁板綍", { icon: 5 });
                             }
@@ -348,6 +437,39 @@
                     }
                 });
             });
+            //琛岄�夋嫨澶勭悊锛堢偣妫�缁撴灉锛�
+            form.on('select(HDotCheckResult)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HDotCheckResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+
+                //for (var i = 1; i <= option.data.length; i++) {
+                //    $('#HDotCheckResult' + i + '').find("option[value='" + option.data[i - 1].HDotCheckResult + "']").attr("selected", true);
+                //}
+                //form.render('select');
+                console.log(table.cache['mainTable']);
+
+                var HQty = 0;//琛ㄤ綋琛屼笉鍚堟牸鏁伴噺
+                for (let i = 0; i < table.cache['mainTable'].length; i++) {
+                    if (table.cache['mainTable'][i].HDotCheckResult == "X") {
+                        HQty++;
+                    }
+                }
+                if (HQty > 0) {
+                    document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+                    $("input:radio[name=HLastResult][value=" + "NG" + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+                } else {
+                    document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+                    $("input:radio[name=HLastResult][value=" + "OK" + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+                }
+                form.render('radio');
+            });
+
             window.get_DocCheckItem2 = function () {
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetDotCheckRuleItemByDotCheckRuleID",
@@ -358,7 +480,7 @@
                             if (result.count == 1) {
                                 var DJData = result;//
                                 var rowdate1 = layui.table.cache["mainTable"];
-                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": 0, "HManagerCode": " ", "HManagerName": " ", "HRemark": " " }];
+                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": 0, "HManagerCode": " ", "HManagerName": " ", "HRemark": " ", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"}];
                                 table.render(option);
 
                                 if (DJData.data.length != 0)  //琛ㄤ綋鏁版嵁涓虹┖鏃�
@@ -368,17 +490,19 @@
                                         var checkrow = {
                                             "HDotCheckItemID": DJData.data[i].HDotCheckItemID, "HDotCheckCode": DJData.data[i].HDotCheckCode, "HDotCheckItem": DJData.data[i].HDotCheckItem,
                                             "HDotCheckPart": DJData.data[i].HDotCheckPart, "HManagerID": DJData.data[i].HManagerID, "HManagerCode": DJData.data[i].HManagerCode,
-                                            "HManagerName": DJData.data[i].HManagerName
+                                            "HManagerName": DJData.data[i].HManagerName, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"
                                         };
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
-                                    table.reload("mainTable", {
-                                        data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
-                                    })
+                                    option.data = buttonArr;
+                                    table.render(option);
+                                    //table.reload("mainTable", {
+                                    //    data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+                                    //})
                                 }
                             }
                             else {
-                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
+                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"}];
                                 table.render(option);
                                 //layer.alert("璇ヨ澶囨殏鏃犻粯璁ょ偣妫�璁板綍", { icon: 5 });
                             }
@@ -409,7 +533,7 @@
                         }
                         $("#HPlanName").val(checkStatus.data[0].鍗曟嵁鍙�);
                         $("#HPlanNo").val(checkStatus.data[0].hmainid);
-                        $("#HEquipDotCheckPlanInterID").val(checkStatus.data[0].hmainid);                        
+                        $("#HEquipDotCheckPlanInterID").val(checkStatus.data[0].hmainid);
                         //$("#HEquipName").val(checkStatus.data[0].璁惧鍚嶇О);
                         //$("#HEquipID").val(checkStatus.data[0].璁惧ID);
                         $("#HEquipDotCheckRuleInterID").val(checkStatus.data[0].HMouldDotCheckRuleID);
@@ -433,7 +557,7 @@
                             if (result.count == 1) {
                                 var DJData = result.data;//
                                 var rowdate1 = layui.table.cache["mainTable"];
-                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": 0, "HManagerCode": " ", "HManagerName": " ", "HRemark": " " }];
+                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": 0, "HManagerCode": " ", "HManagerName": " ", "HRemark": " ", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" }];
                                 table.render(option);
 
                                 if (DJData.length != 0)  //琛ㄤ綋鏁版嵁涓虹┖鏃�
@@ -444,19 +568,22 @@
                                         var checkrow = {
                                             "HDotCheckItemID": DJData[i].HDotCheckID, "HDotCheckCode": DJData[i].鐐规椤圭洰浠g爜, "HDotCheckItem": DJData[i].鐐规椤圭洰,
                                             "HDotCheckPart": DJData[i].鐐规閮ㄤ綅, "HClaim": DJData[i].鍏蜂綋瑕佹眰, "HManagerID": DJData[i].HEmployeeID,
-                                            "HManagerCode": DJData[i].璐熻矗浜轰唬鐮�, "HManagerName": DJData[i].璐熻矗浜哄悕绉�, "HRemark": DJData[i].HRemark
+                                            "HManagerCode": DJData[i].璐熻矗浜轰唬鐮�, "HManagerName": DJData[i].璐熻矗浜哄悕绉�, "HRemark": DJData[i].HRemark,
+                                            "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"
                                         };
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
-                                    table.reload("mainTable", {
-                                        data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
-                                    })
+                                    option.data = buttonArr;
+                                    table.render(option);
+                                    //table.reload("mainTable", {
+                                    //    data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+                                    //})
                                 } else {
                                     layer.alert("鐐瑰墠鏃堕棿娈垫殏鏃犻渶瑕佺偣妫�鐨勮鍒�", { icon: 5 });
                                 }
                             }
                             else {
-                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
+                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"}];
                                 table.render(option);
                                 //layer.alert("璇ヨ澶囨殏鏃犻粯璁ょ偣妫�璁板綍", { icon: 5 });
                             }
@@ -472,6 +599,7 @@
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
                 var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
+                console.log(sSubStr);
                 if (AllowLoadData(sSubStr)) {
                     $.ajax(
                         {
@@ -489,9 +617,7 @@
                                     });
                                 }
                                 else {
-
                                     f_alert(data.Message);
-                                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
                                 }
                                 layer.closeAll("loading");
                             },
@@ -536,11 +662,16 @@
             function set_InitGrid() {
                 //琛ㄥご
                 columns = [
-                    { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�'}
+                    { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
                     , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
                     , { field: 'HDotCheckItemID', title: '鐐规椤圭洰ID', edit: 'text', hide: true }
                     , { field: 'HDotCheckCode', title: '鐐规椤圭洰浠g爜', edit: 'text', event: "HDotCheckCode" }
                     , { field: 'HDotCheckItem', title: '鐐规椤圭洰', edit: 'text', event: "" }
+                    , { field: 'HDotCheckItemClassID', title: '鐐规椤圭洰鍒嗙被ID', edit: 'text', hide: true }
+                    , { field: 'HDotCheckItemClassName', title: '鐐规椤圭洰鍒嗙被', edit: 'text', event: 'HDotCheckItemClassName' }
+                    , { field: 'HDotCheckItemMethodID', title: '鐐规鏂规硶ID', edit: 'text', hide: true }
+                    , { field: 'HDotCheckItemMethodName', title: '鐐规鏂规硶', edit: 'text', event: 'HDotCheckItemMethodName' }
+                    , { field: 'HDotCheckResult', title: '鐐规缁撴灉', templet: '#HDotCheckResult', event: 'HDotCheckResult' }
                     , { field: 'HDotCheckPart', title: '鐐规閮ㄤ綅', edit: 'text', event: "" }
                     , { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
                     , { field: 'HManagerID', title: '璐熻矗浜轰唬鐮�', edit: 'text', hide: true }
@@ -567,15 +698,15 @@
 
             //澧炲姞涓�琛屼簨浠�
             function btnAddLine(NewRow) {
-                var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
-                buttonArr = [];//娓呯┖鏁扮粍
-                for (var i = 0; i < tableBak.length; i++) {
-                    buttonArr.push(tableBak[i]);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+
+                table.cache["mainTable"].push(NewRow);
+                option.data = table.cache["mainTable"];
+                table.render(option);
+
+                for (var i = 1; i <= option.data.length; i++) {
+                    $('#HDotCheckResult' + i + '').find("option[value='" + option.data[i - 1].HDotCheckResult + "']").attr("selected", true);
                 }
-                buttonArr.push(NewRow);  //鍦ㄥ熬閮ㄥ姞涓�琛�
-                table.reload("mainTable", {
-                    data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
-                })
+                form.render('select');
             }
             //琛ㄦ牸澶嶅埗涓�琛屼簨浠�
             function btnCopyLine(data) {
@@ -592,6 +723,11 @@
                     table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
                     option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
                     table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+
+                    for (var i = 1; i <= option.data.length; i++) {
+                        $('#HDotCheckResult' + i + '').find("option[value='" + option.data[i - 1].HDotCheckResult + "']").attr("selected", true);
+                    }
+                    form.render('select');
                 }
             }
             // 琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
@@ -638,13 +774,15 @@
                                     if (checkStatus.data.length === 0) {
                                         return layer.msg('璇烽�夋嫨鏁版嵁');
                                     }
-                                   
+
                                     if (checkStatus.data.length === 1) {
                                         //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
                                         obj.update({
                                             HDotCheckItemID: checkStatus.data[0].HItemID,
                                             HDotCheckCode: checkStatus.data[0].鐐规椤圭洰浠g爜,
-                                            HDotCheckItem: checkStatus.data[0].鐐规椤圭洰鍚嶇О
+                                            HDotCheckItem: checkStatus.data[0].鐐规椤圭洰鍚嶇О,
+                                            HDotCheckItemClassID: checkStatus.data[0].HDotCheckItemClassID,
+                                            HDotCheckItemClassName: checkStatus.data[0].鐐规椤圭洰鍒嗙被鍚嶇О,
                                         });
                                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                                     } else {
@@ -659,15 +797,16 @@
                                         }
                                         //灏嗘壒閲忛�夋嫨鐨勬暟鎹啓鍏ユ暟缁勶紙澶氶�夎锛�
                                         for (var i = 0; i < checkStatus.data.length; i++) {
-                                            buttonArr.push({ "HDotCheckItemID": checkStatus.data[i].HItemID, "HDotCheckCode": checkStatus.data[i].鐐规椤圭洰浠g爜, "HDotCheckItem": checkStatus.data[i].鐐规椤圭洰鍚嶇О, "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" });
+                                            buttonArr.push({ "HDotCheckItemID": checkStatus.data[i].HItemID, "HDotCheckCode": checkStatus.data[i].鐐规椤圭洰浠g爜, "HDotCheckItem": checkStatus.data[i].鐐规椤圭洰鍚嶇О, "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" });
                                         }
-
-                                        table.reload("mainTable", {
-                                            data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
-                                        })
+                                        option.data = buttonArr;
+                                        table.render(option);
+                                        //table.reload("mainTable", {
+                                        //    data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+                                        //})
 
                                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                                    }   
+                                    }
                                 }
                                 , btn2: function (index, layero) {
                                     //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
@@ -679,7 +818,9 @@
                                         obj.update({
                                             HDotCheckItemID: OptionData[0].HItemID,
                                             HDotCheckCode: OptionData[0].鐐规椤圭洰浠g爜,
-                                            HDotCheckItem: OptionData[0].鐐规椤圭洰鍚嶇О
+                                            HDotCheckItem: OptionData[0].鐐规椤圭洰鍚嶇О,
+                                            HDotCheckItemClassID: OptionData[0].HDotCheckItemClassID,
+                                            HDotCheckItemClassName: OptionData[0].鐐规椤圭洰鍒嗙被鍚嶇О,
                                         });
                                         OptionData = [];
                                     }
@@ -731,6 +872,73 @@
                                 }
                             });
                         }
+                        if (obj.event === 'HDotCheckItemClassName')  //鐐规椤圭洰鍒嗙被
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '鐐规椤圭洰鍒嗙被鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true
+                                , content: ['../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemClassList.html', 'yes']
+                                , btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HDotCheckItemClassID: checkStatus.data[0].HItemID,
+                                        HDotCheckItemClassName: checkStatus.data[0].鐐规椤圭洰鍒嗙被鍚嶇О
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                }
+                            });
+                        }
+                        if (obj.event === 'HDotCheckItemMethodName')  //鐐规鏂规硶
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '鐐规鏂规硶鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true
+                                , content: ['../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemMethodList.html', 'yes']
+                                , btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HDotCheckItemMethodID: checkStatus.data[0].HItemID,
+                                        HDotCheckItemMethodName: checkStatus.data[0].鐐规鏂规硶鍚嶇О
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                }
+                            });
+                        }
+
                         obj.event = "";
                         return false;
 
@@ -761,7 +969,7 @@
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
                 get_MAXNum();
-                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" }];
+                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" }];
                 table.render(option);
             }
 
@@ -769,7 +977,7 @@
             function set_EditFromGrid(linterid) {
                 set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
                 set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
-                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
+                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" }];
                 table.render(option);
             }
             //缂栬緫鑾峰彇琛ㄥご
@@ -797,7 +1005,22 @@
                                 , "HRemark": data.琛ㄥご澶囨敞                //澶囨敞
                                 , "HEquipDotCheckRuleInterID": data.璁惧鐐规瑙勭▼ID // 璁惧鐐规瑙勭▼ID
                                 , "HEquipDotCheckRuleInterNo": data.璁惧鐐规瑙勭▼ // 璁惧鐐规瑙勭▼
+                                , "HErrNote": data.寮傚父鎯呭喌璁板綍 //寮傚父鎯呭喌璁板綍
+                                , "HBigSafeNote": data.閲嶅ぇ瀹夊叏闅愭偅璁板綍 //閲嶅ぇ瀹夊叏闅愭偅璁板綍
+                                , "HDotCheckNote": data.鐐规鏁版嵁 //鐐规鏁版嵁
+                                , "HShiftsID": data.HShiftsID //
+                                , "HShiftsName": data.鐝鍚嶇О //鐝鍚嶇О
+                                //, "HLastResult": data.鏈�缁堢粨璁� == "鍚堟牸" ? "OK" : "NG" //鏈�缁堢粨璁�
                             });
+
+                            if (data.鏈�缁堢粨璁� == "涓嶅悎鏍�") {
+                                document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+                                $("input:radio[name=HLastResult][value=" + "NG" + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+                            } else {
+                                document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+                                $("input:radio[name=HLastResult][value=" + "OK" + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+                            }
+                            form.render('radio');
 
                         } else {
                             layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
@@ -815,12 +1038,21 @@
                     url: GetWEBURL() + 'Sb_EquipDotCheckBill/Sb_EquipDotCheckBillListProjectDetai',
                     type: "GET",
                     data: { "sqlWhere": "and hmainid=" + linterid },
-                    success: function (result) {
-                        console.log(result);
+                    success: function (result) {                       
                         if (result.count == 1) {
-                            option.data = result.data;
-                            table.render(option);
+                            var data = result.data;
+                            var subarr = [];
 
+                            for (var i = 0; i < data.length; i++) {
+                                subarr.push({ "HDotCheckItemID": data[i].鐐规椤圭洰ID, "HDotCheckCode": data[i].鐐规椤圭洰浠g爜, "HDotCheckItem": data[i].鐐规椤圭洰, "HDotCheckPart": data[i].鐐规閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerCode": data[i].璐熻矗浜虹紪鐮�, "HManagerName": data[i].璐熻矗浜�, "HRemark": data[i].琛ㄤ綋澶囨敞, "HDotCheckItemClassID": data[i].HDotCheckItemClassID, "HDotCheckItemClassName": data[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": data[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": data[i].鐐规鏂规硶鍚嶇О, "HDotCheckResult": data[i].鐐规缁撴灉 == "鍚堟牸" ? 'Y' : 'X' });
+                            }
+
+                            option.data = subarr;
+                            table.render(option);
+                            for (let j = 0; j < data.length; j++) {
+                                $("#HDotCheckResult" + (j + 1)).val(data[j].鐐规缁撴灉 == "鍚堟牸" ? 'Y' : 'X')
+                            }
+                            form.render('select');
                         } else {
                             layer.alert(result.code + result.Message, { icon: 5 });
                         }
@@ -883,6 +1115,11 @@
                     return true;
                 }
             }
+            //閿欒淇℃伅
+            function f_alert(sMsg) {
+                layer.alert(sMsg, { icon: 5 });
+
+            }
             //#endregion
 
         });
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 0c86873..a786870 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"
@@ -120,6 +120,39 @@
                                             </td>
                                         </tr>
                                         <tr>
+                                            <th>鏈�缁堢粨璁�</th>
+                                            <td class="bz_td">
+                                                <input type="radio" name="HLastResult" value="OK" title="OK" checked="">
+                                                <input type="radio" name="HLastResult" value="NG" title="NG">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>寮傚父鎯呭喌<br />璁板綍</th>
+                                            <td class="bz_td" style="margin-top:10px;">
+                                                <input type="text" name="HErrNote" class="layui-input LineHeight" id="HErrNote" placeholder="璇疯緭鍏ュ紓甯告儏鍐佃褰�" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>閲嶅ぇ瀹夊叏<br />闅愭偅璁板綍</th>
+                                            <td class="bz_td" style="margin-top:10px;">
+                                                <input type="text" name="HBigSafeNote" class="layui-input LineHeight" id="HBigSafeNote" placeholder="璇疯緭鍏ラ噸澶у畨鍏ㄩ殣鎮h褰�" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鐐规鏁版嵁</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HDotCheckNote" class="layui-input LineHeight" id="HDotCheckNote" placeholder="璇疯緭鍏ョ偣妫�鏁版嵁" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鐢熶骇鐝</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HShiftsName" class="layui-input LineHeight" id="HShiftsName" placeholder="閫夋嫨鐢熶骇鐝" style="background-color:#efefef4d;">
+                                                <input type="hidden" name="HShiftsID" id="HShiftsID" value="0" autocomplete="off" class="layui-input">
+                                                <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="btnShifts" id="btnShifts" style="font-weight:bolder">...</button>
+                                            </td>
+                                        </tr>
+                                        <tr>
                                             <th>鍗�&ensp;鎹�&ensp;鍙�</th>
                                             <td class="bz_td">
                                                 <input type="text" name="HBillNo" class="layui-input LineHeight" id="HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" style="border-radius: 50px;background-color:#EDEDED;" readonly>
@@ -279,6 +312,14 @@
     <script type="text/html" id="HDotCheckResult">
         <input type="checkbox" value="{{d.HDotCheckResult}}" lay-skin="primary" id="HDotCheckResult{{d.LAY_TABLE_INDEX+1}}" lay-filter="HDotCheckResult" {{ d.HDotCheckResult == 1 ? 'checked' : '' }}>
     </script>
+    <!--琛屼笅鎷夐�夋嫨(鐐规缁撴灉)-->
+    <!--<script type="text/html" id="HDotCheckResult">
+        <select name="HDotCheckResult" lay-filter="HDotCheckResult" id="HDotCheckResult{{d.LAY_TABLE_INDEX+1}}">-->
+            <!--<option value="">璇烽�夋嫨</option>-->
+            <!--<option value="Y" selected>Y</option>
+            <option value="X">X</option>
+        </select>
+    </script>-->
     <script>
         layui.config({
             base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -354,8 +395,8 @@
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
-                var NewRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" };
-               
+                var NewRow = { "HDotCheckResult": false,"HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""};
+
                 switch (obj.event) {
                     //鏂板涓�琛�
                     case 'btn-AddLine': btnAddLine(NewRow);
@@ -475,7 +516,7 @@
                 // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
                 $("#formData")[0].reset();
                 layui.form.render();
-                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": ""}];
+                option.data = [{ "HDotCheckResult": false,"HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""}];
                 table.render(option);
 
                 $("#HBarCode").focus();
@@ -541,6 +582,41 @@
                     }
                 });
             });
+            
+            //琛ㄥご淇℃伅鐢熶骇鐝寮圭獥
+            form.on('submit(btnShifts)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鐢熶骇鐝鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true
+                    , content: ['../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ShiftsList.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HShiftsID").val(checkStatus.data[0].HItemID);
+                        $("#HShiftsName").val(checkStatus.data[0].鐝鍚嶇О);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+                    },
+                    success: function (layero, index) {
+                    }
+                });
+            });
 
             //琛ㄥご淇℃伅璁惧淇濆吇瑙勭▼
             form.on('submit(HEquipDotCheckRuleInterist)', function () {
@@ -588,7 +664,7 @@
                                 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": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
+                                option.data = [{ "HDotCheckResult": false,"HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""}];
                                 table.render(option);
 
                                 if (BYData.data.length != 0)  //琛ㄤ綋鏁版嵁涓虹┖鏃�
@@ -599,7 +675,7 @@
                                         var checkrow = {
                                             "HDotCheckItemID": data[i].HDotCheckItemID, "HDotCheckCode": data[i].HDotCheckCode, "HDotCheckItem": data[i].HDotCheckItem,
                                             "HDotCheckPart": data[i].HDotCheckPart, "HClaim": rowdate1[i].HClaim, "HManagerID": data[i].HManagerID, "HManagerCode": data[i].HManagerCode,
-                                            "HManagerName": data[i].HManagerName, "HSourceInterID": data[i].鐐规璁″垝ID, "HSourceEntryID": data[i].鐐规璁″垝瀛怚D, "HSourceBillNo": data[i].鐐规璁″垝鍗�
+                                            "HManagerName": data[i].HManagerName, "HSourceInterID": data[i].鐐规璁″垝ID, "HSourceEntryID": data[i].鐐规璁″垝瀛怚D, "HSourceBillNo": data[i].鐐规璁″垝鍗�, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": false
                                         };
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
@@ -609,7 +685,7 @@
                                 }
                             }
                             else {
-                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
+                                option.data = [{ "HDotCheckResult": false,"HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""}];
                                 table.render(option);
                                 layer.alert("璇ヨ澶囨殏鏃犻粯璁ょ偣妫�璁板綍", { icon: 5 });
                             }
@@ -629,6 +705,11 @@
                     , { field: 'HDotCheckItemID', title: '鐐规椤圭洰ID', edit: 'text', hide: true }
                     , { field: 'HDotCheckCode', title: '鐐规椤圭洰浠g爜', edit: 'text', event: "HDotCheckCode", width: 115, hide: true }
                     , { field: 'HDotCheckItem', title: '鐐规椤圭洰', edit: 'text', event: "" }
+                    , { field: 'HDotCheckItemClassID', title: '鐐规椤圭洰鍒嗙被ID', edit: 'text', hide: true }
+                    , { field: 'HDotCheckItemClassName', title: '鐐规椤圭洰鍒嗙被', edit: 'text', event: 'HDotCheckItemClassName' }
+                    , { field: 'HDotCheckItemMethodID', title: '鐐规鏂规硶ID', edit: 'text', hide: true }
+                    , { field: 'HDotCheckItemMethodName', title: '鐐规鏂规硶', edit: 'text', event: 'HDotCheckItemMethodName' }
+                    //, { field: 'HDotCheckResult', title: '鐐规缁撴灉', templet: '#HDotCheckResult', event: 'HDotCheckResult' }
                     , { field: 'HDotCheckPart', title: '鐐规閮ㄤ綅', edit: 'text', event: "" }
                     , { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
                     , { field: 'HManagerID', title: '璐熻矗浜轰唬鐮�', edit: 'text', hide: true }
@@ -636,8 +717,8 @@
                     , { field: 'HManagerName', title: '璐熻矗浜哄悕绉�', edit: 'text' }
                     , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
                     , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', edit: 'text', hide: true }
-                    , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', edit: 'text', hide: true}
-                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', edit: 'text', hide: true}
+                    , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', edit: 'text', hide: true }
+                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', edit: 'text', hide: true }
                     , { title: '鎿嶄綔', toolbar: '#barDemo', width: 80 }
                 ];
                 option = {
@@ -654,7 +735,7 @@
                     }
                 };
 
-                option.data = [{ "HDotCheckResult": false, "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
+                option.data = [{ "HDotCheckResult": false, "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""}];
                 table.render(option);
             }
             //澧炲姞涓�琛�
@@ -787,7 +868,7 @@
                                     {
                                         "HDotCheckResult": data[i].榛樿缁撹, "HDotCheckItemID": data[i].鐐规椤圭洰ID, "HDotCheckCode": data[i].鐐规椤圭洰浠g爜, "HDotCheckItem": data[i].鐐规椤圭洰鍚嶇О,
                                         "HDotCheckPart": data[i].鐐规閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerCode": data[i].璐熻矗浜轰唬鐮�,
-                                        "HManagerName": data[i].璐熻矗浜哄悕绉�, "HSourceInterID": data[i].鐐规璁″垝ID, "HSourceEntryID": data[i].鐐规璁″垝瀛怚D, "HSourceBillNo": data[i].鐐规璁″垝鍗�
+                                        "HManagerName": data[i].璐熻矗浜哄悕绉�, "HSourceInterID": data[i].鐐规璁″垝ID, "HSourceEntryID": data[i].鐐规璁″垝瀛怚D, "HSourceBillNo": data[i].鐐规璁″垝鍗�, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""
                                     }
                                 );
                             }
@@ -797,6 +878,85 @@
                     }
                 })
             }
+
+            //琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
+            function set_GridCellCheck(obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {                        
+                        if (obj.event === 'HDotCheckItemClassName')  //鐐规椤圭洰鍒嗙被
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '鐐规椤圭洰鍒嗙被鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true
+                                , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemClassList.html', 'yes']
+                                , btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HDotCheckItemClassID: checkStatus.data[0].HItemID,
+                                        HDotCheckItemClassName: checkStatus.data[0].鐐规椤圭洰鍒嗙被鍚嶇О
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                }
+                            });
+                        }
+                        if (obj.event === 'HDotCheckItemMethodName')  //鐐规鏂规硶
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '鐐规鏂规硶鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true
+                                , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemMethodList.html', 'yes']
+                                , btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HDotCheckItemMethodID: checkStatus.data[0].HItemID,
+                                        HDotCheckItemMethodName: checkStatus.data[0].鐐规鏂规硶鍚嶇О
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                }
+                            });
+                        }
+
+                        obj.event = "";
+                        return false;
+
+                    }
+
+                })
+            }
             //浠ヤ笂涓簂ayui妯″潡
         });
     </script>
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html"
index a29f66f..0baafeb 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html"
@@ -225,7 +225,7 @@
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
-                var NewRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" };
+                var NewRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""  };
                 switch (obj.event) {
                     //澧炲姞涓�琛�
                     case 'btn-AddLine': set_AddLine(NewRow);
@@ -392,6 +392,10 @@
                     , { field: 'HDotCheckItemID', title: '鐐规椤圭洰ID', edit: 'text', hide: true }
                     , { field: 'HDotCheckCode', title: '鐐规椤圭洰浠g爜', edit: 'text', event: "HDotCheckCode" }
                     , { field: 'HDotCheckItem', title: '鐐规椤圭洰', edit: 'text', event: "" }
+                    , { field: 'HDotCheckItemClassID', title: '鐐规椤圭洰鍒嗙被ID', edit: 'text', hide: true }
+                    , { field: 'HDotCheckItemClassName', title: '鐐规椤圭洰鍒嗙被', edit: 'text', event: 'HDotCheckItemClassName' }
+                    , { field: 'HDotCheckItemMethodID', title: '鐐规鏂规硶ID', edit: 'text', hide: true }
+                    , { field: 'HDotCheckItemMethodName', title: '鐐规鏂规硶', edit: 'text', event: 'HDotCheckItemMethodName' }
                     , { field: 'HDotCheckPart', title: '鐐规閮ㄤ綅', edit: 'text', event: "" }
                     , { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
                     , { field: 'HManagerID', title: '璐熻矗浜轰唬鐮�', edit: 'text', hide: true }
@@ -445,7 +449,7 @@
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
                 get_MAXNum();
-                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" }];
+                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""  }];
                 table.render(option);
             }
             //鑾峰彇鏈�澶у崟鎹彿鍙婇粯璁ゅ�艰祴鍊�
@@ -472,7 +476,7 @@
             function set_EditFromGrid() {
                 set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
                 set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
-                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
+                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""  }];
                 table.render(option);
 
 
@@ -493,7 +497,7 @@
                             if (result.count == 1) {
                                 var DJData = result.data;//鐐规
                                 var rowdate1 = layui.table.cache["mainTable"];
-                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
+                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""  }];
                                 table.render(option);
 
                                 if (DJData.length != 0)  //琛ㄤ綋鏁版嵁涓嶄负绌烘椂
@@ -503,7 +507,7 @@
                                         var checkrow = {
                                             "HDotCheckItemID": DJData[i].鐐规椤圭洰ID, "HDotCheckCode": DJData[i].鐐规椤圭洰浠g爜, "HDotCheckItem": DJData[i].鐐规椤圭洰, "HDotCheckPart": DJData[i].鐐规閮ㄤ綅,
                                             "HClaim": DJData[i].鍏蜂綋瑕佹眰, "HManagerID": DJData[i].璐熻矗浜篒D, "HManagerCode": DJData[i].璐熻矗浜轰唬鐮�,
-                                            "HManagerName": DJData[i].璐熻矗浜�, "HRemark": DJData[i].瀛愬娉�
+                                            "HManagerName": DJData[i].璐熻矗浜�, "HRemark": DJData[i].瀛愬娉�, "HDotCheckItemClassID": DJData[i].HDotCheckItemClassID, "HDotCheckItemClassName": DJData[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" 
                                         };
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
@@ -566,11 +570,15 @@
                     url: GetWEBURL() + 'Sb_EquipDotCheckPlanBill/Sb_EquipDotCheckPlanBillListProjectDetai',
                     type: "GET",
                     data: { "sqlWhere": "and hmainid=" + linterid },
-                    success: function (result) {
-                        console.log(result);
-                        //console.log('gouba' + result);
+                    success: function (result) {                        
                         if (result.count == 1) {
-                            option.data = result.data;
+                            var data = result.data;
+                            var subarr = [];
+                            for (var i = 0; i < data.length; i++) {
+                                subarr.push({ "HDotCheckItemID": data[i].鐐规椤圭洰ID, "HDotCheckCode": data[i].鐐规椤圭洰浠g爜, "HDotCheckItem": data[i].鐐规椤圭洰, "HDotCheckPart": data[i].鐐规閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerCode": data[i].璐熻矗浜轰唬鐮�, "HManagerName": data[i].璐熻矗浜�, "HRemark": data[i].琛ㄤ綋澶囨敞, "HDotCheckItemClassID": data[i].HDotCheckItemClassID, "HDotCheckItemClassName": data[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": data[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": data[i].鐐规鏂规硶鍚嶇О });
+                            }
+
+                            option.data = subarr;
                             table.render(option);
 
                         } else {
@@ -708,6 +716,8 @@
                                             HDotCheckItemID: checkStatus.data[0].HItemID,
                                             HDotCheckItem: checkStatus.data[0].鐐规椤圭洰鍚嶇О,
                                             HDotCheckCode: checkStatus.data[0].鐐规椤圭洰浠g爜,
+                                            HDotCheckItemClassID: checkStatus.data[0].HDotCheckItemClassID,
+                                            HDotCheckItemClassName: checkStatus.data[0].鐐规椤圭洰鍒嗙被鍚嶇О,
                                             //HDotCheckPart: checkStatus.data[0].鐐规閮ㄤ綅
                                         });
                                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
@@ -723,7 +733,7 @@
                                         }
                                         //灏嗘壒閲忛�夋嫨鐨勬暟鎹啓鍏ユ暟缁勶紙澶氶�夎锛�
                                         for (var i = 0; i < checkStatus.data.length; i++) {
-                                            buttonArr.push({ "HDotCheckItemID": checkStatus.data[i].HItemID, "HDotCheckCode": checkStatus.data[i].鐐规椤圭洰浠g爜, "HDotCheckItem": checkStatus.data[i].鐐规椤圭洰鍚嶇О, "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" });
+                                            buttonArr.push({ "HDotCheckItemID": checkStatus.data[i].HItemID, "HDotCheckCode": checkStatus.data[i].鐐规椤圭洰浠g爜, "HDotCheckItem": checkStatus.data[i].鐐规椤圭洰鍚嶇О, "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": checkStatus.data[i].HDotCheckItemClassID, "HDotCheckItemClassName": checkStatus.data[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" });
                                         }
 
                                         table.reload("mainTable", {
@@ -777,6 +787,74 @@
                                 }
                             });
                         }
+
+                        if (obj.event === 'HDotCheckItemClassName')  //鐐规椤圭洰鍒嗙被
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '鐐规椤圭洰鍒嗙被鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true
+                                , content: ['../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemClassList.html', 'yes']
+                                , btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HDotCheckItemClassID: checkStatus.data[0].HItemID,
+                                        HDotCheckItemClassName: checkStatus.data[0].鐐规椤圭洰鍒嗙被鍚嶇О
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                }
+                            });
+                        }
+                        if (obj.event === 'HDotCheckItemMethodName')  //鐐规鏂规硶
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '鐐规鏂规硶鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true
+                                , content: ['../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemMethodList.html', 'yes']
+                                , btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HDotCheckItemMethodID: checkStatus.data[0].HItemID,
+                                        HDotCheckItemMethodName: checkStatus.data[0].鐐规鏂规硶鍚嶇О
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                }
+                            });
+                        }
+
                         obj.event = "";
                         return false;
 
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\201\234\346\234\272\345\215\225/Sb_EquipStopBill.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\201\234\346\234\272\345\215\225/Sb_EquipStopBill.html"
new file mode 100644
index 0000000..2135b94
--- /dev/null
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\201\234\346\234\272\345\215\225/Sb_EquipStopBill.html"
@@ -0,0 +1,598 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>璁惧鍋滄満鍗�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/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/PageTitle.js"></script>
+    <style>
+        .main-btn { /*澶撮儴涓绘寜閽�*/
+            padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+            height: 30px;
+            line-height: 30px;
+        }
+
+        .btn-title {
+            font-size: 16px;
+        }
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+
+        .layui-form-label {
+            width: 25%;
+        }
+    </style>
+
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color: white; height: 800px;">
+                    <div style="padding: 2px; ">
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <h1 style="text-align: center; padding: 10px 0;"><b>璁惧鍋滄満鍗�</b></h1>
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璁惧<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" lay-verify="HEquipName" name="HEquipName" id="HEquipName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" name="HEquipID" id="HEquipID" lay-verify="HEquipID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHEquip" id="btnSearchHEquip" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鍏宠仈涓昏澶�<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" lay-verify="HEquipRelationName" name="HEquipRelationName" id="HEquipRelationName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" name="HEquipRelationID" id="HEquipRelationID" lay-verify="HEquipRelationID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHEquipRelation" id="btnSearchHEquipRelation" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鏃ユ湡<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width:180px;">
+                                                <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鍋滄満鎿嶄綔浜�<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" lay-verify="HStopEmpName" name="HStopEmpName" id="HStopEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" name="HStopEmpID" id="HStopEmpID" lay-verify="HStopEmpID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHStopEmp" id="btnSearchHStopEmp" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍋滄満鏃堕棿<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width:180px;">
+                                                <input type="datetime" class="layui-input" lay-verify="HStopTime" name="HStopTime" id="HStopTime" placeholder="yyyy-MM-dd hh:mm:ss" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浠诲姟鎻忚堪</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width:800px;">
+                                                <textarea class="layui-textarea" name="HStopReason" id="HStopReason" lay-verify="HStopReason" style="height:240px"></textarea>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
+                                                <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--鍏朵粬淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浣滃簾浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                       
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                       
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <script>
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element','upload'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , upload = layui.upload;
+
+            //妯″潡鍚�
+            var HModName = "Sb_EquipStopBillMain";
+      
+            //鑾峰彇鍙傛暟
+            var params = getUrlVars();
+            var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫
+            var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+            var HEntryID = params[params[3]]; //瀛愬唴鐮�
+            var HSouceBillType = params[params[2]]; //婧愬崟绫诲瀷
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            var HModuleType = "3918";
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+            $("h1").html('<b>' + HPageTitle + '</b>');
+            //#endregion
+
+            //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            if (sessionStorage.login != "login") {
+                layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                }, function () { window.location.href = "../../user/login.html"; });
+            }
+            //#endregion
+            //#region 鍒ゆ柇骞惰缃搷浣滅被鍨嬨�侀〉闈㈠垵濮嬪寲
+            if (OperationType == null || OperationType == 1) {                            //鏂板
+          
+                OperationType = 1;
+                //鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
+                createBillNo();
+             
+                //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖栨渶缁堝畬鎴愭椂闂�
+                $("#HStopTime").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+                //鍒濆鍖栨棩鏈�
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+            }
+            else if (OperationType == 3) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new     
+
+                //鍒濆鍖栭」鐩樁娈佃〃
+                RoadBillMain(linterid);
+
+            } 
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 寮圭獥閫夋嫨瑙﹀彂浜嬩欢
+
+            //#region 閫夋嫨璁惧鎸夐挳
+            form.on('submit(btnSearchHEquip)', function () {
+                get_checkSearchHEquip();
+            });
+            //#endregion
+
+            //#region 閫夋嫨鍏宠仈涓昏澶囨寜閽�
+            form.on('submit(btnSearchHEquipRelation)', function () {
+                get_checkSearchHEquipRelation();
+            });
+            //#endregion
+
+            //#region 閫夋嫨鍋滄満鎿嶄綔浜烘寜閽�
+            form.on('submit(btnSearchHStopEmp)', function () {
+                get_checkSearchStopEmp();
+            });
+            //#endregion
+
+            //#endregion
+
+
+            //#region 鎿嶄綔鎸夐挳瑙﹀彂浜嬩欢
+            //#region 淇濆瓨鎻愪氦
+            form.on('submit(btnSave)', function (data) {//鎻愪氦
+                if (AllowLoadData(data)) {
+                    set_AddNew(data);
+                }
+            });
+            //#endregion
+
+            //#region 閫�鍑�
+            form.on('submit(btnEdit)', function (data) {
+                if (params[1] != null) {
+                    Pub_Close(1);
+                } else if (params[1] == null) {
+                    Pub_Close(2);
+                }
+            });
+            //#endregion
+
+            //#endregion
+
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+            //#region 鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+            //#endregion
+
+            //#region 鐢熸垚鍗曟嵁鍙�
+            function createBillNo() {
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    async: false,
+                    type: "GET",
+                    data: { "HBillType": '3918' },
+                    success: function (d) {
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 璁惧閫夋嫨椤甸潰
+            function get_checkSearchHEquip() {
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim"                           //鍔犱笂杈规
+                    , title: "璁惧鍒楄〃"                             //鏍囬
+                    , closeBtn: 1                                       //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2                                          //寮瑰嚭鍔ㄧ敾
+                    , area: ["90%", "90%"]                              //绐椾綋澶у皬
+                    , maxmin: true                                      //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ["../../璁惧绠$悊/璁惧妗f/Gy_EquipFileBillResume.html", "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鎸夐挳涓�  鐨勫洖璋�
+                        var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                        if (checkStatus.data.length != 1) {
+                            return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                        }
+
+                        $("#HEquipID").val(checkStatus.data[0].hmainid);
+                        $("#HEquipName").val(checkStatus.data[0].璁惧鍚嶇О);
+
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                    , btn2: function (index, layero) { }
+                    , end: function () { }
+                })
+            }
+            //#endregion
+
+            //#region 鍏宠仈涓昏澶囬�夋嫨椤甸潰
+            function get_checkSearchHEquipRelation() {
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim"                           //鍔犱笂杈规
+                    , title: "鍏宠仈涓昏澶囧垪琛�"                             //鏍囬
+                    , closeBtn: 1                                       //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2                                          //寮瑰嚭鍔ㄧ敾
+                    , area: ["90%", "90%"]                              //绐椾綋澶у皬
+                    , maxmin: true                                      //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ["../../璁惧绠$悊/璁惧妗f/Gy_EquipFileBillResume.html", "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鎸夐挳涓�  鐨勫洖璋�
+                        var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                        if (checkStatus.data.length != 1) {
+                            return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                        }
+
+                        $("#HEquipRelationID").val(checkStatus.data[0].hmainid);
+                        $("#HEquipRelationName").val(checkStatus.data[0].璁惧鍚嶇О);
+
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                    , btn2: function (index, layero) { }
+                    , end: function () { }
+                })
+            }
+            //#endregion
+         
+            //#region 鍋滄満鎿嶄綔浜洪�夋嫨椤甸潰
+            function get_checkSearchStopEmp() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鍛樺伐琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?openType=HSecManager', '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('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#HStopEmpID").val(checkStatus.data[0].HItemID);
+                        $("#HStopEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+                      
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                    , end: function () { }
+                })
+            }
+            //#endregion
+
+            //#region 淇濆瓨HMaker
+            function set_AddNew(data) {
+
+                var refSav = "";
+                if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
+                    refSav = "Add";
+                }
+                if (OperationType == 3) {
+                    refSav = "Update";
+                }
+
+                //鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
+                if (OperationType == 3) {
+                    data.field.HUpdater = sessionStorage["HUserName"];
+                    data.field.HUpDateDate = Format(new Date(), "yyyy-MM-dd");
+                    $("#HUpdater").val(sessionStorage["HUserName"]);
+                    $("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd"));
+                }
+               
+                //鑾峰彇琛ㄥご鏁版嵁骞跺簭鍒楀寲
+                var sMainStr = JSON.stringify(data.field);              //涓昏〃鏁版嵁
+
+                //鎷兼帴搴忓垪鍖栫殑鏁版嵁
+                var sMainSub = sMainStr + ';' + refSav + ";" + sessionStorage["HUserName"];
+
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Sb_EquipStopBill/Save锘縎b_EquipStopBillMain",
+                    async: true,
+                    data: { "sMainSub": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) {
+                            $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+                            layer.close(index);
+                            layer.msg("鎻愪氦鎴愬姛");
+                        }
+                        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: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 缂栬緫 椤甸潰璧嬪��
+            function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+            {
+                $.ajax({
+                    url: GetWEBURL() + "/Sb_EquipStopBill/锘縎b_EquipStopBillMainEditList",
+                    type: "GET",
+                    async: false,
+                    data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        var tableMain = result.data;
+
+                        //涓昏〃 璧嬪��
+                        form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                            "HInterID": tableMain[0]["HInterID"]
+                            , "HBillNo": tableMain[0]["鍗曟嵁鍙�"]
+                            , "HDate": Format(new Date(tableMain[0]["鏃ユ湡"]), "yyyy-MM-dd")
+                            , "HEquipID": tableMain[0]["HEquipID"]
+                            , "HEquipName": tableMain[0]["璁惧"]
+                            , "HEquipRelationID": tableMain[0]["HEquipRelationID"]
+                            , "HEquipRelationName": tableMain[0]["鍏宠仈涓昏澶�"]
+                            , "HStopEmpID": tableMain[0]["HStopEmpID"]
+                            , "HStopEmpName": tableMain[0]["鍋滄満鎿嶄綔浜�"]
+                          
+                            , "HStopTime": Format(new Date(tableMain[0]["鍋滄満鏃堕棿"]), "yyyy-MM-dd hh:mm:ss")
+                            , "HStopReason": tableMain[0]["鍋滄満鍘熷洜"]
+
+                            , "HRemark": tableMain[0]["琛ㄥご澶囨敞"]
+                            , "HMaker": tableMain[0]["鍒跺崟浜�"]
+                            , "HMakeDate": tableMain[0]["鍒跺崟鏃ユ湡"] == null ? "" : Format(new Date(tableMain[0]["鍒跺崟鏃ユ湡"]), "yyyy-MM-dd")
+                            , "HUpDater": tableMain[0]["淇敼浜�"]
+                            , "HUpDateDate": tableMain[0]["淇敼鏃ユ湡"] == null ? "" : Format(new Date(tableMain[0]["淇敼鏃ユ湡"]), "yyyy-MM-dd")
+                            , "HChecker": tableMain[0]["瀹℃牳浜�"]
+                            , "HCheckDate": tableMain[0]["瀹℃牳鏃ユ湡"] == null ? "" : Format(new Date(tableMain[0]["瀹℃牳鏃ユ湡"]), "yyyy-MM-dd")
+                            , "HCloseMan": tableMain[0]["鍏抽棴浜�"]
+                            , "HCloseDate": tableMain[0]["鍏抽棴鏃ユ湡"] == null ? "" : Format(new Date(tableMain[0]["鍏抽棴鏃ユ湡"]), "yyyy-MM-dd")
+                            , "HDeleteMan": tableMain[0]["浣滃簾浜�"]
+                            , "HDeleteDate": tableMain[0]["浣滃簾鏃ユ湡"] == null ? "" : Format(new Date(tableMain[0]["浣滃簾鏃ユ湡"]), "yyyy-MM-dd")
+
+                        });
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 闈炵┖楠岃瘉
+            function AllowLoadData(data) {
+                //#region 琛ㄥご鏁版嵁妫�楠�
+                if ($("#HBillNo").val() == "") {
+                    layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
+                    return false;
+                }
+                if ($("#HEquipID").val() == "0") {
+                    layer.msg("璁惧娌℃湁閫夋嫨!");
+                    return false;
+                }
+                if ($("#HEquipRelationID").val() == "0") {
+                    layer.msg("鍏宠仈涓昏澶囨病鏈夐�夋嫨!");
+                    return false;
+                }
+                if ($("#HStopEmpID").val() == "0") {
+                    layer.msg("鍋滄満鎿嶄綔浜烘病鏈夐�夋嫨!");
+                    return false;
+                }
+                if ($("#HDate").val() == "") {
+                    layer.msg("鏃ユ湡涓嶈兘涓虹┖!");
+                    return false;
+                }
+                if ($("#HStopTime").val() == "") {
+                    layer.msg("鍋滄満鏃堕棿涓嶈兘涓虹┖!");
+                    return false;
+                }
+                //#endregion
+                return true;
+            }
+            //#endregion      
+            //#endregion
+        });
+
+        //鍙屽嚮杩斿洖寮�鏈轰汉
+        function GetHSecManagerValue(obj) {
+            $("#HStopEmpID").val(obj[0].HItemID);
+            $("#HStopEmpName").val(obj[0].鑱屽憳鍚嶇О);
+        }
+    </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/\350\256\276\345\244\207\345\201\234\346\234\272\345\215\225/Sb_EquipStopBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\201\234\346\234\272\345\215\225/Sb_EquipStopBillList.html"
new file mode 100644
index 0000000..331b6b6
--- /dev/null
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\201\234\346\234\272\345\215\225/Sb_EquipStopBillList.html"
@@ -0,0 +1,1047 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>璁惧鍋滄満鍗�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
+
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">璁惧</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HEquipName" id="HEquipName">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <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">
+                                    <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 layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                                <!--鏄剧ず褰撳墠杩囨护鏂规-->
+                                <div class="layui-inline" style="margin-left:5px;">
+                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+                                </div>
+                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" class=" ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" class=" ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>                             
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_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-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <!--鎵归噺瀹℃牳/鍙嶅鏍歌繘搴︽潯-->
+    <div class="layui-progress layui-progress-big" lay-filter="BatchAuditProgress" id="BatchAuditProgress" style="width:20%;position:fixed;left:40%;top:55%;display:none;">
+        <div class="layui-progress-bar" style="width:200px;" lay-percent="0%"></div>
+    </div>
+
+
+    <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 option = [];
+            var sWhere = "";
+            var HModName = "Sb_EquipStopBillList";
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            var HModuleType = "3918";
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+        //#endregion
+
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["HInterID", "HEquipID", "HEquipRelationID", "HStopEmpID"];
+            //#endregion
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //杩囨护鏉′欢鐨刢lass绫� 
+            var HClassTag = "ForFilteringSchemes";
+            //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+            window.HModuleName = "璁惧鍋滄満鍗曠淮鎶�";
+            //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+            window.HDefaultFilter = "";
+            //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+            window.HInterID_Choose = 0;
+
+            //#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 'btn-Audit':
+                        set_CheckBill(1);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_CheckBill(2);
+                        break;
+                    //鍏抽棴鎸夐挳        锛�1:鍏抽棴銆�2:鍙嶅叧闂級
+                    case 'btn-Close':
+                        set_CloseBill(1);
+                        break;
+                    //鍙嶅叧闂寜閽�
+                    case 'btn-DeClose':
+                        set_CloseBill(2);
+                        break;
+                    //浣滃簾鎸夐挳        锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
+                    case 'btn-Drop':
+                        set_DropBill(1);
+                        break;
+                    //鍙嶄綔搴熸寜閽�
+                    case 'btn-DeDrop':
+                        set_DropBill(2);
+                        break;
+                    case 'set_ShowBill_dh':
+                        set_ShowBill_dh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumn();
+                        break;
+                    //淇濆瓨鏂规
+                    case 'set_SaveScheme': set_SaveScheme();
+                        break;
+                    //璇诲彇鏂规
+                    case 'set_ReadScheme': set_ReadScheme();
+                        break;
+                };
+            });
+            //#endregion
+
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+            //#endregion
+                
+            table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+                table.reload('mainTable', {
+                    initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+                    , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+                        field: obj.field //鎺掑簭瀛楁   鍦ㄦ帴鍙d綔涓哄弬鏁板瓧娈�  field order
+                        , order: obj.type //鎺掑簭鏂瑰紡   鍦ㄦ帴鍙d綔涓哄弬鏁板瓧娈�  field order
+                    }
+                });
+                option.data = layui.table.cache["mainTable"];
+                table.render(option);
+            });
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            //#endregion
+
+            //#endregion
+
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+               
+                //鏌ヨ
+                get_FastQuery();
+                //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+                get_DefaultModule();
+                $("#BenginHCreateDate").val(Format(new Date(new Date()-(1000 * 60 * 60 * 24 * 7)), "yyyy-MM-dd"));
+                $("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));
+            }
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , sort: true  //閲嶇偣1锛氳繖閲岀殑sort琛ㄧず table琛ㄥ湪鍙栧緱鎺ュ彛鏁版嵁鍚庯紝瀵归〉闈㈡覆鏌撳悗鐨則able鏁版嵁杩涜鎺掑簭銆傚悓鏃讹紝杩欓噷鐨則rue 浼氬奖鍝嶉〉闈ort 涓婁笅灏忕澶寸殑 鏄剧ず鏁堟灉
+                    , totalRow: true
+                    , limit: 50
+                    , limits: [50, 500, 5000, 50000]
+                    , done: function (res, curr, count) {
+                        soulTable.render(this);
+                    }
+                };
+            }
+            //#endregion
+
+            //#region 鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Sb_EquipStopBill/get锘縎b_EquipStopBillMainList',
+                    type: "GET",
+                    async: false,
+                    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: 120 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+                                    }
+                                }
+                            }
+
+                            option.cols = [col];
+                            option.data = data1.data;
+                            table.render(option);
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+
+                            layer.close(ajaxLoad);
+
+                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                                ColFilter();
+                            }
+
+                            //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 HBillNo = $("#HBillNo").val();  //鍗曟嵁鍙�
+                var HEquipName = $("#HEquipName").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 (HEquipName) {
+                    sWhere += " and 璁惧 like '%" + HEquipName + "%'";
+                }
+                if (BenginHCreateDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + BenginHCreateDate + "'";
+                }
+                if (EndHCreateDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + EndHCreateDate + "'";
+                }
+
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#HBillNo").val("");
+                $("#HEquipName").val("");
+                $("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
+                $("#EndHCreateDate").val(Format(new Date( ), "yyyy-MM-dd"));
+             
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                form.render('select');
+
+                sWhere = "";
+            }
+            //#endregion
+
+            //#region 鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '鏂板' + HPageTitle
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../../璁惧绠$悊/璁惧鍋滄満鍗�/Sb_EquipStopBill.html?OperationType=1&linterid=0&HSouceBillType='
+                    ,btn: [ ],
+                    // 鎸夐挳1 鐨勫洖璋�
+                    end: function (index, layero, that) {
+                        //鍒锋柊椤甸潰
+                        $("#btnSearch").trigger('click');
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HInterID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫' + HPageTitle
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../璁惧绠$悊/璁惧鍋滄満鍗�/Sb_EquipStopBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                        , btn: [ ],
+                        // 鎸夐挳1 鐨勫洖璋�
+                        end: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            $("#btnSearch").trigger('click');
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HInterID.toString();
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        //閫昏緫鍒犻櫎鏂规硶
+                        $.ajax({
+                            url: GetWEBURL() + 'Sb_EquipStopBill/Delete锘縎b_EquipStopBill',
+                            type: "GET",
+                            data: { "HInterID": HInterID, "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);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        $("#btnSearch").trigger('click');
+                                    });
+                                } 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() {
+                $("#btnSearch").trigger('click');
+            }
+            //#endregion
+
+            //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+            function set_CheckBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HInterID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sb_EquipStopBill/AuditSb_EquipStopBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
+            function set_CloseBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HInterID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sb_EquipStopBill/CloseSb_EquipStopBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶄綔搴�/浣滃簾鏁版嵁
+            function set_DropBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HInterID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sb_EquipStopBill/DropSb_EquipStopBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+         
+            //#region 闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                var contentUrl = "";
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+                var urlLen = urlStr.split('/');
+                for (var i = 0; i < urlLen.length - 4; i++) {
+                    contentUrl += "../";
+                }
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: [contentUrl, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 1; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                //if (data1.data[0].HColumnWidth != 0) {
+                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                                //} else {
+                                //    option.cols[0][i + 1]["width"] = "";
+                                //}
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                        } else {
+                            table.render(option);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 浠绘剰瀛楁杩囨护锛氬垪鍚嶆樉绀轰笅鎷夋
+            function ColFilter() {
+                var Organization = '<option  value="0" selected="selected" ></option>';
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    if (option.cols[0][i].hide != true) {
+                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+                    }
+                }
+                $("#ColName").empty();
+                $("#ColName").append(Organization);
+                form.render('select');
+            }
+            //#endregion
+
+            //#region 鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+            //#endregion
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
+            function get_DefaultModule() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+                    type: "GET",
+                    data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            //褰撳墠鐢ㄦ埛璁剧疆鏈夐粯璁ょ殑杩囨护鏂规
+                            var data = data1.data;
+                            //褰撳墠閫夋嫨鐨勮繃婊ゆ柟妗�
+                            HInterID_Choose = data[0].hmainid;
+                            //杩囨护鏂规鍐呯爜
+                            HInterID = data[0].hmainid
+                            //杩囨护鏂规鍚嶇О
+                            HDefaultFilter = data[0].鏂规鍚嶇О
+                            //杩囨护鏂规鐨勫娉紙鏂规淇℃伅鎻忚堪锛�
+                            var HRemark = data[0].澶囨敞
+                            //鏄剧ず鍑哄綋鍓嶇殑榛樿杩囨护鏂规
+                            document.getElementById("HFilterScheme_Now").style.display = "block";
+                            document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
+                            //鎶婅繃婊ゆ潯浠跺�煎洖鍐欏埌椤甸潰涓�
+                            for (let i = 0; i < data.length; i++) {
+                                $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+                                if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+                                    $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+                                }
+                            }
+                            //鏌ヨ
+                            get_FastQuery();
+                            form.render("select");
+                        } else {
+                            //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
+                            //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
+                            document.getElementById("HFilterScheme_Now").style.display = "none";
+                           
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //淇濆瓨鏂规
+            function set_SaveScheme() {
+                var index = layer.open()
+                //鍒ゆ柇鐢ㄦ埛鏄惁鐐瑰嚮浜嗗彸涓婅鐨勨�滃弶鍙封�濆叧闂脊绐楅〉闈�
+                var HIsClose_Manual = false;
+                //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                var Filter = document.getElementsByClassName(HClassTag);
+
+                var HFilterIdList = "";//杩囨护鏉′欢
+                var HFilterIdLists = "";//鎷兼帴澶氫釜杩囨护鏉′欢
+                var HValue = "";//杩囨护鍊�
+                var HElement_type = "";//杩囨护鏍囩绫诲瀷
+
+                for (var i = 0; i < Filter.length; i++) {
+                    HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+                    HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�                    
+                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                }
+
+                //鍘婚櫎鏈熬閫楀彿
+                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                HValue = HValue.substring(0, HValue.length - 1);
+                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                //褰撳墠椤甸潰涓婃病鏈夐�夋嫨杩囨护鏂规锛岃繘鍏ユ柊澧炴柟娉�
+                if (HDefaultFilter == "") {
+                    layer.open({
+                        type: 2
+                        , area: ['40%', '80%']
+                        , title: '杩囨护鏂规'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                        , cancel: function () {
+                            // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+                            HIsClose_Manual = true;
+                        }
+                        , end: function () {
+                            if (HIsClose_Manual != true) {
+                                get_FastQuery();
+                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                                document.getElementById("HFilterScheme_Now").style.display = "block";
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                            }
+                        }
+                    })
+                    layer.close(index)
+                } else {
+                    //褰撳墠椤甸潰宸叉湁杩囨护鏂规锛岀敤鎴烽�夋嫨 鏂板鎴栬�呯紪杈�
+                    layer.confirm('褰撳墠宸查�夋嫨杩囨护鏂规锛屾槸鍚︿慨鏀癸紵璇烽�夋嫨瀵瑰簲鎿嶄綔', {
+                        title: "鎿嶄綔鎻愮ず",
+                        icon: 0,
+                        btn: ['鏂板鏂规', '淇濆瓨淇敼褰撳墠鏂规', '鍙栨秷']
+                    }, function (index, layero) {
+                        //鏂板
+                        layer.open({
+                            type: 2
+                            , area: ['40%', '80%']
+                            , title: '杩囨护鏂规'
+                            , shift: 0//寮瑰嚭鍔ㄧ敾
+                            , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                            , end: function () {
+                                get_FastQuery()
+                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                                document.getElementById("HFilterScheme_Now").style.display = "block";
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                            }
+                        })
+                        layer.close(index)
+                    }, function (index) {
+                        //缂栬緫
+                        var Filter_Edit = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                        HFilterIdList = "";
+                        HFilterIdLists = "";
+                        HValue = "";
+                        HElement_type = "";
+                        for (var i = 0; i < Filter_Edit.length; i++) {
+                            HFilterIdList = Filter_Edit[i].id; //杩囨护鏉′欢ID
+                            HFilterIdLists += Filter_Edit[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                            HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                            HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                        }
+                        //鍘婚櫎鏈熬閫楀彿
+                        HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                        HValue = HValue.substring(0, HValue.length - 1);
+                        HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                        var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 3;
+
+                        //淇敼
+                        $.ajax({
+                            type: "POST",
+                            url: GetWEBURL() + "/Xt_FastICScheme/save", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": sMainSub },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
+                                }
+                                else {
+
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+
+                            }
+                        });
+                        layer.close(index)
+                    }, function (index) {
+                        //鍙栨秷
+                        layer.alert('鍙栨秷')
+                        layer.close(index)
+                    });
+                }
+
+            }
+
+            //璇诲彇鏂规
+            function set_ReadScheme() {
+                var HIsClose_Manual = false;
+                var Filter = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+
+                var HFilterIdList = "";
+                var HFilterIdLists = "";
+                var HValue = "";
+                var HElement_type = "";
+                for (var i = 0; i < Filter.length; i++) {
+                    HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+                    HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                }
+                //鍘婚櫎鏈熬閫楀彿
+                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                HValue = HValue.substring(0, HValue.length - 1);
+                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '杩囨护鏂规鍒楄〃'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName
+                    , cancel: function () {
+                        // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+                        HIsClose_Manual = true;
+                    }
+                    , end: function () {
+                        if (HIsClose_Manual != true) {
+                            get_FastQuery()
+                            form.render("select");
+                        }
+                    }
+                })
+            }
+
+            //#endregion
+
+            //#endregion
+        });
+  
+        //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+        function HFilterScheme(obj)  //杩斿洖杩囨护鏂规
+        {
+            var HInterID = obj[0].hmainid;
+            HInterID_Choose = obj[0].hmainid;
+            $.ajax({
+                url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+                type: "GET",
+                data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        var data = data1.data;
+                        //璧嬪�艰繃婊ゆ柟妗堝悕绉�
+                        HDefaultFilter = data[0].鏂规鍚嶇О
+                        var HRemark = data[0].澶囨敞
+                        //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                        document.getElementById("HFilterScheme_Now").style.display = "block";
+                        document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
+                        HInterID = data[0].hmainid
+                        //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
+                        for (let i = 0; i < data.length; i++) {
+                            $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+                            if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+                                $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+                            }
+                        }
+
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+        //#endregion
+
+    </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/\350\256\276\345\244\207\345\274\200\346\234\272\345\215\225/Sb_EquipBeginBill.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\274\200\346\234\272\345\215\225/Sb_EquipBeginBill.html"
new file mode 100644
index 0000000..474ca79
--- /dev/null
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\274\200\346\234\272\345\215\225/Sb_EquipBeginBill.html"
@@ -0,0 +1,600 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>璁惧寮�鏈哄崟</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/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/PageTitle.js"></script>
+    <style>
+        .main-btn { /*澶撮儴涓绘寜閽�*/
+            padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+            height: 30px;
+            line-height: 30px;
+        }
+
+        .btn-title {
+            font-size: 16px;
+        }
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+
+        .layui-form-label {
+            width: 25%;
+        }
+    </style>
+
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;height:800px;">
+                    <div style="padding: 2px; ">
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <h1 style="text-align: center; padding: 10px 0;"><b>璁惧寮�鏈哄崟</b></h1>
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鏃ユ湡<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width:180px;">
+                                                <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璁惧<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" lay-verify="HEquipName" name="HEquipName" id="HEquipName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" name="HEquipID" id="HEquipID" lay-verify="HEquipID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHEquip" id="btnSearchHEquip" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鍏宠仈涓昏澶�<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" lay-verify="HEquipRelationName" name="HEquipRelationName" id="HEquipRelationName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" name="HEquipRelationID" id="HEquipRelationID" lay-verify="HEquipRelationID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHEquipRelation" id="btnSearchHEquipRelation" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">寮�鏈轰汉<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" lay-verify="HBeginEmpName" name="HBeginEmpName" id="HBeginEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" name="HBeginEmpID" id="HBeginEmpID" lay-verify="HBeginEmpID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHBeginEmp" id="btnSearchHBeginEmp" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">寮�鏈烘椂闂�<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width:180px;">
+                                                <input type="datetime" class="layui-input" lay-verify="HBeginTime" name="HBeginTime" id="HBeginTime" placeholder="yyyy-MM-dd hh:mm:ss" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
+                                                <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--鍏朵粬淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浣滃簾浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                       
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                       
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <script>
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element','upload'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , upload = layui.upload;
+
+            //妯″潡鍚�
+            var HModName = "Sb_EquipBeginBillMain";
+      
+            //鑾峰彇鍙傛暟
+            var params = getUrlVars();
+            var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫
+            var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+            var HEntryID = params[params[3]]; //瀛愬唴鐮�
+            var HSouceBillType = params[params[2]]; //婧愬崟绫诲瀷
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            var HModuleType = "3917";
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+            $("h1").html('<b>' + HPageTitle + '</b>');
+            //#endregion
+
+            //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            if (sessionStorage.login != "login") {
+                layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                }, function () { window.location.href = "../../user/login.html"; });
+            }
+            //#endregion
+            //#region 鍒ゆ柇骞惰缃搷浣滅被鍨嬨�侀〉闈㈠垵濮嬪寲
+            if (OperationType == null || OperationType == 1) {                            //鏂板
+          
+                OperationType = 1;
+                //鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
+                createBillNo();
+             
+                //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖栨渶缁堝畬鎴愭椂闂�
+                $("#HBeginTime").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+                //鍒濆鍖栨棩鏈�
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+            }
+            else if (OperationType == 3) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new     
+
+                //鍒濆鍖栭」鐩樁娈佃〃
+                RoadBillMain(linterid);
+
+            } 
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 寮圭獥閫夋嫨瑙﹀彂浜嬩欢
+
+            //#region 閫夋嫨璁惧鎸夐挳
+            form.on('submit(btnSearchHEquip)', function () {
+                get_checkSearchHEquip();
+            });
+            //#endregion
+
+            //#region 閫夋嫨鍏宠仈涓昏澶囨寜閽�
+            form.on('submit(btnSearchHEquipRelation)', function () {
+                get_checkSearchHEquipRelation();
+            });
+            //#endregion
+
+            //#region 閫夋嫨寮�鏈烘搷浣滀汉鎸夐挳
+            form.on('submit(btnSearchHBeginEmp)', function () {
+                get_checkSearchHBeginEmp();
+            });
+            //#endregion
+
+            //#endregion
+
+
+            //#region 鎿嶄綔鎸夐挳瑙﹀彂浜嬩欢
+            //#region 淇濆瓨鎻愪氦
+            form.on('submit(btnSave)', function (data) {//鎻愪氦
+                if (AllowLoadData(data)) {
+                    set_AddNew(data);
+                }
+            });
+            //#endregion
+
+            //#region 閫�鍑�
+            form.on('submit(btnEdit)', function (data) {
+                if (params[1] != null) {
+                    Pub_Close(1);
+                } else if (params[1] == null) {
+                    Pub_Close(2);
+                }
+            });
+            //#endregion
+
+            //#endregion
+
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+            //#region 鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+            //#endregion
+
+            //#region 鐢熸垚鍗曟嵁鍙�
+            function createBillNo() {
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    async: false,
+                    type: "GET",
+                    data: { "HBillType": '3917' },
+                    success: function (d) {
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 璁惧閫夋嫨椤甸潰
+            function get_checkSearchHEquip() {
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim"                           //鍔犱笂杈规
+                    , title: "璁惧鍒楄〃"                             //鏍囬
+                    , closeBtn: 1                                       //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2                                          //寮瑰嚭鍔ㄧ敾
+                    , area: ["90%", "90%"]                              //绐椾綋澶у皬
+                    , maxmin: true                                      //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ["../../璁惧绠$悊/璁惧妗f/Gy_EquipFileBillResume.html", "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鎸夐挳涓�  鐨勫洖璋�
+                        var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                        if (checkStatus.data.length != 1) {
+                            return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                        }
+
+                        $("#HEquipID").val(checkStatus.data[0].hmainid);
+                        $("#HEquipName").val(checkStatus.data[0].璁惧鍚嶇О);
+
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                    , btn2: function (index, layero) { }
+                    , end: function () { }
+                })
+            }
+            //#endregion
+
+            //#region 鍏宠仈涓昏澶囬�夋嫨椤甸潰
+            function get_checkSearchHEquipRelation() {
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim"                           //鍔犱笂杈规
+                    , title: "鍏宠仈涓昏澶囧垪琛�"                             //鏍囬
+                    , closeBtn: 1                                       //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2                                          //寮瑰嚭鍔ㄧ敾
+                    , area: ["90%", "90%"]                              //绐椾綋澶у皬
+                    , maxmin: true                                      //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ["../../璁惧绠$悊/璁惧妗f/Gy_EquipFileBillResume.html", "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鎸夐挳涓�  鐨勫洖璋�
+                        var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                        if (checkStatus.data.length != 1) {
+                            return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                        }
+
+                        $("#HEquipRelationID").val(checkStatus.data[0].hmainid);
+                        $("#HEquipRelationName").val(checkStatus.data[0].璁惧鍚嶇О);
+
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                    , btn2: function (index, layero) { }
+                    , end: function () { }
+                })
+            }
+            //#endregion
+         
+            //#region 寮�鏈烘搷浣滀汉閫夋嫨椤甸潰
+            function get_checkSearchHBeginEmp() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鍛樺伐琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?openType=HSecManager', '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('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#HBeginEmpID").val(checkStatus.data[0].HItemID);
+                        $("#HBeginEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+                      
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                    , end: function () { }
+                })
+            }
+            //#endregion
+
+            //#region 淇濆瓨HMaker
+            function set_AddNew(data) {
+
+                var refSav = "";
+                if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
+                    refSav = "Add";
+                }
+                if (OperationType == 3) {
+                    refSav = "Update";
+                }
+
+                //鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
+                if (OperationType == 3) {
+                    data.field.HUpdater = sessionStorage["HUserName"];
+                    data.field.HUpDateDate = Format(new Date(), "yyyy-MM-dd");
+                    $("#HUpdater").val(sessionStorage["HUserName"]);
+                    $("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd"));
+                }
+               
+                //鑾峰彇琛ㄥご鏁版嵁骞跺簭鍒楀寲
+                var sMainStr = JSON.stringify(data.field);              //涓昏〃鏁版嵁
+
+                //鎷兼帴搴忓垪鍖栫殑鏁版嵁
+                var sMainSub = sMainStr + ';' + refSav + ";" + sessionStorage["HUserName"];
+
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Sb_EquipBeginBill/Save锘縎b_EquipBeginBillMain",
+                    async: true,
+                    data: { "sMainSub": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) {
+                            $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+                            layer.close(index);
+                            layer.msg("鎻愪氦鎴愬姛");
+                        }
+                        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: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 缂栬緫 椤甸潰璧嬪��
+            function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+            {
+                $.ajax({
+                    url: GetWEBURL() + "/Sb_EquipBeginBill/锘縎b_EquipBeginBillMainEditList",
+                    type: "GET",
+                    async: false,
+                    data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        var tableMain = result.data;
+
+                        //涓昏〃 璧嬪��
+                        form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                            "HInterID": tableMain[0]["HInterID"]
+                            , "HBillNo": tableMain[0]["鍗曟嵁鍙�"]
+                            , "HDate": Format(new Date(tableMain[0]["鏃ユ湡"]), "yyyy-MM-dd")
+                            , "HEquipID": tableMain[0]["HEquipID"]
+                            , "HEquipName": tableMain[0]["璁惧"]
+                            , "HEquipRelationID": tableMain[0]["HEquipRelationID"]
+                            , "HEquipRelationName": tableMain[0]["鍏宠仈涓昏澶�"]
+                            , "HBeginEmpID": tableMain[0]["HBeginEmpID"]
+                            , "HBeginEmpName": tableMain[0]["寮�鏈轰汉"]
+                          
+                            , "HBeginTime": Format(new Date(tableMain[0]["寮�鏈烘椂闂�"]), "yyyy-MM-dd hh:mm:ss")
+                           
+
+                            , "HRemark": tableMain[0]["琛ㄥご澶囨敞"]
+                            , "HMaker": tableMain[0]["鍒跺崟浜�"]
+                            , "HMakeDate": tableMain[0]["鍒跺崟鏃ユ湡"] == null ? "" : Format(new Date(tableMain[0]["鍒跺崟鏃ユ湡"]), "yyyy-MM-dd")
+                            , "HUpDater": tableMain[0]["淇敼浜�"]
+                            , "HUpDateDate": tableMain[0]["淇敼鏃ユ湡"] == null ? "" : Format(new Date(tableMain[0]["淇敼鏃ユ湡"]), "yyyy-MM-dd")
+                            , "HChecker": tableMain[0]["瀹℃牳浜�"]
+                            , "HCheckDate": tableMain[0]["瀹℃牳鏃ユ湡"] == null ? "" : Format(new Date(tableMain[0]["瀹℃牳鏃ユ湡"]), "yyyy-MM-dd")
+                            , "HCloseMan": tableMain[0]["鍏抽棴浜�"]
+                            , "HCloseDate": tableMain[0]["鍏抽棴鏃ユ湡"] == null ? "" : Format(new Date(tableMain[0]["鍏抽棴鏃ユ湡"]), "yyyy-MM-dd")
+                            , "HDeleteMan": tableMain[0]["浣滃簾浜�"]
+                            , "HDeleteDate": tableMain[0]["浣滃簾鏃ユ湡"] == null ? "" : Format(new Date(tableMain[0]["浣滃簾鏃ユ湡"]), "yyyy-MM-dd")
+
+                        });
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 闈炵┖楠岃瘉
+            function AllowLoadData(data) {
+                //#region 琛ㄥご鏁版嵁妫�楠�
+                if ($("#HBillNo").val() == "") {
+                    layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
+                    return false;
+                }
+                if ($("#HEquipID").val() == "0") {
+                    layer.msg("璁惧娌℃湁閫夋嫨!");
+                    return false;
+                }
+                if ($("#HEquipRelationID").val() == "0") {
+                    layer.msg("鍏宠仈涓昏澶囨病鏈夐�夋嫨!");
+                    return false;
+                }
+                if ($("#HBeginEmpID").val() == "0") {
+                    layer.msg("寮�鏈烘搷浣滀汉娌℃湁閫夋嫨!");
+                    return false;
+                }
+                if ($("#HDate").val() == "") {
+                    layer.msg("鏃ユ湡涓嶈兘涓虹┖!");
+                    return false;
+                }
+                if ($("#HBeginTime").val() == "") {
+                    layer.msg("寮�鏈烘椂闂翠笉鑳戒负绌�!");
+                    return false;
+                }
+                //#endregion
+                return true;
+            }
+            //#endregion
+
+      
+            //#endregion
+
+
+
+
+        });
+
+        //鍙屽嚮杩斿洖寮�鏈轰汉
+        function GetHSecManagerValue(obj) {
+            $("#HBeginEmpID").val(obj[0].HItemID);
+            $("#HBeginEmpName").val(obj[0].鑱屽憳鍚嶇О);
+
+        }
+    </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/\350\256\276\345\244\207\345\274\200\346\234\272\345\215\225/Sb_EquipBeginBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\274\200\346\234\272\345\215\225/Sb_EquipBeginBillList.html"
new file mode 100644
index 0000000..c953654
--- /dev/null
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\274\200\346\234\272\345\215\225/Sb_EquipBeginBillList.html"
@@ -0,0 +1,1047 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>璁惧寮�鏈哄崟</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
+
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">璁惧</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HEquipName" id="HEquipName">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <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">
+                                    <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 layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                                <!--鏄剧ず褰撳墠杩囨护鏂规-->
+                                <div class="layui-inline" style="margin-left:5px;">
+                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+                                </div>
+                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" class=" ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" class=" ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>                             
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_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-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <!--鎵归噺瀹℃牳/鍙嶅鏍歌繘搴︽潯-->
+    <div class="layui-progress layui-progress-big" lay-filter="BatchAuditProgress" id="BatchAuditProgress" style="width:20%;position:fixed;left:40%;top:55%;display:none;">
+        <div class="layui-progress-bar" style="width:200px;" lay-percent="0%"></div>
+    </div>
+
+
+    <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 option = [];
+            var sWhere = "";
+            var HModName = "Sb_EquipBeginBillList";
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            var HModuleType = "3918";
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+        //#endregion
+
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["HInterID", "HEquipID", "HEquipRelationID", "HBeginEmpID"];
+            //#endregion
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //杩囨护鏉′欢鐨刢lass绫� 
+            var HClassTag = "ForFilteringSchemes";
+            //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+            window.HModuleName = "璁惧寮�鏈哄崟缁存姢";
+            //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+            window.HDefaultFilter = "";
+            //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+            window.HInterID_Choose = 0;
+
+            //#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 'btn-Audit':
+                        set_CheckBill(1);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_CheckBill(2);
+                        break;
+                    //鍏抽棴鎸夐挳        锛�1:鍏抽棴銆�2:鍙嶅叧闂級
+                    case 'btn-Close':
+                        set_CloseBill(1);
+                        break;
+                    //鍙嶅叧闂寜閽�
+                    case 'btn-DeClose':
+                        set_CloseBill(2);
+                        break;
+                    //浣滃簾鎸夐挳        锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
+                    case 'btn-Drop':
+                        set_DropBill(1);
+                        break;
+                    //鍙嶄綔搴熸寜閽�
+                    case 'btn-DeDrop':
+                        set_DropBill(2);
+                        break;
+                    case 'set_ShowBill_dh':
+                        set_ShowBill_dh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumn();
+                        break;
+                    //淇濆瓨鏂规
+                    case 'set_SaveScheme': set_SaveScheme();
+                        break;
+                    //璇诲彇鏂规
+                    case 'set_ReadScheme': set_ReadScheme();
+                        break;
+                };
+            });
+            //#endregion
+
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+            //#endregion
+                
+            table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+                table.reload('mainTable', {
+                    initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+                    , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+                        field: obj.field //鎺掑簭瀛楁   鍦ㄦ帴鍙d綔涓哄弬鏁板瓧娈�  field order
+                        , order: obj.type //鎺掑簭鏂瑰紡   鍦ㄦ帴鍙d綔涓哄弬鏁板瓧娈�  field order
+                    }
+                });
+                option.data = layui.table.cache["mainTable"];
+                table.render(option);
+            });
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            //#endregion
+
+            //#endregion
+
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+               
+                //鏌ヨ
+                get_FastQuery();
+                //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+                get_DefaultModule();
+                $("#BenginHCreateDate").val(Format(new Date(new Date()-(1000 * 60 * 60 * 24 * 7)), "yyyy-MM-dd"));
+                $("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));
+            }
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , sort: true  //閲嶇偣1锛氳繖閲岀殑sort琛ㄧず table琛ㄥ湪鍙栧緱鎺ュ彛鏁版嵁鍚庯紝瀵归〉闈㈡覆鏌撳悗鐨則able鏁版嵁杩涜鎺掑簭銆傚悓鏃讹紝杩欓噷鐨則rue 浼氬奖鍝嶉〉闈ort 涓婁笅灏忕澶寸殑 鏄剧ず鏁堟灉
+                    , totalRow: true
+                    , limit: 50
+                    , limits: [50, 500, 5000, 50000]
+                    , done: function (res, curr, count) {
+                        soulTable.render(this);
+                    }
+                };
+            }
+            //#endregion
+
+            //#region 鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Sb_EquipBeginBill/get锘縎b_EquipBeginBillMainList',
+                    type: "GET",
+                    async: false,
+                    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: 120 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+                                    }
+                                }
+                            }
+
+                            option.cols = [col];
+                            option.data = data1.data;
+                            table.render(option);
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+
+                            layer.close(ajaxLoad);
+
+                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                                ColFilter();
+                            }
+
+                            //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 HBillNo = $("#HBillNo").val();  //鍗曟嵁鍙�
+                var HEquipName = $("#HEquipName").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 (HEquipName) {
+                    sWhere += " and 璁惧 like '%" + HEquipName + "%'";
+                }
+                if (BenginHCreateDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + BenginHCreateDate + "'";
+                }
+                if (EndHCreateDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + EndHCreateDate + "'";
+                }
+
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#HBillNo").val("");
+                $("#HEquipName").val("");
+                $("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
+                $("#EndHCreateDate").val(Format(new Date( ), "yyyy-MM-dd"));
+             
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                form.render('select');
+
+                sWhere = "";
+            }
+            //#endregion
+
+            //#region 鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '鏂板' + HPageTitle
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../../璁惧绠$悊/璁惧寮�鏈哄崟/Sb_EquipBeginBill.html?OperationType=1&linterid=0&HSouceBillType='
+                    ,btn: [],
+                    // 鎸夐挳1 鐨勫洖璋�
+                    end: function (index, layero, that) {
+                        //鍒锋柊椤甸潰
+                        $("#btnSearch").trigger('click');
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HInterID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫' + HPageTitle
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../璁惧绠$悊/璁惧寮�鏈哄崟/Sb_EquipBeginBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                        , btn: [],
+                        // 鎸夐挳1 鐨勫洖璋�
+                        end: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            $("#btnSearch").trigger('click');
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HInterID.toString();
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        //閫昏緫鍒犻櫎鏂规硶
+                        $.ajax({
+                            url: GetWEBURL() + 'Sb_EquipBeginBill/Delete锘縎b_EquipBeginBill',
+                            type: "GET",
+                            data: { "HInterID": HInterID, "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);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        $("#btnSearch").trigger('click');
+                                    });
+                                } 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() {
+                $("#btnSearch").trigger('click');
+            }
+            //#endregion
+
+            //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+            function set_CheckBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HInterID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sb_EquipBeginBill/AuditSb_EquipBeginBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
+            function set_CloseBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HInterID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sb_EquipBeginBill/CloseSb_EquipBeginBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶄綔搴�/浣滃簾鏁版嵁
+            function set_DropBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HInterID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sb_EquipBeginBill/DropSb_EquipBeginBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+         
+            //#region 闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                var contentUrl = "";
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+                var urlLen = urlStr.split('/');
+                for (var i = 0; i < urlLen.length - 4; i++) {
+                    contentUrl += "../";
+                }
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: [contentUrl, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 1; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                //if (data1.data[0].HColumnWidth != 0) {
+                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                                //} else {
+                                //    option.cols[0][i + 1]["width"] = "";
+                                //}
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                        } else {
+                            table.render(option);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 浠绘剰瀛楁杩囨护锛氬垪鍚嶆樉绀轰笅鎷夋
+            function ColFilter() {
+                var Organization = '<option  value="0" selected="selected" ></option>';
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    if (option.cols[0][i].hide != true) {
+                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+                    }
+                }
+                $("#ColName").empty();
+                $("#ColName").append(Organization);
+                form.render('select');
+            }
+            //#endregion
+
+            //#region 鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+            //#endregion
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
+            function get_DefaultModule() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+                    type: "GET",
+                    data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            //褰撳墠鐢ㄦ埛璁剧疆鏈夐粯璁ょ殑杩囨护鏂规
+                            var data = data1.data;
+                            //褰撳墠閫夋嫨鐨勮繃婊ゆ柟妗�
+                            HInterID_Choose = data[0].hmainid;
+                            //杩囨护鏂规鍐呯爜
+                            HInterID = data[0].hmainid
+                            //杩囨护鏂规鍚嶇О
+                            HDefaultFilter = data[0].鏂规鍚嶇О
+                            //杩囨护鏂规鐨勫娉紙鏂规淇℃伅鎻忚堪锛�
+                            var HRemark = data[0].澶囨敞
+                            //鏄剧ず鍑哄綋鍓嶇殑榛樿杩囨护鏂规
+                            document.getElementById("HFilterScheme_Now").style.display = "block";
+                            document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
+                            //鎶婅繃婊ゆ潯浠跺�煎洖鍐欏埌椤甸潰涓�
+                            for (let i = 0; i < data.length; i++) {
+                                $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+                                if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+                                    $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+                                }
+                            }
+                            //鏌ヨ
+                            get_FastQuery();
+                            form.render("select");
+                        } else {
+                            //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
+                            //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
+                            document.getElementById("HFilterScheme_Now").style.display = "none";
+                           
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //淇濆瓨鏂规
+            function set_SaveScheme() {
+                var index = layer.open()
+                //鍒ゆ柇鐢ㄦ埛鏄惁鐐瑰嚮浜嗗彸涓婅鐨勨�滃弶鍙封�濆叧闂脊绐楅〉闈�
+                var HIsClose_Manual = false;
+                //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                var Filter = document.getElementsByClassName(HClassTag);
+
+                var HFilterIdList = "";//杩囨护鏉′欢
+                var HFilterIdLists = "";//鎷兼帴澶氫釜杩囨护鏉′欢
+                var HValue = "";//杩囨护鍊�
+                var HElement_type = "";//杩囨护鏍囩绫诲瀷
+
+                for (var i = 0; i < Filter.length; i++) {
+                    HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+                    HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�                    
+                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                }
+
+                //鍘婚櫎鏈熬閫楀彿
+                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                HValue = HValue.substring(0, HValue.length - 1);
+                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                //褰撳墠椤甸潰涓婃病鏈夐�夋嫨杩囨护鏂规锛岃繘鍏ユ柊澧炴柟娉�
+                if (HDefaultFilter == "") {
+                    layer.open({
+                        type: 2
+                        , area: ['40%', '80%']
+                        , title: '杩囨护鏂规'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                        , cancel: function () {
+                            // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+                            HIsClose_Manual = true;
+                        }
+                        , end: function () {
+                            if (HIsClose_Manual != true) {
+                                get_FastQuery();
+                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                                document.getElementById("HFilterScheme_Now").style.display = "block";
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                            }
+                        }
+                    })
+                    layer.close(index)
+                } else {
+                    //褰撳墠椤甸潰宸叉湁杩囨护鏂规锛岀敤鎴烽�夋嫨 鏂板鎴栬�呯紪杈�
+                    layer.confirm('褰撳墠宸查�夋嫨杩囨护鏂规锛屾槸鍚︿慨鏀癸紵璇烽�夋嫨瀵瑰簲鎿嶄綔', {
+                        title: "鎿嶄綔鎻愮ず",
+                        icon: 0,
+                        btn: ['鏂板鏂规', '淇濆瓨淇敼褰撳墠鏂规', '鍙栨秷']
+                    }, function (index, layero) {
+                        //鏂板
+                        layer.open({
+                            type: 2
+                            , area: ['40%', '80%']
+                            , title: '杩囨护鏂规'
+                            , shift: 0//寮瑰嚭鍔ㄧ敾
+                            , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                            , end: function () {
+                                get_FastQuery()
+                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                                document.getElementById("HFilterScheme_Now").style.display = "block";
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                            }
+                        })
+                        layer.close(index)
+                    }, function (index) {
+                        //缂栬緫
+                        var Filter_Edit = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                        HFilterIdList = "";
+                        HFilterIdLists = "";
+                        HValue = "";
+                        HElement_type = "";
+                        for (var i = 0; i < Filter_Edit.length; i++) {
+                            HFilterIdList = Filter_Edit[i].id; //杩囨护鏉′欢ID
+                            HFilterIdLists += Filter_Edit[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                            HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                            HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                        }
+                        //鍘婚櫎鏈熬閫楀彿
+                        HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                        HValue = HValue.substring(0, HValue.length - 1);
+                        HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                        var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 3;
+
+                        //淇敼
+                        $.ajax({
+                            type: "POST",
+                            url: GetWEBURL() + "/Xt_FastICScheme/save", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": sMainSub },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
+                                }
+                                else {
+
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+
+                            }
+                        });
+                        layer.close(index)
+                    }, function (index) {
+                        //鍙栨秷
+                        layer.alert('鍙栨秷')
+                        layer.close(index)
+                    });
+                }
+
+            }
+
+            //璇诲彇鏂规
+            function set_ReadScheme() {
+                var HIsClose_Manual = false;
+                var Filter = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+
+                var HFilterIdList = "";
+                var HFilterIdLists = "";
+                var HValue = "";
+                var HElement_type = "";
+                for (var i = 0; i < Filter.length; i++) {
+                    HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+                    HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                }
+                //鍘婚櫎鏈熬閫楀彿
+                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                HValue = HValue.substring(0, HValue.length - 1);
+                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '杩囨护鏂规鍒楄〃'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName
+                    , cancel: function () {
+                        // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+                        HIsClose_Manual = true;
+                    }
+                    , end: function () {
+                        if (HIsClose_Manual != true) {
+                            get_FastQuery()
+                            form.render("select");
+                        }
+                    }
+                })
+            }
+
+            //#endregion
+
+            //#endregion
+        });
+  
+        //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+        function HFilterScheme(obj)  //杩斿洖杩囨护鏂规
+        {
+            var HInterID = obj[0].hmainid;
+            HInterID_Choose = obj[0].hmainid;
+            $.ajax({
+                url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+                type: "GET",
+                data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        var data = data1.data;
+                        //璧嬪�艰繃婊ゆ柟妗堝悕绉�
+                        HDefaultFilter = data[0].鏂规鍚嶇О
+                        var HRemark = data[0].澶囨敞
+                        //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                        document.getElementById("HFilterScheme_Now").style.display = "block";
+                        document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
+                        HInterID = data[0].hmainid
+                        //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
+                        for (let i = 0; i < data.length; i++) {
+                            $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+                            if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+                                $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+                            }
+                        }
+
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+        //#endregion
+
+    </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/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
index 24b8aaa..36fb1bc 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
@@ -204,7 +204,7 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HDotCheckItemID": "0", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" };
+                var NewRow = { "HDotCheckItemID": "0", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" };
                 switch (obj.event) {
                     //鏂板涓�琛�
                     case 'btn-AddLine': btnAddLine(NewRow);
@@ -269,7 +269,9 @@
                                         //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
                                         obj.update({
                                             HDotCheckItemID: checkStatus.data[0].HItemID,
-                                            HDotCheckItem: checkStatus.data[0].鐐规椤圭洰鍚嶇О
+                                            HDotCheckItem: checkStatus.data[0].鐐规椤圭洰鍚嶇О,
+                                            HDotCheckItemClassID: checkStatus.data[0].HDotCheckItemClassID,
+                                            HDotCheckItemClassName: checkStatus.data[0].鐐规椤圭洰鍒嗙被鍚嶇О,
                                         });
                                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                                     } else {
@@ -284,7 +286,7 @@
                                         }
                                         //灏嗘壒閲忛�夋嫨鐨勬暟鎹啓鍏ユ暟缁勶紙澶氶�夎锛�
                                         for (var i = 0; i < checkStatus.data.length; i++) {
-                                            buttonArr.push({ "HDotCheckItemID": checkStatus.data[i].HItemID, "HDotCheckItem": checkStatus.data[i].鐐规椤圭洰鍚嶇О, "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" });
+                                            buttonArr.push({ "HDotCheckItemID": checkStatus.data[i].HItemID, "HDotCheckItem": checkStatus.data[i].鐐规椤圭洰鍚嶇О, "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": checkStatus.data[i].HDotCheckItemClassID, "HDotCheckItemClassName": checkStatus.data[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": 0,"HDotCheckItemMethodName":""});
                                         }
 
                                         table.reload("mainTable", {
@@ -355,6 +357,74 @@
                                 }
                             });
                         }
+
+                        if (obj.event === 'HDotCheckItemClassName')  //鐐规椤圭洰鍒嗙被
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '鐐规椤圭洰鍒嗙被鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true
+                                , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemClassList.html', 'yes']
+                                , btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HDotCheckItemClassID: checkStatus.data[0].HItemID,
+                                        HDotCheckItemClassName: checkStatus.data[0].鐐规椤圭洰鍒嗙被鍚嶇О
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                }
+                            });
+                        }
+                        if (obj.event === 'HDotCheckItemMethodName')  //鐐规鏂规硶
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '鐐规鏂规硶鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true
+                                , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemMethodList.html', 'yes']
+                                , btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HDotCheckItemMethodID: checkStatus.data[0].HItemID,
+                                        HDotCheckItemMethodName: checkStatus.data[0].鐐规鏂规硶鍚嶇О
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                }
+                            });
+                        }
+
                         obj.event = "";
                         return false;
 
@@ -378,6 +448,10 @@
                     , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
                     , { field: 'HDotCheckItemID', title: '鐐规椤圭洰ID', edit: 'text', hide: true }
                     , { field: 'HDotCheckItem', title: '鐐规椤圭洰', edit: 'text', event: 'HDotCheckItem' }
+                    , { field: 'HDotCheckItemClassID', title: '鐐规椤圭洰鍒嗙被ID', edit: 'text', hide: true }
+                    , { field: 'HDotCheckItemClassName', title: '鐐规椤圭洰鍒嗙被', edit: 'text', event: 'HDotCheckItemClassName' }
+                    , { field: 'HDotCheckItemMethodID', title: '鐐规鏂规硶ID', edit: 'text', hide: true }
+                    , { field: 'HDotCheckItemMethodName', title: '鐐规鏂规硶', edit: 'text', event: 'HDotCheckItemMethodName' }
                     , { field: 'HDotCheckPart', title: '鐐规閮ㄤ綅', edit: 'text' }
                     , { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
                     , { field: 'HManagerID', title: '璐熻矗浜篒D', edit: 'text', hide: true }
@@ -406,7 +480,7 @@
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
                 get_MAXNum();
-                option.data = [{ "HDotCheckItemID": "0", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" }];
+                option.data = [{ "HDotCheckItemID": "0", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
                 table.render(option);
             }
             //鑾峰彇鏈�澶у崟鎹彿
@@ -460,7 +534,7 @@
             function set_EditFromGrid() {
                 set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
                 set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
-                option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "" }];
+                option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
                 table.render(option);
 
             }
@@ -508,7 +582,7 @@
                             var data = result.data;
                             var rowarr = [];
                             for (var i = 0; i < result.data.length; i++) {
-                                rowarr.push({ "HDotCheckItemID": data[i].鐐规椤圭洰ID, "HDotCheckItem": data[i].鐐规椤圭洰, "HDotCheckPart": data[i].鐐规閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerNumber": data[i].璐熻矗浜轰唬鐮�, "HManagerName": data[i].璐熻矗浜�, "HRemark": data[i].瀛愬娉� });
+                                rowarr.push({ "HDotCheckItemID": data[i].鐐规椤圭洰ID, "HDotCheckItem": data[i].鐐规椤圭洰, "HDotCheckPart": data[i].鐐规閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerNumber": data[i].璐熻矗浜轰唬鐮�, "HManagerName": data[i].璐熻矗浜�, "HRemark": data[i].瀛愬娉�, "HDotCheckItemClassID": data[i].HDotCheckItemClassID, "HDotCheckItemClassName": data[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": data[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": data[i].鐐规鏂规硶鍚嶇О });
                             }
                             option.data = rowarr;
                             table.render(option);
@@ -596,7 +670,7 @@
         //璐d换浜�
         function GetHManagerValue(obj) {
             OptionData = obj;
-        }   
+        }
     </script>
 </body>
 </html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\256\211\347\201\257\351\200\220\347\272\247\345\221\274\345\217\253\350\247\204\345\210\231/OA_AndengFlowRuleBillMain.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\256\211\347\201\257\351\200\220\347\272\247\345\221\274\345\217\253\350\247\204\345\210\231/OA_AndengFlowRuleBillMain.html"
index 6e3f475..311a09d 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\256\211\347\201\257\351\200\220\347\272\247\345\221\274\345\217\253\350\247\204\345\210\231/OA_AndengFlowRuleBillMain.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\256\211\347\201\257\351\200\220\347\272\247\345\221\274\345\217\253\350\247\204\345\210\231/OA_AndengFlowRuleBillMain.html"
@@ -127,7 +127,7 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HUpdater" id="HUpdater" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -142,19 +142,19 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HMakerDate" id="HMakerDate" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HUpdaterDate" id="HUpdaterDate" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HCheckerDate" id="HCheckerDate" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                     </div>
@@ -171,40 +171,22 @@
                                                 <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">閫�鍥炰汉</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HBacker" id="HBacker" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
+
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鍏抽棴鏃ユ湡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HCloseManDate" id="HCloseManDate" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HDeleteManDate" id="HDeleteManDate" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">閫�鍥炴棩鏈�</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HBackerDate" id="HBackerDate" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">閫�鍥炲師鍥�</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HBackRemark" id="HBackRemark" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
+
                                     </div>
                                 </div>
                             </div>
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
index bb1db9e..e0dd644 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
@@ -95,16 +95,36 @@
                                                     </div>
                                                 </div>
                                                 <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇鐝</label>
+                                                    <div class="layui-input-block" style="margin-left: 77px;">
+                                                        <input type="text" class="layui-input" name="HShiftsName" id="HShiftsName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHShifts" id="btnHShifts" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                        </button>
+                                                        <input type="hidden" name="HShiftsID" id="HShiftsID" value="0">
+                                                    </div>
+                                                </div>                                               
+                                            </div>
+                                            <div class="layui-row">
+                                                <div class="layui-inline" style="width: 45%;">
+                                                    <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline" style="width: 45%">
+                                                    <label class="layui-form-label" style="width: 85px;">寮傚父涓存椂<br />澶勭悊鏂规</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <input type="text" class="layui-input" name="HErrTreatment" id="HErrTreatment" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="margin-top:10px;">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="layui-row">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">鍒ゆ柇缁撹</label>
                                                     <div class="layui-input-block">
                                                         <input type="radio" name="HLastResult" id="HLastResult" value="1" title="鍚堟牸" checked>
                                                         <input type="radio" name="HLastResult" id="HLastResult" value="0" title="涓嶅悎鏍�">
-                                                    </div>
-                                                </div>
-                                                <div class="layui-colorpicker-xs" style="margin-top:15px">
-                                                    <label class="layui-form-label"> 澶囨敞</label>
-                                                    <div class="layui-input-block">
-                                                        <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
                                                     </div>
                                                 </div>
                                             </div>
@@ -1075,6 +1095,9 @@
                                 , "HMainProcNumber": data.宸ュ簭浠g爜
                                 , "HMainProcName": data.宸ュ簭鍚嶇О
                                 , "HRemark": data.琛ㄥご澶囨敞
+                                , "HShiftsID": data.HShiftsID
+                                , "HShiftsName": data.鐝鍚嶇О
+                                , "HErrTreatment": data.寮傚父涓存椂澶勭悊鏂规
                             });
 
 
@@ -1187,6 +1210,44 @@
                 })
             });
 
+            //琛ㄥご淇℃伅鐢熶骇鐝寮圭獥
+            form.on('submit(btnHShifts)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鐢熶骇鐝鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ShiftsList.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HShiftsName").val(checkStatus.data[0].鐝鍚嶇О);
+                        $("#HShiftsID").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(HMateria-BT)', function () {//浜у搧
                 layer.open({
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index a381201..72e7e77 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -74,7 +74,7 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="date" class="layui-input" name="HDate" id="HDate" style="padding-left: 47px;">
+                                                <input type="date" class="layui-input" name="HDate" id="HDate" style="padding-left: 68px;">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -86,7 +86,7 @@
                                                 </button>
                                                 <input type="hidden" name="HSourceID" id="HSourceID" value="0">
                                             </div>
-                                        </div>
+                                        </div>                                        
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-inline">
@@ -173,12 +173,28 @@
                                                 <input type="hidden" name="HQCSchemeID" id="HQCSchemeID" value="0">
                                             </div>
                                         </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇鐝</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" name="HShiftsName" id="HShiftsName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHShifts" id="btnHShifts" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" name="HShiftsID" id="HShiftsID" value="0">
+                                            </div>
+                                        </div>
                                     </div>
                                     <div class="layui-row">
-                                        <div class="layui-inline" style="width: 50%;">
+                                        <div class="layui-inline" style="width: 45%;">
                                             <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline" style="width: 45%">
+                                            <label class="layui-form-label" style="width: 85px;">寮傚父涓存椂<br />澶勭悊鏂规</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HErrTreatment" id="HErrTreatment" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="margin-top:10px;">
                                             </div>
                                         </div>
                                     </div>
@@ -1385,6 +1401,9 @@
                                 , "HEntryID": data.hsubid
                                 , "HQCCheckItemName": data.妫�楠岄」鐩悕绉�
                                 , "HQCCheckItemID": data.HQCCheckItemID
+                                , "HShiftsID": data.HShiftsID
+                                , "HShiftsName": data.鐝鍚嶇О
+                                , "HErrTreatment": data.寮傚父涓存椂澶勭悊鏂规
                             });
                             data = result.data;
                             //data = result.data.h_v_QC_Edit_FirstPieceCheckBillList;
@@ -1490,6 +1509,44 @@
                 });
             });
 
+            //琛ㄥご淇℃伅鐢熶骇鐝寮圭獥
+            form.on('submit(btnHShifts)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鐢熶骇鐝鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ShiftsList.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HShiftsName").val(checkStatus.data[0].鐝鍚嶇О);
+                        $("#HShiftsID").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(btnSearchCheckItemID)', function () {
                 //椤甸潰灞�-鑷畾涔�
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index 4be6002..6deab56 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -79,12 +79,12 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="date" class="layui-input" name="HDate" id="HDate" style="padding-left: 32px; width: 110%;">
+                                                <input type="date" class="layui-input" name="HDate" id="HDate" style="padding-left: 68px;">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 100px;padding: 9px 18px;">鐢熶骇璧勬簮</label>
-                                            <div class="layui-input-block" style="margin-left: 92px;">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇璧勬簮</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchSource" id="btnSearchSource" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -114,6 +114,16 @@
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <input type="text" class="layui-input" name="HICMOInterID" id="HICMOInterID" value="0" style="background-color:#efefef4d;" readonly>
                                                 <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇鐝</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" name="HShiftsName" id="HShiftsName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHShifts" id="btnHShifts" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" name="HShiftsID" id="HShiftsID" value="0">
                                             </div>
                                         </div>
                                     </div>
@@ -187,14 +197,20 @@
                                     <div class="layui-row">
                                     </div>
                                     <div class="layui-row">
-                                        <div class="layui-inline" style="width: 50%;">
+                                        <div class="layui-inline" style="width: 45%;">
                                             <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
                                             </div>
                                         </div>
+                                        <div class="layui-inline" style="width: 45%">
+                                            <label class="layui-form-label" style="width: 85px;">寮傚父涓存椂<br />澶勭悊鏂规</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HErrTreatment" id="HErrTreatment" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="margin-top:10px;">
+                                            </div>
+                                        </div>
                                     </div>
-                                    <div class="layui-row">
+                                    <div class="layui-row">                                                            
                                         <div class="layui-inline">
                                             <label class="layui-form-label">鍒ゆ柇缁撹</label>
                                             <div class="layui-input-block">
@@ -1157,7 +1173,7 @@
                                 shift: 2,
                                 area: ['90%', '90%'],
                                 maxmin: true,
-                               content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html', 'yes'],
+                                content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html', 'yes'],
                                 btn: ['纭畾', '鍙栨秷']
                                 , btn1: function (index, layero) {
 
@@ -1174,7 +1190,7 @@
                                         , HQCCheckItemID: checkStatus.data[0].HItemID
                                         , HResult: HResult
                                     });
-                                    $('#HResult' + rowIndex + '').find("option[value='" + HResult + "']").attr("selected", true);                                    
+                                    $('#HResult' + rowIndex + '').find("option[value='" + HResult + "']").attr("selected", true);
                                     form.render('select');
                                     layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                                 }
@@ -1497,6 +1513,9 @@
                                 , "HEntryID": data.hsubid
                                 , "HQCCheckItemName": data.妫�楠岄」鐩悕绉�
                                 , "HQCCheckItemID": data.HQCCheckItemID
+                                , "HShiftsID": data.HShiftsID
+                                , "HShiftsName": data.鐝鍚嶇О
+                                , "HErrTreatment": data.寮傚父涓存椂澶勭悊鏂规
                             });
                             data = result.data;
                             //data = result.data.h_v_QC_Edit_FirstPieceCheckBillList;
@@ -1849,7 +1868,7 @@
             //#endregion
 
             //#region銆愰�夋楠屾柟妗堣幏鍙栬〃浣撴楠岄」鐩俊鎭��
-            window.get_CheckItem = function() {
+            window.get_CheckItem = function () {
                 var HBatchQty = $("#HProcExchQty").val();
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
@@ -2053,6 +2072,44 @@
                         }
                         $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
                         $("#HSourceID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //琛ㄥご淇℃伅鐢熶骇鐝寮圭獥
+            form.on('submit(btnHShifts)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鐢熶骇鐝鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ShiftsList.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HShiftsName").val(checkStatus.data[0].鐝鍚嶇О);
+                        $("#HShiftsID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) {
@@ -3752,7 +3809,7 @@
             $("#HQCSchemeID").val(obj[0].hmainid);
             $("#HQCSchemeName").val(obj[0].妫�楠屾柟妗堝悕绉�);
             get_CheckItem();
-        }        
+        }
 
     </script>
 </body>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index f68acd5..01308f5 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -909,6 +909,16 @@
                                 $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
                                 $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
                             }
+
+                            //绂佺敤鎶ュ簾鏁伴噺瀛楁
+                            if ((Number($("#HWasterQty_Work").val()) + Number($("#HWasterQty_Mater").val())) > 0) {
+                                $("#HWasterQty").attr("disabled", "disabled");
+                                document.getElementById('HWasterQty').style.backgroundColor = '#efefef4d';
+                            } else {
+                                $("#HWasterQty").removeAttr("disabled");
+                                document.getElementById('HWasterQty').style.backgroundColor = '#FFFFFF';
+                            }
+
                             PicUpload();
                             layer.close(index);
                         }
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
index de75887..f3e55b1 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
@@ -1453,7 +1453,7 @@
                                 , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
                                 , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
                                 , 'HDiscountRate': dataArray[i].鎶樻墸鐜�                                                       //
-                                , 'HRelTaxPrice': dataArray[i].瀹為檯鍚◣鍗曚环     
+                                , 'HRelTaxPrice': dataArray[i].瀹為檯鍚◣鍗曚环 
                                 , "HTaxRate": dataArray[i].绋庣巼
                                 , 'HTaxMoney': dataArray[i].绋庨                                                             //
                                 , "HMoney": dealDoubleToFixed(dataArray[i].閲戦, 2)
@@ -1530,7 +1530,7 @@
                                 , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
                                 , "HQty": dealDoubleToFixed(dataArray[i].瀹炴敹鏁伴噺, 1)
                                 , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
-                                , "HTaxPrice": dataArray[i].鍚◣鍗曚环
+                                , "HTaxPrice": dataArray[i].鍚◣鍗曚环 
                                 , 'HDiscountRate': dataArray[i].鎶樻墸鐜�                                               //
                                 , 'HRelTaxPrice': "0"
                                 , "HTaxRate": dataArray[i].绋庣巼
@@ -1643,14 +1643,33 @@
                     layer.msg("鏃ユ湡涓嶈兘涓虹┖!");
                     return false;
                 }
-                if ($("#HSupID").val() == "0") {
-                    layer.msg("渚涘簲鍟嗘湭閫夋嫨!");
-                    return false;
+                if ($("#HCurID").val() == 0) {
+                    layer.msg("璇烽�夋嫨甯佸埆锛�");
+                    return;
                 }
-
-                if ($("#HCurID").val() == "0") {
-                    layer.msg("甯佸埆鏈�夋嫨!");
-                    return false;
+                if ($("#HExRate").val() == 0) {
+                    layer.msg("璇疯緭鍏ユ眹鐜囷紒");
+                    return;
+                }
+                if ($("#HEmpID").val() == 0) {
+                    layer.msg("璇烽�夋嫨涓氬姟鍛樺憳锛�");
+                    return;
+                }
+                if ($("#HDeptID").val() == 0) {
+                    layer.msg("璇烽�夋嫨閲囪喘閮ㄩ棬锛�");
+                    return;
+                }
+                if ($("#HSupID").val() == 0) {
+                    layer.msg("璇烽�夋嫨渚涘簲鍟嗭紒");
+                    return;
+                }
+                if ($("#HPSStyleID").val() == 0) {
+                    layer.msg("璇烽�夋嫨閲囪喘鏂瑰紡锛�");
+                    return;
+                }
+                if ($("#HSSID").val() == 0) {
+                    layer.msg("璇烽�夋嫨缁撶畻鏂瑰紡锛�");
+                    return;
                 }
 
                 temp = $("#HExRate").val() + "";
@@ -1665,6 +1684,9 @@
 
                 //#region 瀛愯〃 鏁版嵁妫�楠�
                 for (var i = 0; i < option.data.length; i++) {
+                    if (typeof option.data[i] !== 'object' || option.data[i] === null || Array.isArray(option.data[i])) {
+                        continue; // 璺宠繃闈炲璞¢」锛堝绌烘暟缁勶級  
+                    }
                     if (option.data[i]["HMaterID"] == "0") {
                         layer.msg("绗�" + (i+1) + "琛岋細鐗╂枡鏈�夋嫨锛�");
                         return false;
@@ -1729,12 +1751,6 @@
                         return false;
                     } else if (!ref.test(temp)) {
                         layer.msg("绗�" + (i + 1) + "琛岋細浠风◣鍚堣璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
-                        return false;
-                    }
-
-                    //鍙戣揣浠撳簱闈炵┖楠岃瘉
-                    if (option.data[i]["HWHID"] == "0") {
-                        layer.msg("绗�" + (i + 1) + "琛岋細鍙戣揣浠撳簱鏈�夋嫨锛�");
                         return false;
                     }
                 }
@@ -2242,6 +2258,7 @@
                             , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
                             , "HQty": dealDoubleToFixed(dataArray[i].瀹炴敹鏁伴噺-dataArray[i].鍏宠仈鏁伴噺, 1)
                             , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+                            , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
                             , 'HDiscountRate': "0"                                                     //
                             , 'HRelTaxPrice': "0"
                             , "HTaxRate": dataArray[i].绋庣巼
@@ -2353,40 +2370,7 @@
             }
             //#endregion
 
-            //#region 淇濆瓨鏂规硶鏍¢獙
-            function AllowLoadData(data) {
-                if ($("#HCurID").val() == 0) {
-                    layer.msg("璇烽�夋嫨甯佸埆锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                if ($("#HExRate").val() == 0) {
-                    layer.msg("璇疯緭鍏ユ眹鐜囷紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                if ($("#HEmpID").val() == 0) {
-                    layer.msg("璇烽�夋嫨涓氬姟鍛樺憳锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                if ($("#HDeptID").val() == 0) {
-                    layer.msg("璇烽�夋嫨閲囪喘閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                if ($("#HSupID").val() == 0) {
-                    layer.msg("璇烽�夋嫨渚涘簲鍟嗭紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                if ($("#HPSStyleID").val() == 0) {
-                    layer.msg("璇烽�夋嫨閲囪喘鏂瑰紡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                if ($("#HSSID").val() == 0) {
-                    layer.msg("璇烽�夋嫨缁撶畻鏂瑰紡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                return true;
-            }
-
-            //endregion
+            
 
             //#endregion
 
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
index e5c77e0..c55b9cc 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
@@ -1196,6 +1196,11 @@
 
                 //#region 瀛愯〃 鏁版嵁妫�楠�
                 for (var i = 0; i < option.data.length; i++) {
+
+                    if (typeof option.data[i] !== 'object' || option.data[i] === null || Array.isArray(option.data[i])) {
+                        continue; // 璺宠繃闈炲璞¢」锛堝绌烘暟缁勶級  
+                    }
+
                     if (option.data[i]["HMaterID"] == "0") {
                         layer.msg("绗�" + (i+1) + "琛岋細鐗╂枡鏈�夋嫨锛�");
                         return false;
@@ -1787,8 +1792,8 @@
                                     "HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠g爜": checkStatus.data[j].鐗╂枡浠g爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
                                     "HUnitID": checkStatus.data[j].HUnitID, "璁¢噺鍗曚綅": checkStatus.data[j].璁¢噺鍗曚綅,
                                     "HQty": checkStatus.data[j].鏁伴噺-checkStatus.data[j].鍏宠仈鏁伴噺, "HPrice": checkStatus.data[j].鍗曚环,
-                                    "HMoney": checkStatus.data[j].閲戦, "HTaxPrice": checkStatus.data[j].鍚◣鍗曚环, "HTaxRate": checkStatus.data[j].绋庣巼, "HTaxMoney": checkStatus.data[j].绋庨, "HDiscountRate": checkStatus.data[j].鎶樻墸鐜�, "HWHID": checkStatus.data[j].HWHID,
-                                    "鏀舵枡浠撳簱": checkStatus.data[j].浠撳簱鍚嶇О,"HSPID": checkStatus.data[j].HSPID,"浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О,"HSecUnitID": checkStatus.data[j].HSecUnitID,"杈呭姪鍗曚綅": checkStatus.data[j].杈呭姪鍗曚綅,
+                                    "HMoney": checkStatus.data[j].閲戦, "HTaxPrice": checkStatus.data[j].鍚◣鍗曚环, "HTaxRate": checkStatus.data[j].绋庣巼, "HTaxMoney": checkStatus.data[j].绋庨, "HDiscountRate": checkStatus.data[j].鎶樻墸鐜�,
+                                    "HWHID": checkStatus.data[j].HWHIDSub,"鏀舵枡浠撳簱": checkStatus.data[j].浠撳簱鍚嶇О,"HSPID": checkStatus.data[j].HSPID,"浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О,"HSecUnitID": checkStatus.data[j].HSecUnitID,"杈呭姪鍗曚綅": checkStatus.data[j].杈呭姪鍗曚綅,
                                     "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
                                 })
                                 j++;
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
index bcff8f2..6492625 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
@@ -366,7 +366,7 @@
             var allVal;
             //#endregion
 
-          //璁板綍缁勭粐鐨勫��
+            //璁板綍缁勭粐鐨勫��
             var HOrgIDBar = 0;
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -385,14 +385,14 @@
             var params = get_UrlVars();
             var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫
             var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-            
+
             $("#HUSEORGID").val(sessionStorage["OrganizationID"]);
-          
-        //#region 鍒濆鍖栫粍缁�
+
+            //#region 鍒濆鍖栫粍缁�
             Organ();
             //#endregion
 
-        //#region 鑾峰彇缁勭粐
+            //#region 鑾峰彇缁勭粐
             function Organ() {
                 //鑾峰彇鐧诲綍椤电粍缁囧垪
                 var Organization = '';
@@ -406,7 +406,7 @@
                                 Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                             }
                             $("#HOrgID").append(Organization);
-                            if (OperationType == 1 || OperationType == 4) {
+                            if (OperationType == 1 || OperationType == 4 || OperationType == null) {
                                 HOrgIDBar = sessionStorage["OrganizationID"];
                             }
                             $("#HOrgID").val(HOrgIDBar);
@@ -422,6 +422,7 @@
             //鍒ゆ柇鏄惁鏂板
             if (linterid == null || linterid == 0) {
                 //鑾峰彇鏈�澶у崟鎹彿 new
+                OptionData = 1;
                 $("#HMaker").val(sessionStorage["HUserName"]);
                 $("#HInterID").val("0");
                 $("#HBillNo").val("");
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
index 7891a13..77102f9 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
@@ -393,7 +393,7 @@
 
             //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
             get_LoginIs();
-            window.OptionData = {};
+            window.OptionData = [];
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "1402";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
@@ -701,10 +701,11 @@
                                 , "瑙勬牸鍨嬪彿": checkStatus.data[i].瑙勬牸鍨嬪彿
                                 , "HUnitID": checkStatus.data[i].HUnitID
                                 , "璁¢噺鍗曚綅": checkStatus.data[i].璁¢噺鍗曚綅
-                                ,"HWHID": "0"
-                                , "鍙戣揣浠撳簱": ""
+                                , "HWHID": checkStatus.data[i].HWhID
+                                , "鍙戣揣浠撳簱": checkStatus.data[i].瀛愪粨搴�
                                 , "HQty": checkStatus.data[i].鏁伴噺,
-                                "HPrice": "0", "HMoney": "0", "HRemark": ""
+                                "HPrice": checkStatus.data[i].鍗曚环,
+                                "HMoney": checkStatus.data[i].閲戦, "HRemark": ""
                             
                                 , "HSourceBillNo": checkStatus.data[i].鍗曟嵁鍙�
                                 , "HSourceBillType": checkStatus.data[i].HBillType
@@ -814,8 +815,8 @@
                                 , "HEmpName": data.涓氬姟鍛�
                                 , "HCusID": data.HCusID
                                 , "HCusName": data.瀹㈡埛
-                                , "HWHID": data.HWHID
-                                , "HWHName": data.鍙戣揣浠撳簱
+                                , "HWHID": data.涓讳粨搴揑D
+                                , "HWHName": data.涓诲彂璐т粨搴�
                                 , "HAddress": data.浜よ揣鍦板潃
                                 , "HDeptName": data.閮ㄩ棬
                                 , "HDeptID": data.HDeptID
@@ -1061,6 +1062,20 @@
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
+                                , end: function () {
+                                    if (typeof (OptionData.HItemID) != "undefined") {
+                                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                        obj.update({
+                                            "HMaterID": OptionData.HItemID
+                                            , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
+                                            , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+                                            , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+                                            , "HUnitID": OptionData.HUnitID
+                                            , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
+                                        })
+                                        OptionData = [];
+                                    }
+                                }
                             })
                         }
                         //璁¢噺鍗曚綅
@@ -1073,7 +1088,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -1089,6 +1104,16 @@
                                         , "HUnitID": checkStatus.data[0].HItemID
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    if (typeof (OptionData.HItemID) != "undefined") {
+                                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                        obj.update({
+                                            "HUnitID": OptionData.HItemID
+                                            , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
+                                        })
+                                        OptionData = [];
+                                    }
                                 }
                             })
                         }
@@ -1121,10 +1146,13 @@
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
                                 , end: function () {
-                                    obj.update({
-                                        "HWHID": OptionData.HItemID
-                                        , "鍙戣揣浠撳簱": OptionData.浠撳簱鍚嶇О
-                                    })
+                                    if (typeof (OptionData.HItemID) != "undefined") {
+                                        obj.update({
+                                            "HWHID": OptionData.HItemID
+                                            , "鍙戣揣浠撳簱": OptionData.浠撳簱鍚嶇О
+                                        })
+                                        OptionData = [];
+                                    }
                                 }
                             })
                         }
@@ -1160,7 +1188,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '涓氬姟鍛樺垪琛�'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -1282,7 +1310,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '涓荤鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -1300,7 +1328,7 @@
 
             //椤圭洰浠g爜
             function get_checkSearchHProNumber() {
-                var HOrgID = $("#HOrgID").val();
+                var HOrgID = sessionStorage["OrganizationID"];
                 //鎵撳紑宸ョ▼椤圭洰灏忕獥浣�
                 layer.open({
                     type: 2
@@ -1373,29 +1401,29 @@
             //浠ヤ笂鏄痩ayui妯″潡
         });
         // 鍩虹璧勬枡杩斿洖鏁版嵁
-        //function GetHEmpValue(obj)  //杩斿洖涓氬姟鍛�
-        //{
-        //    $("#HEmpName").val(obj[0].HName);
-        //    $("#HEmpID").val(obj[0].HItemID);
-        //}
+        function GetHEmpValue(obj)  //杩斿洖涓氬姟鍛�
+        {
+            $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
+            $("#HEmpID").val(obj[0].HItemID);
+        }
 
-        //function GetHSupValue(obj)  //杩斿洖瀹㈡埛
-        //{
-        //    $("#HCusName").val(obj[0].HName);
-        //    $("#HCusID").val(obj[0].HItemID);
-        //}
+        function GetHCusNameValue(obj)  //杩斿洖瀹㈡埛
+        {
+            $("#HCusName").val(obj[0].瀹㈡埛鍚嶇О);
+            $("#HCusID").val(obj[0].HItemID);
+        }
 
-        //function GetHManagerValue(obj)  //杩斿洖涓荤
-        //{
-        //    $("#HManagerName").val(obj[0].HName);
-        //    $("#HManagerID").val(obj[0].HItemID);
-        //}
+        function GetHManagerValue(obj)  //杩斿洖涓荤
+        {
+            $("#HManagerName").val(obj[0].鑱屽憳鍚嶇О);
+            $("#HManagerID").val(obj[0].HItemID);
+        }
 
-        //function GetHDeptNameValue(obj)  //杩斿洖閮ㄩ棬
-        //{
-        //    $("#HDeptName").val(obj[0].HName);
-        //    $("#HDeptID").val(obj[0].HItemID);
-        //}
+        function GetHDeptNameValue(obj)  //杩斿洖閮ㄩ棬
+        {
+            $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+            $("#HDeptID").val(obj[0].HItemID);
+        }
 
         //椤圭洰浠g爜
         function GetProjectBillValue(obj) {
@@ -1407,11 +1435,6 @@
             } else {
                 layer.msg("璇ラ」鐩凡鍏抽棴锛屼笉鍙�夋嫨锛�");
             }
-        }
-
-        //鍙屽嚮杩斿洖浠撳簱
-        function GetHWHSubValue(data) {
-            OptionData = data[0]
         }
 
         function GetHWHValue(obj)  //杩斿洖浠撳簱
@@ -1428,6 +1451,24 @@
             }
             layui.table.render(option);
         }
+
+        //鍙屽嚮杩斿洖浠撳簱
+        function GetHWHSubValue(data) {
+            OptionData = data[0]
+        }
+
+        function GetGyMaterial(obj)           //鐗╂枡鍚嶇О
+        {
+            OptionData = obj;
+        }
+
+        function GetAuxiliaryUnitValue(obj)           //璁¢噺鍗曚綅
+        {
+            OptionData = obj[0];
+        }
+
+
+        
     </script>
 </body>
 </html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
index 66e5a06..eff8284 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
@@ -169,7 +169,7 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label">缁撶畻鏂瑰紡<label style="color:red"> * </label></label>
+                                            <label class="layui-form-label">缁撶畻鏂瑰紡</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HSSName" id="HSSName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
                                                 <input type="hidden" name="HSSID" id="HSSID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -346,7 +346,7 @@
 
             var allVal;
             var HModName = "Xs_ReceivableBill";
-
+            window.OptionData = [];
             //璁板綍缁勭粐鐨勫��
             var HOrgIDBar = 0;
 
@@ -1758,7 +1758,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -1772,13 +1772,27 @@
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
                                         "HMaterID": checkStatus.data[0].HItemID
-                                        , "鐗╂枡浠g爜": checkStatus.data[0].HNumber
-                                        , "鐗╂枡鍚嶇О": checkStatus.data[0].HName
-                                        , "瑙勬牸鍨嬪彿": checkStatus.data[0].HModel
+                                        , "鐗╂枡浠g爜": checkStatus.data[0].鐗╂枡浠g爜
+                                        , "鐗╂枡鍚嶇О": checkStatus.data[0].鐗╂枡鍚嶇О
+                                        , "瑙勬牸鍨嬪彿": checkStatus.data[0].瑙勬牸鍨嬪彿
                                         , "HUnitID": checkStatus.data[0].HUnitID
-                                        , "璁¢噺鍗曚綅": checkStatus.data[0].HUnitName
+                                        , "璁¢噺鍗曚綅": checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    if (typeof (OptionData.HItemID) != "undefined") {
+                                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                        obj.update({
+                                            "HMaterID": OptionData.HItemID
+                                            , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
+                                            , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+                                            , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+                                            , "HUnitID": OptionData.HUnitID
+                                            , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
+                                        })
+                                        OptionData = [];
+                                    }
                                 }
                             })
                         }
@@ -1792,7 +1806,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -1804,10 +1818,20 @@
                                     }
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
-                                        "璁¢噺鍗曚綅": checkStatus.data[0].HName
+                                        "璁¢噺鍗曚綅": checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
                                         , "HUnitID": checkStatus.data[0].HItemID
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    if (typeof (OptionData.HItemID) != "undefined") {
+                                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                        obj.update({
+                                            "HUnitID": OptionData.HItemID
+                                            , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
+                                        })
+                                        OptionData = [];
+                                    }
                                 }
                             })
                         }
@@ -2425,6 +2449,15 @@
             $("#HSSName").val(obj[0].HName);
             $("#HSSID").val(obj[0].HItemID);
         }
+        function GetGyMaterial(obj)           //鐗╂枡鍚嶇О
+        {
+            OptionData = obj;
+        }
+
+        function GetAuxiliaryUnitValue(obj)           //璁¢噺鍗曚綅
+        {
+            OptionData = obj[0];
+        }
 
         //#region 澶勭悊灏忔暟鏄剧ず浣嶆暟锛坉ata锛氶渶瑕佸鐞嗙殑鏁版嵁锛沶um锛氭暟鎹殑绫诲瀷(濡�1:鏁伴噺锛�2:閲戦锛�3:鍗曚环)锛�
         function dealDoubleToFixed(data, num) {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
index 96ddd5a..1063193 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
@@ -91,7 +91,7 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label">閿�鍞憳</label>
                                             <div class="layui-input-inline">
-                                                <input type="text" name="HEmpName" id="HEmpName" " class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                                <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
                                                 <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
                                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -245,7 +245,7 @@
                                             <label class="layui-form-label">浠撳簱</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
-                                                <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value=0 style="float:left;width:150px;">
+                                                <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;">
                                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHList" style="width:40px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                 </button>
@@ -1243,7 +1243,7 @@
                         , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, style: 'background-color:#efefef4d;' }
                         , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, style: 'background-color:#efefef4d;' }
                         , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
-                        , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 100, style: 'background-color:#efefef4d;' }//f7
+                        , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 100, style: 'background-color:#efefef4d;', edit: 'text', event:"HUnitID" }//f7
                         , { field: 'HRemark_TL', title: '鎶曟枡', width: 100, edit: 'text' }
                         , { field: 'HRemark_SJG', title: '娣卞姞宸�', width: 100, edit: 'text' }
                         , { field: 'HWHID ', title: 'HWHID ', width: 100, hide: true }
@@ -1557,7 +1557,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '瀹㈡埛鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_CustomerList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -1943,6 +1943,7 @@
                 //#region 瀛愯〃 鏁版嵁妫�楠�
                 var RowCount = 0;
                 for (var i = 0; i < option.data.length; i++) {
+
                     if (option.data[i]["HMaterID"] == "0") {
                         continue;
                     }
@@ -2552,10 +2553,6 @@
                                     var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
                                     var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
 
-                                    //if (checkStatus.data.length != 1) {
-                                    //    return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
-                                    //}
-
                                     var rowIndex = $(obj.tr).attr("data-index") * 1;
                                     for (var i = 0; i < checkStatus.data.length; i++) {
                                         if (rowIndex + i >= option.data.length) {
@@ -2650,7 +2647,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -2708,10 +2705,14 @@
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
                                 , end: function () {
-                                    obj.update({
-                                        "HWHID": OptionData.HItemID
-                                        , "浠撳簱": OptionData.浠撳簱鍚嶇О
-                                    })
+                                    if (typeof (HDataEmp.HItemID) != "undefined") {
+                                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                        obj.update({
+                                            "HWHID": HDataEmp.HItemID
+                                            , "浠撳簱": HDataEmp.浠撳簱鍚嶇О
+                                        })
+                                        HDataEmp = {};
+                                    }
                                 }
                             })
 
@@ -3459,7 +3460,7 @@
             getEmpInfoByHEmpID(obj[0].HItemID)
         }
 
-        function GetHSupValue(obj)  //杩斿洖瀹㈡埛
+        function GetHCusNameValue(obj)  //杩斿洖瀹㈡埛
         {
             //$("#HCusName").val(obj[0].HName);
             //$("#HCusID").val(obj[0].HItemID);
@@ -3471,7 +3472,7 @@
 
         function GetHManagerValue(obj)  //杩斿洖涓荤
         {
-            $("#HManagerName").val(obj[0].HName);
+            $("#HManagerName").val(obj[0].鑱屽憳鍚嶇О);
             $("#HManagerID").val(obj[0].HItemID);
         }
 
@@ -3493,12 +3494,12 @@
             $("#HSellSID").val(obj[0].HItemID);
         }
 
-        function GetMaterValue(obj)           //鐗╂枡鍚嶇О
+        function GetGyMaterial(obj)           //鐗╂枡鍚嶇О
         {
-            HDataEmp = obj[0];
+            HDataEmp = obj;
         }
 
-        function GetUnitValue(obj)           //璁¢噺鍗曚綅
+        function GetAuxiliaryUnitValue(obj)           //璁¢噺鍗曚綅
         {
             HDataEmp = obj[0];
         }
@@ -3507,6 +3508,39 @@
         {
             HDataEmp = obj[0];
         }
+
+        //椤圭洰浠g爜
+        function GetProjectBillValue(obj) {
+            if (obj[0].鍏抽棴浜� == null || obj[0].鍏抽棴浜� == "") {
+                $("#HProjectID").val(obj[0].HInterID);
+                $("#HProjectNumber").val(obj[0].椤圭洰浠g爜);//宸ョ▼椤圭洰浠g爜
+                $("#HProjectName").val(obj[0].椤圭洰鍚嶇О);//宸ョ▼椤圭洰浠g爜
+
+            } else {
+                layer.msg("璇ラ」鐩凡鍏抽棴锛屼笉鍙�夋嫨锛�");
+            }
+        }
+
+        //鍙屽嚮杩斿洖浠撳簱
+        function GetHWHSubValue(data) {
+            HDataEmp = data[0]
+        }
+
+        function GetHWHValue(obj)  //杩斿洖浠撳簱
+        {
+            $("#HWHName").val(obj[0].浠撳簱鍚嶇О);
+            $("#HWHID").val(obj[0].HItemID);
+            if (option.data.length > 0) {
+                for (var i = 0; i < option.data.length; i++) {
+                    if (option.data[i]["HWHID"] == 0 || option.data[i]["浠撳簱"] == undefined) {
+                        option.data[i]["HWHID"] = obj[0].HItemID;
+                        option.data[i]["浠撳簱"] = obj[0].浠撳簱鍚嶇О;
+                    }
+                }
+            }
+            layui.table.render(option);
+        }
+
 
         //#region 鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜囥�佺粨绠楁柟寮忋�佸鎴蜂俊鐢ㄩ搴︺�佽仈绯讳汉銆佽仈绯荤數璇�
         function getCustomerByCusID(HCusID) {
@@ -3626,38 +3660,7 @@
         }
         //#endregion
 
-        //椤圭洰浠g爜
-        function GetProjectBillValue(obj) {
-            if (obj[0].鍏抽棴浜� == null || obj[0].鍏抽棴浜� == "") {
-                $("#HProjectID").val(obj[0].HInterID);
-                $("#HProjectNumber").val(obj[0].椤圭洰浠g爜);//宸ョ▼椤圭洰浠g爜
-                $("#HProjectName").val(obj[0].椤圭洰鍚嶇О);//宸ョ▼椤圭洰浠g爜
-
-            } else {
-                layer.msg("璇ラ」鐩凡鍏抽棴锛屼笉鍙�夋嫨锛�");
-            }
-        }
-
-        //鍙屽嚮杩斿洖浠撳簱
-        function GetHWHSubValue(data) {
-            OptionData = data[0]
-        }
-
-        function GetHWHValue(obj)  //杩斿洖浠撳簱
-        {
-            $("#HWHName").val(obj[0].浠撳簱鍚嶇О);
-            $("#HWHID").val(obj[0].HItemID);
-            if (option.data.length > 0) {
-                for (var i = 0; i < option.data.length; i++) {
-                    if (option.data[i]["HWHID"] == 0 || option.data[i]["浠撳簱"] == undefined) {
-                        option.data[i]["HWHID"] = obj[0].HItemID;
-                        option.data[i]["浠撳簱"] = obj[0].浠撳簱鍚嶇О;
-                    }
-                }
-            }
-            layui.table.render(option);
-        }
-
+       
         //#region 澶勭悊灏忔暟鏄剧ず浣嶆暟锛坉ata锛氶渶瑕佸鐞嗙殑鏁版嵁锛沶um锛氭暟鎹殑绫诲瀷(濡�1:鏁伴噺锛�2:閲戦锛�3:鍗曚环)锛�
         function dealDoubleToFixed(data, num) {
             //鐢ㄤ簬璁剧疆灏忔暟浣嶆暟
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
index 17896b0..972c2ed 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
@@ -640,7 +640,8 @@
                         , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
                         , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 125, sort: true }
                         , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
-
+                        , { field: 'HWhID', title: 'HWhID', hide: true, sort: true }
+                        , { field: '瀛愪粨搴�', title: '瀛愪粨搴�', hide: true, sort: true }
 
                         //, { field: 'HBillType', title: 'HBillType', hide: true, sort: true }
                         //, { field: '浜よ揣鍦板潃', title: '浜よ揣鍦板潃', width: 125, sort: true }
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_TaskClass.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_TaskClass.html"
index 3504903..a04f3e0 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_TaskClass.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_TaskClass.html"
@@ -357,6 +357,19 @@
             function get_Refresh() {
                 $("#btnSearch").trigger('click');
             }
+
+            //#region 鍙屽嚮杩斿洖鏁版嵁
+            table.on('rowDouble(mainTable)', function (obj) {
+                var data = [];
+                data.push(obj.data);
+                parent.GetTaskClassValue(data);
+                var index = parent.layer.getFrameIndex(window.name);
+                parent.layer.close(index);
+            });
+
+            //#endregion
+
+
             //鏂板
             function set_AddNew() {
                 layer.open({
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBill.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBill.html"
index f374231..c568122 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBill.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBill.html"
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="utf-8" />
-    <title>宸ョ▼椤圭洰</title>
+    <title>宸ヤ綔浠诲姟</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -204,6 +204,16 @@
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <select name="HOrderLevID" id="HOrderLevID" lay-filter="HOrderLevID" style="width:120px;">
                                                 </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浠诲姟绫诲埆</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" lay-verify="HTaskClassName" name="HTaskClassName" id="HTaskClassName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" name="HTaskClassID" id="HTaskClassID" lay-verify="HTaskClassID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHTaskClass" id="btnSearchHTaskClass" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
                                             </div>
                                         </div>
                                     </div>
@@ -572,6 +582,13 @@
                 get_checkSearchHCopyEmp();
             });
             //#endregion
+
+            //#region 閫夋嫨娲惧崟浜烘寜閽�
+            form.on('submit(btnSearchHTaskClass)', function () {
+                get_checkSearchHTaskClass();
+            });
+            //#endregion
+
             //#endregion
 
 
@@ -813,7 +830,7 @@
                 })
             }
             //#endregion
-
+            
             //#region 娲惧崟浜洪�夋嫨椤甸潰
             function get_checkSearchHSendEmp() {
                 var HOrgID = $("#HOrgID").val();
@@ -947,6 +964,33 @@
 
                     }
                 });
+            }
+            //#endregion
+
+            //#region 浠诲姟绫诲埆閫夋嫨椤甸潰
+            function get_checkSearchHTaskClass() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鍛樺伐琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../椤圭洰绠$悊/鍩虹寤烘ā/Gy_TaskClass.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#HTaskClassID").val(checkStatus.data[0].HItemID);
+                        $("#HTaskClassName").val(checkStatus.data[0].浠诲姟绫诲埆鍚嶇О);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                    , end: function () { }
+                })
             }
             //#endregion
 
@@ -1136,6 +1180,8 @@
                             , "HRemark": tableMain[0]["HRemark"]
                             , "HOrgID": tableMain[0]["HOrgID"]
                             , "HOrderLevID": tableMain[0]["HOrderLevID"]
+                            , "HTaskClassID": tableMain[0]["HTaskClassID"]
+                            , "HTaskClassName": tableMain[0]["HTaskClassName"]
 
                             , "HMainSourceInterID": tableMain[0]["HMainSourceInterID"]
                             , "HMainSourceEntryID": tableMain[0]["HMainSourceEntryID"]
@@ -1620,6 +1666,11 @@
         function GetHReceiveValue(obj) {
             $("#HReceiveEmp").val(obj[0].鑱屽憳鍚嶇О);//鎺ユ敹浜哄悕绉�
         }
+        //浠诲姟绫诲埆
+        function GetTaskClassValue(obj) {
+            $("#HTaskClassID").val(obj[0].HItemID);
+            $("#HTaskClassName").val(obj[0].浠诲姟绫诲埆鍚嶇О);
+        }
     </script>
 </body>
 </html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskMoneyBill.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskMoneyBill.html"
index 53e14b7..8252cad 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskMoneyBill.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskMoneyBill.html"
@@ -117,7 +117,7 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀹㈡埛</label>
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀹㈡埛<label style="color:red"> * </label></label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" lay-verify="HCusName" name="HCusName" id="HCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" name="HCusID" id="HCusID" lay-verify="HCusID" value="0">
@@ -291,7 +291,7 @@
             //#region
 
             //鍏ㄥ眬鍙橀噺
-            window.OptionData = {};
+            window.OptionData = [];
             //璁板綍缁勭粐鐨勫��
             var HOrgIDBar = 0;
             //鑾峰彇鍙傛暟
@@ -405,7 +405,7 @@
                 //鏂板琛岃〃鏍兼暟鎹�
 
                 var NewRow = {
-                    "HProMoneyID": "", "HProMoneyName": "", "HQty": "0", "HPrice": "0", "HMoney": "0",
+                    "HProMoneyID": "0", "HProMoneyName": "", "HQty": "0", "HPrice": "0", "HMoney": "0",
                     "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
                 };
                 switch (obj.event) {
@@ -771,16 +771,22 @@
                                     }
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
-                                        "HProMoneyID": checkStatus.data[0].HItemID
-                                        , "HProMoneyName": checkStatus.data[0].椤圭洰璐圭敤鍚嶇О
+                                        "HProMoneyID": checkStatus.data[0].HItemID,
+                                        "HProMoneyName": checkStatus.data[0].椤圭洰璐圭敤鍚嶇О
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
+                                , btn2: function (index, layero) { }
                                 , end: function () {
-                                    obj.update({
-                                        "HProMoneyID": OptionData.HItemID
-                                        , "HProMoneyName": OptionData.椤圭洰璐圭敤鍚嶇О
-                                    })
+                                    if (OptionData.length == undefined && OptionData.length!=0) {
+                                        obj.update({
+                                            "HProMoneyID": OptionData.HItemID,
+                                            "HProMoneyName": OptionData.椤圭洰璐圭敤鍚嶇О
+                                        })
+                                        OptionData = [];
+                                    }
+                                    
+                                  
                                 }
                             })
                         }
@@ -942,7 +948,26 @@
                     layer.msg("鏃ユ湡涓嶈兘涓虹┖!");
                     return false;
                 }
-
+                if ($("#HWorkTaskName").val() == "") {
+                    layer.msg("浠诲姟鍚嶇О涓嶈兘涓虹┖!");
+                    return false;
+                }
+                if ($("#HWorkTaskNumber").val() == "") {
+                    layer.msg("浠诲姟浠g爜涓嶈兘涓虹┖!");
+                    return false;
+                }
+                if ($("#HProNumber").val() == "") {
+                    layer.msg("椤圭洰浠g爜涓嶈兘涓虹┖!");
+                    return false;
+                }
+                if ($("#HProName").val() == "") {
+                    layer.msg("椤圭洰鍚嶇О涓嶈兘涓虹┖!");
+                    return false;
+                }
+                if ($("#HCusName").val() == "") {
+                    layer.msg("瀹㈡埛涓嶈兘涓虹┖!");
+                    return false;
+                }
                 return true;
             }
             //#endregion
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskMoneyBillList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskMoneyBillList.html"
index c724222..9226f50 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskMoneyBillList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskMoneyBillList.html"
@@ -136,7 +136,7 @@
             var HModName = "PM_WorkTaskBillList";
 
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-            var titleData = ["HInterID", "HBillStatus", "HProjectID", "HWorkTaskID", "HCusID", "HOrgID","HEntryID"];
+            var titleData = ["HInterID", "HBillStatus", "HProjectID", "HWorkTaskID", "HCusID", "HOrgID", "HEntryID","HProMoneyID"];
             //#endregion
 
             //#region 銆愯繃婊ゆ柟妗堛��
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBeginBillMain.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBeginBillMain.html"
index e63437f..0595dc2 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBeginBillMain.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBeginBillMain.html"
@@ -110,7 +110,7 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀹㈡埛</label>
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀹㈡埛<label style="color:red"> * </label></label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" lay-verify="HCusName" name="HCusName" id="HCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" name="HCusID" id="HCusID" lay-verify="HCusID" value="0">
@@ -134,7 +134,7 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鍚堝悓鎬婚噾棰�</label>
+                                            <label class="layui-form-label" style="width: 85px;">鍚堝悓鎬婚噾棰�<label style="color:red"> * </label></label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <input type="text" class="layui-input" lay-verify="HSumMoney" name="HSumMoney" id="HSumMoney">
                                             </div>
@@ -149,13 +149,13 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">缁撶畻閲戦</label>
+                                            <label class="layui-form-label" style="width: 85px;">缁撶畻閲戦<label style="color:red"> * </label></label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <input type="text" class="layui-input" lay-verify="HMoney" name="HMoney" id="HMoney" value="0">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鍚堝悓棰勪及浜哄ぉ</label>
+                                            <label class="layui-form-label" style="width: 85px;">鍚堝悓棰勪及浜哄ぉ<label style="color:red"> * </label></label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <input type="text" class="layui-input" lay-verify="HConWorkDays" name="HConWorkDays" id="HConWorkDays" value="0" style="width:190px;">
                                             </div>
@@ -163,7 +163,7 @@
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜や粯鏂�</label>
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜や粯鏂�<label style="color:red"> * </label></label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" lay-verify="HPMTeamName" name="HPMTeamName" id="HPMTeamName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" name="HPMTeamID" id="HPMTeamID" lay-verify="HPMTeamID" value="0">
@@ -447,7 +447,7 @@
 
             //#region 閫夋嫨瀹㈡埛鎸夐挳
             form.on('submit(btnSearchHCusID)', function () {
-                get_checkSearchHSendEmp();
+                get_checkSearchHCus();
             });
             //#endregion
 
@@ -712,7 +712,34 @@
                 })
             }
             //#endregion
+            //#region 瀹㈡埛閫夋嫨椤甸潰
+            function get_checkSearchHCus() {
+                var HOrgID = $("#HOrgID").val();
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '瀹㈡埛琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html?openType=2&HOrgID=' + HOrgID, '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('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#HCusID").val(checkStatus.data[0].HItemID);//瀹㈡埛id
+                        $("#HCusName").val(checkStatus.data[0].瀹㈡埛鍚嶇О);//瀹㈡埛鍚嶇О
 
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                    , end: function () { }
+                })
+            }
+            //#endregion
             //#region 浜や粯鏂归�夋嫨椤甸潰
             function get_checkSearchHPMTeam() {
                 var HOrgID = $("#HOrgID").val();
@@ -882,7 +909,7 @@
                     layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
                     return false;
                 }
-                if ($("#HProID").val() == "0") {
+                if ($("#HProjecID").val() == "0") {
                     layer.msg("椤圭洰浠g爜娌℃湁閫夋嫨!");
                     return false;
                 }
@@ -890,7 +917,38 @@
                     layer.msg("鏃ユ湡涓嶈兘涓虹┖!");
                     return false;
                 }
-
+                if ($("#HManagerID").val() == "0") {
+                    layer.msg("绠$悊鍛樹笉鑳戒负绌�!");
+                    return false;
+                }
+                if ($("#HWorkEmpID").val() == "0") {
+                    layer.msg("瀹炴柦鎷呭綋涓嶈兘涓虹┖!");
+                    return false;
+                }
+                if ($("#HPMEmpID").val() == "0") {
+                    layer.msg("椤圭洰缁忕悊涓嶈兘涓虹┖!");
+                    return false;
+                }
+                if ($("#HPMTeamID").val() == "0") {
+                    layer.msg("浜や粯鏂逛笉鑳戒负绌�!");
+                    return false;
+                }
+                if ($("#HCusID").val() == "0") {
+                    layer.msg("瀹㈡埛涓嶈兘涓虹┖!");
+                    return false;
+                }
+                if ($("#HSumMoney").val() == "") {
+                    layer.msg("鍚堝悓鎬婚噾棰濅笉鑳戒负绌�!");
+                    return false;
+                }
+                if ($("#HMoney").val() == "") {
+                    layer.msg("缁撶畻閲戦涓嶈兘涓虹┖!");
+                    return false;
+                }
+                if ($("#HConWorkDays").val() == "") {
+                    layer.msg("鍚堝悓棰勪及浜哄ぉ涓嶈兘涓虹┖!");
+                    return false;
+                }
                 return true;
             }
             //#endregion
@@ -1061,7 +1119,11 @@
             $("#HPMTeamID").val(obj[0].HItemID);//浜や粯鏂筰d
             $("#HPMTeamName").val(obj[0].渚涘簲鍟嗗悕绉�);//渚涘簲鍟嗗悕绉�
         }
-
+        //瀹㈡埛
+        function GetHCusNameValue(obj) {
+            $("#HCusID").val(obj[0].HItemID);//浜や粯鏂筰d
+            $("#HCusName").val(obj[0].瀹㈡埛鍚嶇О);//渚涘簲鍟嗗悕绉�
+        }
 
     </script>
 </body>
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
index f88679a..480e2ee 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
@@ -1311,7 +1311,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '椤圭洰绫诲埆琛�'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ProjectClass.html', 'yes']
+                    , content: ['../../椤圭洰绠$悊/鍩虹寤烘ā/Gy_ProjectClass.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectEndBillMain.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectEndBillMain.html"
index 1ed224b..61646be 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectEndBillMain.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectEndBillMain.html"
@@ -110,7 +110,7 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀹㈡埛</label>
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀹㈡埛<label style="color:red"> * </label></label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" lay-verify="HCusName" name="HCusName" id="HCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" name="HCusID" id="HCusID" lay-verify="HCusID" value="0">
@@ -177,7 +177,7 @@
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜や粯鏂�</label>
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜や粯鏂�<label style="color:red"> * </label></label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" lay-verify="HPMTeamName" name="HPMTeamName" id="HPMTeamName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" name="HPMTeamID" id="HPMTeamID" lay-verify="HPMTeamID" value="0">
@@ -187,7 +187,7 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">椤圭洰缁忕悊</label>
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">椤圭洰缁忕悊<label style="color:red"> * </label></label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" lay-verify="HPMEmpName" name="HPMEmpName" id="HPMEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" name="HPMEmpID" id="HPMEmpID" lay-verify="HPMEmpID" value="0">
@@ -197,7 +197,7 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀹炴柦鎷呭綋</label>
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀹炴柦鎷呭綋<label style="color:red"> * </label></label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" lay-verify="HWorkEmpName" name="HWorkEmpName" id="HWorkEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" name="HWorkEmpID" id="HWorkEmpID" lay-verify="HWorkEmpID" value="0">
@@ -458,7 +458,7 @@
 
             //#region 閫夋嫨瀹㈡埛鎸夐挳
             form.on('submit(btnSearchHCusID)', function () {
-                get_checkSearchHSendEmp();
+                get_checkSearchHCus();
             });
             //#endregion
 
@@ -695,7 +695,34 @@
                 })
             }
             //#endregion
+            //#region 瀹㈡埛閫夋嫨椤甸潰
+            function get_checkSearchHCus() {
+                var HOrgID = $("#HOrgID").val();
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '瀹㈡埛琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html?openType=2&HOrgID=' + HOrgID, '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('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#HCusID").val(checkStatus.data[0].HItemID);//瀹㈡埛id
+                        $("#HCusName").val(checkStatus.data[0].瀹㈡埛鍚嶇О);//瀹㈡埛鍚嶇О
 
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                    , end: function () { }
+                })
+            }
+            //#endregion
             //#region 绠$悊鍛橀�夋嫨椤甸潰
             function get_checkSearchHManager() {
                 var HOrgID = $("#HOrgID").val();
@@ -910,12 +937,32 @@
                     layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
                     return false;
                 }
-                if ($("#HProID").val() == "0") {
+                if ($("#HProjecID").val() == "0") {
                     layer.msg("椤圭洰浠g爜娌℃湁閫夋嫨!");
                     return false;
                 }
                 if ($("#HDate").val() == "") {
                     layer.msg("鏃ユ湡涓嶈兘涓虹┖!");
+                    return false;
+                }
+                if ($("#HManagerID").val() == "0") {
+                    layer.msg("绠$悊鍛樹笉鑳戒负绌�!");
+                    return false;
+                }
+                if ($("#HWorkEmpID").val() == "0") {
+                    layer.msg("瀹炴柦鎷呭綋涓嶈兘涓虹┖!");
+                    return false;
+                }
+                if ($("#HPMEmpID").val() == "0") {
+                    layer.msg("椤圭洰缁忕悊涓嶈兘涓虹┖!");
+                    return false;
+                }
+                if ($("#HPMTeamID").val() == "0") {
+                    layer.msg("浜や粯鏂逛笉鑳戒负绌�!");
+                    return false;
+                }
+                if ($("#HCusID").val() == "0") {
+                    layer.msg("瀹㈡埛涓嶈兘涓虹┖!");
                     return false;
                 }
 
@@ -1096,6 +1143,12 @@
             $("#HTestEmp").val(obj[0].HItemID);//娴嬭瘯浜哄憳id
             $("#HTestEmpName").val(obj[0].鑱屽憳鍚嶇О);//娴嬭瘯浜哄憳鍚嶇О
         }
+        //瀹㈡埛
+        function GetHCusNameValue(obj) {
+            $("#HCusID").val(obj[0].HItemID);//浜や粯鏂筰d
+            $("#HCusName").val(obj[0].瀹㈡埛鍚嶇О);//渚涘簲鍟嗗悕绉�
+        }
+
     </script>
 </body>
 </html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectMoneyBillMain.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectMoneyBillMain.html"
index 32e380d..b14bd45 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectMoneyBillMain.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectMoneyBillMain.html"
@@ -108,7 +108,7 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀹㈡埛</label>
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀹㈡埛<label style="color:red"> * </label></label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" lay-verify="HCusName" name="HCusName" id="HCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" name="HCusID" id="HCusID" lay-verify="HCusID" value="0">
@@ -121,7 +121,7 @@
 
                                     <div class="layui-row">
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜や粯鏂�</label>
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜や粯鏂�<label style="color:red"> * </label></label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" lay-verify="HPMTeamName" name="HPMTeamName" id="HPMTeamName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" name="HPMTeamID" id="HPMTeamID" lay-verify="HPMTeamID" value="0">
@@ -409,7 +409,7 @@
 
             //#region 閫夋嫨瀹㈡埛鎸夐挳
             form.on('submit(btnSearchHCusID)', function () {
-                get_checkSearchHSendEmp();
+                get_checkSearchHCus();
             });
             //#endregion
 
@@ -454,7 +454,7 @@
                 //鏂板琛岃〃鏍兼暟鎹�
                  
                 var NewRow = {
-                    "HProMoneyID": "", "HProMoneyName": "", "HQty": "0", "HPrice": "0", "HMoney": "0", 
+                    "HProMoneyID": "0", "HProMoneyName": "", "HQty": "0", "HPrice": "0", "HMoney": "0", 
                     "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
                 };
                 switch (obj.event) {
@@ -771,7 +771,34 @@
                 })
             }
             //#endregion
+            //#region 瀹㈡埛閫夋嫨椤甸潰
+            function get_checkSearchHCus() {
+                var HOrgID = $("#HOrgID").val();
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '瀹㈡埛琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html?openType=2&HOrgID=' + HOrgID, '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('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#HCusID").val(checkStatus.data[0].HItemID);//瀹㈡埛id
+                        $("#HCusName").val(checkStatus.data[0].瀹㈡埛鍚嶇О);//瀹㈡埛鍚嶇О
 
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                    , end: function () { }
+                })
+            }
+            //#endregion
             //#region 绠$悊鍛橀�夋嫨椤甸潰
             function get_checkSearchHManager() {
                 var HOrgID = $("#HOrgID").val();
@@ -867,10 +894,14 @@
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
                                 , end: function () {
-                                    obj.update({
-                                        "HProMoneyID": optiondata.HItemID
-                                        , "HProMoneyName": optiondata.椤圭洰璐圭敤鍚嶇О
-                                    })
+                                    if (optiondata.length == undefined) {
+                                        obj.update({
+                                            "HProMoneyID": optiondata.HItemID
+                                            , "HProMoneyName": optiondata.椤圭洰璐圭敤鍚嶇О
+                                        })
+                                        optiondata = [];
+                                    }
+                                    
                                 }
                             })
                         }
@@ -1026,7 +1057,7 @@
                     layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
                     return false;
                 }
-                if ($("#HProID").val() == "0") {
+                if ($("#HProjecID").val() == "0") {
                     layer.msg("椤圭洰浠g爜娌℃湁閫夋嫨!");
                     return false;
                 }
@@ -1034,7 +1065,26 @@
                     layer.msg("鏃ユ湡涓嶈兘涓虹┖!");
                     return false;
                 }
-
+                if($("#HManagerID").val() == "0") {
+                    layer.msg("绠$悊鍛樹笉鑳戒负绌�!");
+                    return false;
+                }
+                if ($("#HWorkEmpID").val() == "0") {
+                    layer.msg("瀹炴柦鎷呭綋涓嶈兘涓虹┖!");
+                    return false;
+                }
+                if ($("#HPMEmpID").val() == "0") {
+                    layer.msg("椤圭洰缁忕悊涓嶈兘涓虹┖!");
+                    return false;
+                }
+                if ($("#HPMTeamID").val() == "0") {
+                    layer.msg("浜や粯鏂逛笉鑳戒负绌�!");
+                    return false;
+                }
+                if ($("#HCusID").val() == "0") {
+                    layer.msg("瀹㈡埛涓嶈兘涓虹┖!");
+                    return false;
+                }
                 return true;
             }
             //#endregion
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillEdit.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillEdit.html"
index 129a4d3..e97faf3 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillEdit.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillEdit.html"
@@ -297,7 +297,7 @@
             var shijian = year + "-" + month + "-" + day;
             var allVal;
             //鍙屽嚮杩斿洖鍏ㄥ眬鍙橀噺
-            window.OptionData = {};
+            window.OptionData = [];
             //#endregion
 
 
@@ -481,6 +481,8 @@
                 }
             });
 
+
+
             //#endregion
 
 
@@ -548,6 +550,109 @@
                 option.data = rowdata;
                 table.render(option);
             }
+
+            //#region 鐩戝惉鍗曞厓鏍肩紪杈�  鍗曞厓鏍肩紪杈戝悗 鍙樻洿
+            table.on('edit(mainTable)', function (obj) {
+                //鏁板�兼牸寮忔牎楠屽伐鍏�
+                var ref = /^\d+(\.\d+)?$/;          //闈炶礋鏁版鍒欒〃杈惧紡
+                var temp = "";
+
+                // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+                var oldText = $(this).prev().text();
+                var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+                    , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+                    , field = obj.field; //寰楀埌瀛楁
+
+                switch (field) {
+                    case "HQty":                                         //鏁伴噺
+                        //鏁版嵁鏍煎紡鏍¢獙
+                        temp = value + "";
+                        if (!ref.test(temp) || temp == 0) {
+                            //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                            obj.update({
+                                HQty: oldText
+                            });
+                            table.render(option);
+
+                            layer.msg("鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+                            return;
+                        }
+
+
+                        //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                        var HQty = value * 1;                           //鏁伴噺
+                        var HPrice = obj.data.HPrice * 1;               //鍗曚环
+                        var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
+
+
+
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HQty: HQty
+                            , HPrice: HPrice
+                            , HMoney: HMoney
+                        });
+                        /* table.render(option);*/
+                        break;
+                    case "HPrice":                                         //鍗曚环
+                        //鏁版嵁鏍煎紡鏍¢獙
+                        temp = value + "";
+                        if (!ref.test(temp) || temp == 0) {
+                            //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                            obj.update({
+                                HPrice: oldText
+                            });
+                            /* table.render(option);*/
+
+                            layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+                            return;
+                        }
+
+                        //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                        var HQty = obj.data.HQty * 1;                   //鏁伴噺
+                        var HPrice = value * 1;
+                        var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
+
+
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HQty: HQty
+                            , HPrice: HPrice
+                            , HMoney: HMoney
+                        });
+                        break;
+                    case "HMoney":                                         //閲戦
+                        //鏁版嵁鏍煎紡鏍¢獙
+                        temp = value + "";
+                        if (!ref.test(temp) || temp == 0) {
+                            //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                            obj.update({
+                                HMoney: oldText
+                            });
+                            /* table.render(option);*/
+
+                            layer.msg("閲戦璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+                            return;
+                        }
+
+                        //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                        var HQty = obj.data.HQty * 1;                   //鏁伴噺
+                        var HMoney = value * 1;
+                        var HPrice = (HMoney / HQty).toFixed(2);       //鍗曚环=閲戦/鏁伴噺
+
+
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HQty: HQty
+                            , HPrice: HPrice
+                            , HMoney: HMoney
+                        });
+                        break;
+                        table.render(option);
+                    default:
+                }
+            });
+            //#endregion
 
             //#region 鍔犺浇琛ㄥご
             function RoadBillMain(linterid) {
@@ -753,14 +858,18 @@
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
                                 , end: function () {
-                                    obj.update({
-                                        "HMaterID": OptionData.HItemID
-                                        , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
-                                        , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
-                                        , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
-                                        , "HUnitID": OptionData.HUnitID
-                                        , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
-                                    })
+                                    if (OptionData != null && OptionData.length == undefined) {
+                                        obj.update({
+                                            "HMaterID": OptionData.HItemID
+                                            , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
+                                            , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+                                            , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+                                            , "HUnitID": OptionData.HUnitID
+                                            , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
+                                        })
+                                        OptionData = [];
+                                    }
+                                   
                                    
                                 }
                             })
@@ -871,13 +980,14 @@
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
                                 , end: function () {
-                                    //if (OptionData.length > 0) {
-                                    //    OptionData = [];
-                                    //}
-                                    obj.update({
-                                        "HWHID": OptionData.HItemID
-                                        , "璋冨叆浠撳簱": OptionData.浠撳簱鍚嶇О
-                                    })
+                                    if (OptionData != null && OptionData.length == undefined) {
+                                        obj.update({
+                                            "HWHID": OptionData.HItemID
+                                            , "璋冨叆浠撳簱": OptionData.浠撳簱鍚嶇О
+                                        })
+                                        OptionData = [];
+                                    }
+                                    
                                    
                                 }
                             })
@@ -910,13 +1020,14 @@
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
                                 , end: function () {
-                                    //if (OptionData.length > 0) {
-                                    //    OptionData = [];
-                                    //}
-                                    obj.update({
-                                        "HSCWHID": OptionData.HItemID
-                                        , "璋冨嚭浠撳簱": OptionData.浠撳簱鍚嶇О
-                                    })
+                                    if (OptionData != null && OptionData.length == undefined) {
+                                        obj.update({
+                                            "HSCWHID": OptionData.HItemID
+                                            , "璋冨嚭浠撳簱": OptionData.浠撳簱鍚嶇О
+                                        })
+                                        OptionData = [];
+                                    }
+                                   
 
                                 
                             }
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillList.html"
index 27e9f24..3375758 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillList.html"
@@ -12,6 +12,7 @@
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <script src="../../../layuiadmin/HideButton.js"></script>
     <script src="../../../layuiadmin/soulTable.slim.js"></script>
 
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
index 0d5194f..9ce0ff4 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
@@ -517,6 +517,9 @@
             //鍒濆鍖栧瓙琛�
             set_InitGrid();
 
+            //鍔ㄦ�佽幏鍙栨簮鍗�
+            HBillType();
+
             //#region 鍒ゆ柇鎿嶄綔绫诲瀷骞跺垵濮嬪寲鐣岄潰
             if (OperationType == 1) {                                                   //鏃犳簮鍗曟柊澧�
                /* $("#HItemID").val(0);*/
@@ -558,9 +561,6 @@
 
             //鍒濆鍖栫粍缁�
             Organ();
-
-            //鍔ㄦ�佽幏鍙栨簮鍗�
-            HBillType();
 
             //#region 椤甸潰鍒濆鍖栧悗锛屾牴鎹鎴疯幏鍙栧鎴蜂綑棰�
             getCustomerBalance($("#HSupID").val());
@@ -992,7 +992,7 @@
                         //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
                         var HQty = obj.data.HQty * 1;                   //鏁伴噺
                         var HPrice = obj.data.HPrice * 1;               //鍗曚环
-                        var HTaxRate = value * 0.01;                       //绋庣巼
+                        var HTaxRate = value * 0.01  ;                       //绋庣巼
                         /*var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�*/
                         var HTaxPrice = HPrice * (1 + HTaxRate);        //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
                         /*var HRelTaxPrice = HTaxPrice * HDiscountRate;   //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
@@ -1034,7 +1034,7 @@
                         }
                         //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
                         var HQty = obj.data.HQty * 1;                   //鏁伴噺
-                        var HTaxRate = obj.data.HTaxRate * 0.01;        //绋庣巼
+                        var HTaxRate = (obj.data.HTaxRate !== undefined ? value * 0.01 : 0 ) * 0.01;        //绋庣巼
                         var HTaxPrice = value * 1;                          //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
                         var HPrice = HTaxPrice / (1 + HTaxRate);        //鍗曚环=鍚◣鍗曟嵁/(1+绋庣巼)
 
@@ -1817,7 +1817,7 @@
                             });
 
                             HOrgIDBar = data.HSTOCKORGID == null ? 0 : data.HSTOCKORGID;
-
+                            $("#BillType").val(data.HMainSourceBillType);
                             //瀛愯〃  璧嬪��
                             var rowdata = [];
                             for (let i = 0; i < result.data.length; i++) {
@@ -2119,6 +2119,11 @@
 
                 //#region 瀛愯〃 鏁版嵁妫�楠�
                 for (var i = 0; i < option.data.length; i++) {
+
+                    if (typeof option.data[i] !== 'object' || option.data[i] === null || Array.isArray(option.data[i])) {
+                        continue; // 璺宠繃闈炲璞¢」锛堝绌烘暟缁勶級  
+                    }
+
                     if (option.data[i]["HMaterID"] == "0") {
                         layer.msg("绗�" + (i+1) + "琛岋細鐗╂枡鏈�夋嫨锛�");
                         return false;
@@ -2327,10 +2332,13 @@
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
                                 , end: function () {
-                                    obj.update({
-                                        "HWHID": OptionData.HItemID
-                                        , "鍙戣揣浠撳簱": OptionData.浠撳簱鍚嶇О
-                                    })
+                                    if (typeof (HDataTemp.HItemID) != "undefined") {
+                                        obj.update({
+                                            "HWHID": HDataTemp.HItemID
+                                            , "鍙戣揣浠撳簱": HDataTemp.浠撳簱鍚嶇О
+                                        })
+                                        HDataTemp = {};
+                                    }
                                 }
                             })
                         }
@@ -2721,8 +2729,8 @@
                             , "HTaxRate": dataArray[i].绋庣巼
                             , "HMoney": dealDoubleToFixed(dataArray[i].閲戦, 2)
                             , "HTaxMoney": dealDoubleToFixed(dataArray[i].浠风◣鍚堣, 2)
-                            , "HWHID": $("#HWHID").val()
-                            , "鍙戣揣浠撳簱": $("#HWHName").val()
+                            , "HWHID": dataArray[i].HWhID
+                            , "鍙戣揣浠撳簱": dataArray[i].瀛愪粨搴�
                             , "HRemark": ""
 
                             , "HQty_Full": "0"
@@ -2845,8 +2853,8 @@
                             , "HTaxRate": dataArray[i].绋庣巼
                             , "HMoney": dealDoubleToFixed(dataArray[i].閲戦, 2)
                             , "HTaxMoney": "0"
-                            , "HWHID": $("#HWHID").val()
-                            , "鍙戣揣浠撳簱": $("#HWHName").val()
+                            , "HWHID": dataArray[i].HWHID
+                            , "鍙戣揣浠撳簱": dataArray[i].鍙戣揣浠撳簱
                             , "HRemark": ""
 
                             , "HQty_Full": "0"
@@ -3183,17 +3191,17 @@
             layui.table.render(option);
         }
 
-        function GetMaterValue(obj)           //鐗╂枡鍚嶇О
+        function GetGyMaterial(obj)           //鐗╂枡鍚嶇О
         {
-            HDataTemp = obj[0];
+            HDataTemp = obj;
         }
 
         function GetUnitValue(obj)           //璁¢噺鍗曚綅
         {
             HDataTemp = obj[0];
         }
-
-        function GetHSubWHValue(obj)  //瀛愯〃鍙戣揣浠撳簱
+        
+        function GetHWHSubValue(obj)  //瀛愯〃鍙戣揣浠撳簱
         {
             HDataTemp = obj[0];
         }
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
index 506de7f..f0bd441 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
@@ -405,7 +405,7 @@
                         , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 200, sort: true }
                         , { field: '浠舵暟', title: '浠舵暟', totalRow: true, width: 200, sort: true }
                         , { field: '鏁伴噺', title: '鏁伴噺', totalRow: true, width: 200, sort: true }
-                        //, { field: '宸插叧鑱旀暟閲�', title: '宸插叧鑱旀暟閲�', totalRow: true, width: 200, sort: true }
+                        , { field: '宸插叧鑱旀暟閲�', title: '宸插叧鑱旀暟閲�', totalRow: true, width: 200, sort: true }
                         , { field: '鍗曚环', title: '鍗曚环', width: 200, sort: true, totalRow: true}
                         , { field: '绋庣巼', title: '绋庣巼', width: 200, sort: true, totalRow: true }
                         , { field: '鍚◣鍗曚环', title: '鍚◣鍗曚环', width: 200, sort: true, totalRow: true }
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
index e8dd74f..f57a262 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
@@ -880,7 +880,7 @@
                                 , "HSupName": data.渚涘簲鍟�
                                 , "HEmpID": data.HEmpID
                                 , "HEmpName": data.涓氬姟鍛�
-                                , "HWHID": data.HWHID
+                                , "HWHID": data.涓昏〃浠撳簱ID
                                 , "HWHName": data.涓昏〃浠撳簱
                                 , "HSecManagerID": data.HSecManagerID
                                 , "HSecManagerName": data.楠屾敹鍛�
@@ -1839,10 +1839,9 @@
                             for (var i = 0; i < checkStatus.data.length; i++) {
                                 option.data.push({
                                     "HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠g爜": checkStatus.data[j].鐗╂枡浠g爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
-                                    "HUnitID": checkStatus.data[j].HUnitID, "璁¢噺鍗曚綅": checkStatus.data[j].璁¢噺鍗曚綅,"HWHID": checkStatus.data[j].HWHID, "鏀舵枡浠撳簱": checkStatus.data[j].鏀舵枡浠撳簱,
-                                    "HSPID": checkStatus.data[j].HSPID, "浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О,
-                                    "HQty": checkStatus.data[j].鏁伴噺-checkStatus.data[j].鍏宠仈鏁伴噺, "HPrice": checkStatus.data[j].鍗曚环,
-                                    "HMoney": checkStatus.data[j].閲戦,
+                                    "HUnitID": checkStatus.data[j].HUnitID, "璁¢噺鍗曚綅": checkStatus.data[j].璁¢噺鍗曚綅, "HWHID": checkStatus.data[j].HWHIDSub, "鏀舵枡浠撳簱": checkStatus.data[j].浠撳簱鍚嶇О,
+                                    "HSPID": checkStatus.data[j].HSPID, "浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О, "HQtyMust": checkStatus.data[j].鏁伴噺,
+                                    "HQty": checkStatus.data[j].鏁伴噺-checkStatus.data[j].鍏宠仈鏁伴噺, "HPrice": checkStatus.data[j].鍗曚环,"HMoney": checkStatus.data[j].閲戦,
                                     "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
                                     "HTaxRate": checkStatus.data[j].绋庣巼, "HTaxPrice": checkStatus.data[j].鍚◣鍗曚环, "HlineTotal": checkStatus.data[j].浠风◣鍚堣
                                 })
@@ -2028,6 +2027,10 @@
 
             //#region 淇濆瓨鏂规硶鏍¢獙
             function AllowLoadData(data) {
+
+                var ref = /^\d+(\.\d+)?$/;          //闈炶礋鏁版鍒欒〃杈惧紡
+                var temp = "";
+
                 if ($("#HWHID").val() == 0) {
                     layer.msg("璇烽�夋嫨浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
@@ -2064,6 +2067,76 @@
                     layer.msg("璇烽�夋嫨缁撶畻鏂瑰紡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
                 }
+                //#region 瀛愯〃 鏁版嵁妫�楠�
+                for (var i = 0; i < option.data.length; i++) {
+
+                    if (typeof option.data[i] !== 'object' || option.data[i] === null || Array.isArray(option.data[i])) {
+                        continue; // 璺宠繃闈炲璞¢」锛堝绌烘暟缁勶級  
+                    }
+
+                    if (option.data[i]["HMaterID"] == "0") {
+                        layer.msg("绗�" + (i + 1) + "琛岋細鐗╂枡鏈�夋嫨锛�");
+                        return false;
+                    }
+
+                    if (option.data[i]["HUnitID"] == "0") {
+                        layer.msg("绗�" + (i + 1) + "琛岋細璁¢噺鍗曚綅鏈�夋嫨锛�");
+                        return false;
+                    }
+
+                    //瀹炲彂鏁伴噺鏍煎紡鏍¢獙
+                    temp = option.data[i]["HQty"] + "";
+                    if (temp == "0") {
+                        layer.msg("绗�" + (i + 1) + "琛岋細鏁伴噺涓嶈兘涓�0锛�");
+                        return false;
+                    } else if (!ref.test(temp)) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+                        return false;
+                    }
+
+                    //鍗曚环鏍煎紡鏍¢獙
+                    temp = option.data[i]["HPrice"] + "";
+                    if (temp == "0") {
+                        layer.msg("绗�" + (i + 1) + "琛岋細鍗曚环涓嶈兘涓�0锛�");
+                        return false;
+                    } else if (!ref.test(temp)) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+                        return false;
+                    }
+
+                    //鍚◣鍗曚环鏍煎紡鏍¢獙
+                    temp = option.data[i]["HTaxPrice"] + "";
+                    if (temp == "0") {
+                        layer.msg("绗�" + (i + 1) + "琛岋細鍚◣鍗曚环涓嶈兘涓�0锛�");
+                        return false;
+                    } else if (!ref.test(temp)) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細鍚◣鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+                        return false;
+                    }
+
+                    //绋庣巼鏍煎紡鏍¢獙
+                    temp = option.data[i]["HTaxRate"] + "";
+                    if (!ref.test(temp)) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細绋庣巼璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛楋紒");
+                        return false;
+                    }
+
+                    //閲戦鏍煎紡鏍¢獙
+                    temp = option.data[i]["HMoney"] + "";
+                    if (temp == "0") {
+                        layer.msg("绗�" + (i + 1) + "琛岋細閲戦涓嶈兘涓�0锛�");
+                        return false;
+                    } else if (!ref.test(temp)) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細閲戦璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+                        return false;
+                    }
+                    //鏀舵枡浠撳簱闈炵┖楠岃瘉
+                    if (option.data[i]["HWHID"] == "0") {
+                        layer.msg("绗�" + (i + 1) + "琛岋細鏀舵枡浠撳簱鏈�夋嫨锛�");
+                        return false;
+                    }
+                }
+                //#endregion
                 return true;
             }
 
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill_Add_Up.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill_Add_Up.html"
index 7b83378..a286279 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill_Add_Up.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill_Add_Up.html"
@@ -289,7 +289,6 @@
                                 </div>
                             </div>
                         </div>
-                    </div>
 
                     <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                     <script type="text/html" id="toolbarDemo">

--
Gitblit v1.9.1