From 7dc4ef66e9c88419287d0306be6504295ab1c88c Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 06 六月 2024 15:26:21 +0800
Subject: [PATCH] 1

---
 WebTM/App_Data/MssqlReportData.cs                             |    3 
 WebTM/views/质量管理/工作联系单/OA_WorkLinkBillList.html               | 1119 ++++++++++++
 WebTM/views/质量管理/工作联系单/OA_Add_Edit_WorkLinkBill.html          |  982 +++++++++++
 WebTM/views/领料发货/销售出库/Kf_SellOutBill.html                     |   58 
 WebTM/views/模治具管理/上模单/Sc_MouldUpperBillEdit_PDA.html          |   42 
 WebTM/views/领料发货/分步式调出单/Fb_StepFoldOutBillEdit.html           |   59 
 WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html        |  158 
 WebTM/views/生产管理/作业指导书/Gy_SOPBill_Video.html                  |    8 
 WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainBillList.html     |   14 
 WebTM/views/设备管理/Sb_EquipRepairCheckBill_PDA.html             |  117 
 WebTM/views/验收入库/外购入库/Kf_POStockInBackBill_Add_Up.html        |   58 
 WebTM/views/项目管理/工程项目/PM_ProjectMoneyBOMBillList.html         |    4 
 WebTM/views/模治具管理/器具维修派工单/Sc_MouldRepairSendWorkBillEdit.html |   45 
 WebTM/views/设备管理/Sb_EquipConkBookBill_PDA.html                |   58 
 WebTM/views/仓存管理/仓库调拨/Add_Edit_Kf_MoveStockBill.html          |   60 
 WebTM/views/设备管理/设备开机单/Sb_EquipBeginBill_PDA.html             |  127 
 WebTM/views/生产管理/报工台工序/开工/Sc_SwipeCardStart.html              |    2 
 WebTM/views/质量管理/工作联系单/OA_Reply_WorkLinkBill.html             | 1190 +++++++++++++
 WebTM/views/设备管理/Sb_EqpMaintenanceBill_PDA.html               |   58 
 WebTM/views/设备管理/Sb_EquipMaintainBillList_Mul.html            |    7 
 WebTM/views/设备管理/设备规程单/Sb_EquipMaintainRuleList_PDA.html      |    2 
 WebTM/views/仓存管理/分步式调入单/Fb_StepFoldinBillEdit.html            |   58 
 WebTM/views/销售管理/销售退货单/Add_Edit_Kf_ICStockBillMainList.html   |   59 
 WebTM/views/设备管理/Sb_EquipMaintainBillEdit.html                |   14 
 WebTM/WebTM.csproj.user                                       |    7 
 WebTM/views/领料发货/领料出库/Kf_MateOutBillLEdit.html                |   57 
 WebTM/views/设备管理/设备停机单/Sb_EquipStopBill_PDA.html              |  124 
 WebTM/views/模治具管理/上模单/Sc_MouldLowerBillEdit_PDA.html          |  101 
 WebTM/views/设备管理/Sb_EquipDotCheckBill_PDA.html                |   97 
 WebTM/layuiadmin/PlateBinding.js                              |    4 
 WebTM/views/仓存管理/条码报表/Kf_StockInOutSumQueryReport.html        |   84 
 WebTM/views/项目管理/工作任务/PM_WorkTaskMoneyBOMBillList.html        |    4 
 WebTM/views/验收入库/其他入库/Add_Edit_Kf_OtherInBill.html            |   59 
 WebTM/views/验收入库/产品入库/Kf_ProductInBillEdit.html               |   58 
 WebTM/views/设备管理/Sb_EquipMaintainBill_PDA.html                |  110 
 WebTM/views/PlateBinding.html                                 |    3 
 WebTM/layuiadmin/Scripts/webConfig.js                         |    8 
 WebTM/views/领料发货/其他出库/Add_Edit_Kf_OtherOutBill.html           |   60 
 WebTM/views/仓存管理/条码报表/KF_ICinventoryQueryReport.html          |   32 
 WebTM/views/领料发货/领料出库/Kf_MateOutBackBillEdit.html             |   59 
 WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html      |   57 
 WebTM/WebTM.csproj                                            |    3 
 WebTM/views/生产管理/生产退库单/Sc_ProductionReturnEdit.html           |   58 
 43 files changed, 4,645 insertions(+), 642 deletions(-)

diff --git a/WebTM/App_Data/MssqlReportData.cs b/WebTM/App_Data/MssqlReportData.cs
index 71758f7..98c3496 100644
--- a/WebTM/App_Data/MssqlReportData.cs
+++ b/WebTM/App_Data/MssqlReportData.cs
@@ -18,7 +18,8 @@
     //public const string SqlConnStr = "Data Source=10.0.2.9;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
     //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
     //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//ch娴嬭瘯
-    public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL娴嬭瘯
+    //public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL娴嬭瘯
+    public const string SqlConnStr = "Data Source=10.11.18.195;Initial Catalog=HX_LMESsys_test;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";  //鏂帿灏�
     //public const string SqlConnStr = "Data Source=192.168.0.245;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//甯呭▉
     //public const string SqlConnStr = "Data Source=192.168.1.250;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涔斾竴
     //public const string SqlConnStr = "Data Source=192.168.1.251;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涔斾竴娴嬭瘯
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 880d7e4..5ef96fe 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -364,6 +364,9 @@
     <Content Include="views\璁惧绠$悊\璁惧鍋滄満鍗昞Sb_EquipStopBill_PDA.html" />
     <Content Include="views\璁惧绠$悊\璁惧寮�鏈哄崟\Sb_EquipBeginBillList_PDA.html" />
     <Content Include="views\璁惧绠$悊\璁惧寮�鏈哄崟\Sb_EquipBeginBill_PDA.html" />
+    <Content Include="views\璐ㄩ噺绠$悊\宸ヤ綔鑱旂郴鍗昞OA_Add_Edit_WorkLinkBill.html" />
+    <Content Include="views\璐ㄩ噺绠$悊\宸ヤ綔鑱旂郴鍗昞OA_WorkLinkBillList.html" />
+    <Content Include="views\璐ㄩ噺绠$悊\宸ヤ綔鑱旂郴鍗昞OA_Reply_WorkLinkBill.html" />
     <Content Include="views\璐ㄩ噺绠$悊\宸℃璁板綍鍗昞QC_Add_Edit_PatrolProcCheckOtherill.html" />
     <Content Include="views\璐ㄩ噺绠$悊\宸℃璁板綍鍗昞QC_PatrolProcCheckOtherBillList.html" />
     <Content Include="views\璐ㄩ噺绠$悊\搴撳瓨妫�楠屽崟\QC_Add_Edit_StockCheckBill.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index abfa447..147597a 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <NameOfLastUsedPublishProfile>D:\GIT浠撳簱\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
     <ProjectView>ProjectFiles</ProjectView>
     <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
@@ -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>
diff --git a/WebTM/layuiadmin/PlateBinding.js b/WebTM/layuiadmin/PlateBinding.js
index a78f6c2..cbce0d9 100644
--- a/WebTM/layuiadmin/PlateBinding.js
+++ b/WebTM/layuiadmin/PlateBinding.js
@@ -1,12 +1,12 @@
 锘�//鑾峰彇骞虫澘缁戝畾鏂囦欢鏁版嵁
 function get_ConfigFileInfo(linterid) {
     var obj = {};
-
+    var HPath = "C:\\MESConfiguration\\PlateBinding.txt";
     $.ajax({
         url: GetWEBURL() + "Get/Xt_PlateBinding",
         type: "GET",
         async: false,
-        data: { "user": sessionStorage["HUserName"] },
+        data: { "user": sessionStorage["HUserName"], "HPath": HPath},
         success: function (result) {
             if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                 //鍏敤閮ㄥ垎 ======Begin========
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 8cc42fe..c36c116 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,13 +3,13 @@
     //var WEBURL = "http://192.168.16.80:8011/";          //鍔炲叕瀹ゆ湇鍔″櫒
     //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch鏈湴*/
     //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
- /*   var WEBURL = "http://localhost/API/";             //棰滄檽鍐涙湰鍦伴厤缃�*/
+    /*var WEBURL = "http://localhost/API/";   */          //棰滄檽鍐涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄤ箰鏈湴閰嶇疆
     //var WEBURL = "http://localhost:8082/API/";    //鏉滆春鏈湴閰嶇疆
-   var WEBURL = "http://localhost:81/API/";    //鐜嬪浆鏈湴閰嶇疆
+    //var WEBURL = "http://localhost:81/API/";    //鐜嬪浆鏈湴閰嶇疆
     /*var WEBURL = "http://localhost:8083/API/";  //闄堥洴闈欐湰鍦伴厤缃�*/
-    //var WEBURL = "http://localhost:81/API/"    //缈佹稕娑涙湰鍦伴厤缃�
-    var WEBURL = "http://localhost:8082/API/";    //寮犵憺骞挎湰鍦伴厤缃�
+    var WEBURL = "http://localhost:81/API/"    //缈佹稕娑涙湰鍦伴厤缃�
+    /*var WEBURL = "http://localhost:8082/API/"; */   //寮犵憺骞挎湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //浣欐�濇澃鏈湴閰嶇疆
     //var WEBURL = "http://localhost:8088/ARAPI/";    //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
     //var WEBURL = "http://10.1.4.155/API/";   //姹熶赴瀹㈡埛NEW
diff --git a/WebTM/views/PlateBinding.html b/WebTM/views/PlateBinding.html
index a0a95b2..3be0c0a 100644
--- a/WebTM/views/PlateBinding.html
+++ b/WebTM/views/PlateBinding.html
@@ -207,8 +207,9 @@
             //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
             //淇濆瓨
             form.on('submit(Saver)', function (data) {//淇濆瓨
+                var HPath = "C:\\MESConfiguration\\PlateBinding.txt";
 
-                var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
+                var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"] + ";" + HPath;
                 if (AllowLoadData()) {
                     $.ajax(
                         {
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 e8a956b..6e5ab28 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"
@@ -316,7 +316,8 @@
                         <div class="layui-btn-container">
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
-                           
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Inventory" id="get_Inventory"><i class="layui-icon layui-icon-form"></i>搴撳瓨鏌ヨ</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="get_InOutSum" id="get_InOutSum"><i class="layui-icon layui-icon-form"></i>鍑哄叆搴撹褰曟煡璇�</button>
                         </div>
                     </script>
                     <script type="text/html" id="xuhao">
@@ -453,6 +454,13 @@
                     "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
                 };
                 switch (obj.event) {
+                    //搴撳瓨鏌ヨ
+                    case 'get_Inventory': get_Inventory();
+                        break;
+                    //鍑哄叆搴撹褰曟煡璇�
+                    case 'get_InOutSum': get_InOutSum();
+                        break;
+
                     case 'btn-AddLine':
                         table.cache["mainTable"].push(NewRow);
                         option.data = table.cache["mainTable"];
@@ -664,7 +672,55 @@
 
 
             //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
-
+            //#region 搴撳瓨鏌ヨ
+            function get_Inventory() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    //寮圭獥鏂规硶
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '搴撳瓨鏌ヨ鍒楄〃'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_ICinventoryQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
+                }
+            }
+            //#endregion
+            //#region 鍑哄叆搴撹褰曟煡璇�
+            function get_InOutSum() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '鍑哄叆搴撹褰曞垪琛�'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_StockInOutSumQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
+                }
+            }
+            //#endregion
             //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
             function get_LoginIs() {
                 if (sessionStorage.login != "login") {
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 b83c602..1912c0b 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"
@@ -272,6 +272,8 @@
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Inventory" id="get_Inventory"><i class="layui-icon layui-icon-form"></i>搴撳瓨鏌ヨ</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="get_InOutSum" id="get_InOutSum"><i class="layui-icon layui-icon-form"></i>鍑哄叆搴撹褰曟煡璇�</button>
                         </div>
                     </script>
 
@@ -373,6 +375,12 @@
                     "HOrderPrice": "0", "HWHID": "0", "璋冨叆浠撳簱": "", "HSCWHID": "0", "璋冨嚭浠撳簱": "", "HBatchNo": "", "HRemark": ""
                 };
                 switch (obj.event) {
+                    //搴撳瓨鏌ヨ
+                    case 'get_Inventory': get_Inventory();
+                        break;
+                    //鍑哄叆搴撹褰曟煡璇�
+                    case 'get_InOutSum': get_InOutSum();
+                        break;
                     case 'btn-AddLine':
                         table.cache["mainTable"].push(NewRow);
                         option.data = table.cache["mainTable"];
@@ -479,7 +487,55 @@
 
             //#endregion
 
-
+            //#region 搴撳瓨鏌ヨ
+            function get_Inventory() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    //寮圭獥鏂规硶
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '搴撳瓨鏌ヨ鍒楄〃'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_ICinventoryQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
+                }
+            }
+            //#endregion
+            //#region 鍑哄叆搴撹褰曟煡璇�
+            function get_InOutSum() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '鍑哄叆搴撹褰曞垪琛�'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_StockInOutSumQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
+                }
+            }
+            //#endregion
             //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
 
             //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/KF_ICinventoryQueryReport.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/KF_ICinventoryQueryReport.html"
index a708480..ee75e69 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/KF_ICinventoryQueryReport.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/KF_ICinventoryQueryReport.html"
@@ -88,6 +88,12 @@
                                                 <input type="text" class="layui-input" name="HMTO" id="HMTO" style="width:190px;">
                                             </div>
                                         </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鐗╂枡ID</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" name="HMaterID" id="HMaterID" style="width:190px;">
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
@@ -131,12 +137,19 @@
             var option = [];
             var ins;                        //鐢ㄤ簬瀵煎嚭excel
             var columns = "";
-            var HModName = "Kf_ICInventory_BarCode";
+            var HModName = "Kf_ICInventoryQueryReport";
             var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
         //#endregion
 
         //#region 杩涘叆椤甸潰鍗冲姞杞�
 
+            //鑾峰彇椤甸潰璺宠浆鍙傛暟
+            var params = get_UrlVars();
+            var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1鏌ヨ
+            var HMaterID = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鐗╂枡id
+            if (HMaterID != null) {
+                $("#HMaterID").val(HMaterID);
+            }
             //鍒濆鍖栫晫闈�
             set_ClearBill();
 
@@ -147,7 +160,7 @@
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
                 //鏌ヨ
-                get_Display(sWhere);
+                get_Display();
             }
             //#endregion
 
@@ -187,6 +200,7 @@
                     , cellMinWidth: 90
                     , limit: 50
                     , limits: [50, 500, 5000, 20000]
+                    , cols:[[]]
                     , done: function (res, curr, count) {
                         soulTable.render(this);
                     }
@@ -337,6 +351,7 @@
 
             //#region 鏌ヨ
             function get_Display() {
+                var HMaterID = $("#HMaterID").val();            //鐗╂枡ID
                 var HMaterNumber = $("#HMaterNumber").val();            //鐗╂枡缂栫爜
                 var HMaterName = $("#HMaterName").val();                //鐗╂枡鍚嶇О
                 var HAuxProp = $("#HAuxProp").val();            //杈呭姪灞炴��
@@ -345,16 +360,16 @@
                 var HSPName = $("#HSPName").val();              //浠撲綅
                 var HModel = $("#HModel").val();               //瑙勬牸鍨嬪彿
                 var HMTO = $("#HMTO").val();                  //MTO璁″垝璺熻釜鍙�
-                sWhere = "'" + HMaterNumber + "','" + HMaterName + "','" + HModel + "','" + HAuxProp + "','" + HWHName + "','" + HSPName + "','" + HBatchNo + "','" + HMTO + "'";
+                sWhere = "'" + HMaterID+"','" + HMaterNumber + "','" + HMaterName + "','" + HModel + "','" + HAuxProp + "','" + HWHName + "','" + HSPName + "','" + HBatchNo + "','" + HMTO + "'";
 
                 var ajaxLoad = layer.load();
                 $.ajax({
                     type: "GET",
                     url: GetWEBURL() + '/WEBSController/GetKF_ICinventoryQueryReport_Json',
                     async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
-                    data: { "sWhere": sWhere },
+                    data: { "sWhere": sWhere},
                     success: function (data1) {
-                        if (data1.count == 1) {
+                        
                             var data = [];
                             var col = [];
                             //缁欑┖鐨勬暟缁勮祴鍊�
@@ -403,6 +418,7 @@
                                 });
                             }
                             option.cols = [columns];
+                        if (data1.data != null) {
                             option.data = data1.data;
                             option.totalRow = true;
                             table.render(option);
@@ -411,6 +427,9 @@
                             DisPlay_HideColumn();
                             layer.close(ajaxLoad);
                         } else {
+                            option.data = [[]];
+                            option.totalRow = true;
+                            table.render(option);
                             layer.close(ajaxLoad);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
@@ -432,8 +451,9 @@
 
             //閲嶇疆杩囨护鏉′欢
             function set_ClearQuery() {
+                $("#HMaterID").val("");            //鐗╂枡ID
                  $("#HMaterNumber").val("");            //鐗╂枡缂栫爜
-                 $("#HMater").val("");                //鐗╂枡鍚嶇О
+                 $("#HMaterName").val("");                //鐗╂枡鍚嶇О
                  $("#HAuxProp").val("");            //杈呭姪灞炴��
                  $("#HBatchNo").val("");            //鎵瑰彿
                  $("#HWHName").val("");              //浠撳簱
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/Kf_StockInOutSumQueryReport.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/Kf_StockInOutSumQueryReport.html"
index 6ca4f65..54d876e 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/Kf_StockInOutSumQueryReport.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/Kf_StockInOutSumQueryReport.html"
@@ -76,6 +76,12 @@
                                                 <input type="text" class="layui-input" name="HWHName" id="HWHName" style="width:190px;">
                                             </div>
                                         </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鐗╂枡ID</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" name="HMaterID" id="HMaterID" style="width:190px;">
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
@@ -119,26 +125,39 @@
             var option = [];
             var ins;                        //鐢ㄤ簬瀵煎嚭excel
             var columns = "";
-            var HModName = "Kf_MaterOutInReport";
+            var HModName = "Kf_StockInOutSumQueryReport";
             var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
         //#endregion
 
         //#region 杩涘叆椤甸潰鍗冲姞杞�
+            //鑾峰彇椤甸潰璺宠浆鍙傛暟
+            var params = get_UrlVars();
+            var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1鏌ヨ
+            var HMaterID = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鐗╂枡id
+            if (HMaterID != null) {
+                $("#HMaterID").val(HMaterID);
+                //鑾峰彇寮�濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30 * 6), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+            } else {
+                //鑾峰彇寮�濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+            }
+
 
             //鍒濆鍖栫晫闈�
             set_ClearBill();
 
             //#region 鍒濆鍖栫晫闈�
             function set_ClearBill() {
-                //鑾峰彇寮�濮嬫棩鏈熴�佺粨鏉熸棩鏈�
-                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
-                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                
                 //鑾峰彇缁勭粐
                 Organ();
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
                 //鏌ヨ
-                get_Display(sWhere);
+                get_Display();
             }
             //#endregion
 
@@ -330,12 +349,13 @@
             function get_Display() {
                 var HBeginDate = $("#HBeginDate").val();        //寮�濮嬫棩鏈�
                 var HEndDate = $("#HEndDate").val();            //缁撴潫鏃ユ湡
+                var HMaterID = $("#HMaterID").val();            //鐗╂枡ID
                 var HMaterNumber = $("#HMaterNumber").val();          //鐗╂枡缂栫爜
                 var HMaterName = $("#HMaterName").val();          //鐗╂枡鍚嶇О
                 var HWHName = $("#HWHName").val();              //浠撳簱
                 var HModel = $("#HModel").val();               //瑙勬牸鍨嬪彿
 
-                sWhere = "'" + HBeginDate + "','" + HEndDate + "','" + HMaterNumber + "','" + HMaterName + "','" + HModel + "','" + HWHName + "'" ;
+                sWhere = "'" + HBeginDate + "','" + HEndDate + "','" + HMaterID + "','" + HMaterNumber + "','" + HMaterName + "','" + HModel + "','" + HWHName + "'" ;
 
                 var ajaxLoad = layer.load();
                 $.ajax({
@@ -344,7 +364,7 @@
                     async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
                     data: { "sWhere": sWhere },
                     success: function (data1) {
-                        if (data1.count == 1) {
+                        if (data1.data != null) {
                             var data = [];
                             var col = [];
                             //缁欑┖鐨勬暟缁勮祴鍊�
@@ -401,6 +421,55 @@
                             DisPlay_HideColumn();
                             layer.close(ajaxLoad);
                         } else {
+                            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', 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', sort: true, totalRow: true });
+                                            } else {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+                                            }
+                                    }
+                                }
+                            }
+                            columns = col;
+
+                            //璁剧疆璧嬪�煎垪瀹�
+                            var colWidth = getColumnsWidth();
+                            if (colWidth == "" || colWidth == []) {
+
+                            }
+                            else {
+                                $.each(columns, function (x, m) {
+                                    m["width"] = colWidth[x];
+                                });
+                            }
+                            option.cols = [columns];
+                            option.data = [[]];
+                            option.totalRow = true;
+                            table.render(option);
                             layer.close(ajaxLoad);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
@@ -424,6 +493,7 @@
             function set_ClearQuery() {
                 $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));    //寮�濮嬫棩鏈�
                 $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));   //缁撴潫鏃ユ湡
+                $("#HMaterID").val("");            //鐗╂枡ID
                 $("#HMaterNumber").val("");           //鐗╂枡缂栫爜
                 $("#HMaterName").val("");         //鐗╂枡鍚嶇О
                 $("#HModel").val("");          //瑙勬牸鍨嬪彿
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit_PDA.html"
index 210557d..96d21fc 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit_PDA.html"
@@ -502,96 +502,33 @@
 
             //鏉″舰鐮佸洖杞︽柟娉�
             function txtHBarCode_KeyDown(HBarCode) {
-                var BillNoType2 = HBarCode.substr(0, 2);
-                var BillNoType3 = HBarCode.substr(0, 5);
-                var BillNoType4 = HBarCode.substr(0, 4);
-                var BillNoType5 = HBarCode.substr(0, 8);
 
+                //HBarCode = HBarCode.substr(23,(HBarCode.length - 23));
+                var sWhere = " and 鏉″舰鐮�='" + HBarCode +"' order by 鍒跺崟鏃ユ湡 desc"
                 var index = layer.load();
                 $.ajax({
-                    url: GetWEBURL() + "/Sc_MouldUpperBill/txtHBarCode_KeyDown",
+                    url: GetWEBURL() + "/Sc_MouldLowerBill/Sc_MouldUpperBillList",
                     type: "GET",
-                    data: { "HBarCode": HBarCode, "UserID": sessionStorage["Czybm"], "HBillType": "Sc_MouldLowerBill" },
+                    data: { "sWhere": sWhere},
                     success: function (result) {
                         if (result.count == 1) {
                             var data = result.data[0];
 
-                            switch (BillNoType2) {
-                                //鐢熶骇璧勬簮
-                                case "BM":
-                                case "SS":
-                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                        "HSourceID": data.HItemID,
-                                        "HSourceName": data.HName,
-                                    });
-                                    break;
-                                //鐢熶骇璁㈠崟
-                                case "MO":
-                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                        "HICMOBillNo": data.鍗曟嵁鍙�,
-                                        "HICMOInterID": data.hmainid,
-                                        "HICMOEntryID": data.HEntryID
-                                    });
-                                    break;
-                            }
-
-                            switch (BillNoType3) {
-                                //鍣ㄥ叿妗f
-                                case "MJD":
-                                case "PAK":
-                                case "https":
-                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                        "HMouldID": data.hmainid,
-                                        "HMouldNumber": data.妯″叿缂栧彿,
-                                        "HMouldName": data.妯″叿鍚嶇О,
-                                        "HMouldModel": data.妯″叿鍨嬪彿,
-                                        "HQty": 1,
-                                    });
-                                    break;
-                            }
-
-                            switch (BillNoType4) {
-                                //娴佽浆鍗�
-                                case "GXLX":
-                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                        "HProcExchBillNo": data.鍗曟嵁鍙�,
-                                        "HProcExchInterID": data.hmainid,
-                                        "HProcExchEntryID": data.HEntryID,
-                                        "HICMOBillNo": data.浠诲姟鍗曞彿,
-                                        "HICMOInterID": data.hicmointerid,
-                                        "HICMOEntryID": data.HICMOEntryID
-                                    });
-                                    break;
-                            }
-
-                            if (BillNoType5.length == 8) {
-                                BillNoType5 = BillNoType5.substr(0, 4) + "-" + BillNoType5.substr(4, 2) + "-" + BillNoType5.substr(6, 2);
-                            }
-
-                            if (isValidDate(BillNoType5)) {
-                                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "HProcExchBillNo": data.鍗曟嵁鍙�,
-                                    "HProcExchInterID": data.hmainid,
-                                    "HProcExchEntryID": data.HEntryID,
-                                    "HICMOBillNo": data.浠诲姟鍗曞彿,
-                                    "HICMOInterID": data.hicmointerid,
-                                    "HICMOEntryID": data.HICMOEntryID
-                                });
-                            }
-
-                            switch (BillNoType5) {
-                                //娴佽浆鍗�
-                                case "GXLX":
-                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                        "HProcExchBillNo": data.鍗曟嵁鍙�,
-                                        "HProcExchInterID": data.hmainid,
-                                        "HProcExchEntryID": data.HEntryID,
-                                        "HICMOBillNo": data.浠诲姟鍗曞彿,
-                                        "HICMOInterID": data.hicmointerid,
-                                        "HICMOEntryID": data.HICMOEntryID
-                                    });
-                                    break;
-                            }
+                            form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HProcExchBillNo": data.HProcExchBillNo,
+                                "HProcExchInterID": data.HProcExchInterID,
+                                "HProcExchEntryID": data.HProcExchEntryID,
+                                "HICMOBillNo": data.HICMOBillNo,
+                                "HICMOInterID": data.HICMOInterID,
+                                "HICMOEntryID": data.HICMOEntryID,
+                                "HSourceID": data.HSourceID,
+                                "HSourceName": data.鐢熶骇璧勬簮,
+                                "HMouldID": data.HMouldID,
+                                "HMouldNumber": data.妯″叿缂栫爜,
+                                "HMouldName": data.妯″叿鍚嶇О,
+                                "HMouldModel": data.妯″叿瑙勬牸,
+                                "HQty": 1,
+                            });
 
                             $("#HBarCode").val("");
                             layer.close(index);
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html"
index eb16694..73c0d33 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html"
@@ -504,9 +504,10 @@
             //鏉″舰鐮佸洖杞︽柟娉�
             function txtHBarCode_KeyDown(HBarCode) {
                 var BillNoType2 = HBarCode.substr(0, 2);
-                var BillNoType3 = HBarCode.substr(0, 5);
+                var BillNoType3 = HBarCode.substr(0, 3);
                 var BillNoType4 = HBarCode.substr(0, 4);
                 var BillNoType5 = HBarCode.substr(0, 8);
+                var BillNoType6 = HBarCode.substr(0, 5);
 
                 var index = layer.load();
                 $.ajax({
@@ -521,6 +522,7 @@
                                 //鐢熶骇璧勬簮
                                 case "BM":
                                 case "SS":
+                                case "10":
                                     form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                                         "HSourceID": data.HItemID,
                                         "HSourceName": data.HName,
@@ -541,6 +543,24 @@
                                   //鍣ㄥ叿妗f
                                 case "MJD":
                                 case "PAK":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HMouldID": data.hmainid,
+                                        "HMouldNumber": data.妯″叿缂栧彿,
+                                        "HMouldName": data.妯″叿鍚嶇О,
+                                        "HMouldModel": data.妯″叿鍨嬪彿,
+                                        "HQty": 1,
+                                    });
+                                    break;
+                                case "CMR":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HSourceID": data.HItemID,
+                                        "HSourceName": data.HName,
+                                    });
+                                    break;
+                            }
+
+                            switch (BillNoType6) {
+                                //鍣ㄥ叿妗f
                                 case "https":
                                     form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                                         "HMouldID": data.hmainid,
@@ -570,22 +590,8 @@
 
                             if (BillNoType5.length == 8) {
                                 BillNoType5 = BillNoType5.substr(0, 4) + "-" + BillNoType5.substr(4, 2) + "-" + BillNoType5.substr(6, 2);
-                            }
 
-                            if (isValidDate(BillNoType5)) {
-                                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "HProcExchBillNo": data.鍗曟嵁鍙�,
-                                    "HProcExchInterID": data.hmainid,
-                                    "HProcExchEntryID": data.HEntryID,
-                                    "HICMOBillNo": data.浠诲姟鍗曞彿,
-                                    "HICMOInterID": data.hicmointerid,
-                                    "HICMOEntryID": data.HICMOEntryID
-                                });
-                            }
-
-                            switch (BillNoType5) {
-                                //娴佽浆鍗�
-                                case "GXLX":
+                                if (isValidDate(BillNoType5)) {
                                     form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                                         "HProcExchBillNo": data.鍗曟嵁鍙�,
                                         "HProcExchInterID": data.hmainid,
@@ -594,10 +600,8 @@
                                         "HICMOInterID": data.hicmointerid,
                                         "HICMOEntryID": data.HICMOEntryID
                                     });
-                                    break;
+                                }
                             }
-
-                         
 
                             $("#HBarCode").val("");
                             layer.close(index);
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\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillEdit.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\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillEdit.html"
index 226e3ae..fc391f6 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\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillEdit.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\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillEdit.html"
@@ -67,7 +67,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="MouldHNumber" name="MouldHNumber" id="MouldHNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" name="HMouldID" id="HMouldID" lay-verify="HMouldID" value="0">
@@ -77,7 +77,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: 73px;">
                                                 <input type="text" class="layui-input" name="HRepairIDName" lay-verify="HRepairIDName" id="HRepairIDName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HRepairID" lay-verify="HRepairID" id="HRepairID" value="0">
@@ -110,7 +110,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: 67px;">
                                                 <input type="text" class="layui-input" name="HDeptIDName" lay-verify="HDeptIDName" id="HDeptIDName" style="background-color:#efefef4d;width: 55%;margin-left:7px;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HDeptID" lay-verify="HDeptID" id="HDeptID" value="0">
@@ -122,7 +122,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="HManagerIDName" name="HManagerIDName" id="HManagerIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HManagerID" id="HManagerID" lay-verify="HManagerID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
@@ -132,7 +132,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: 73px;">
                                                 <input type="text" class="layui-input" lay-verify="HEmpIDName" name="HEmpIDName" id="HEmpIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HEmpID" lay-verify="HEmpID" id="HEmpID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
@@ -150,13 +150,13 @@
                                     </div>
                                     <div class="layui-row">
                                         <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" name="HPlanTimes" lay-verify="HPlanTimes" id="HPlanTimes" value="0" onmouseover="this.title=this.value">
                                             </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: 117px;">
                                                 <input type="text" class="layui-input" name="HTimes" lay-verify="HTimes" id="HTimes" value="0">
                                             </div>
@@ -836,14 +836,37 @@
                     layer.msg("缁翠慨浜轰笉鑳戒负绌�");
                     return false;
                 }
-                if ($("#HSupIDName").val() == "") {
-                    layer.msg("渚涘簲鍟嗕笉鑳戒负绌�");
+                if ($("#HPlanTimes").val() == 0) {
+                    layer.msg("璁″垝缁翠慨宸ユ椂涓嶈兘涓�0");
                     return false;
                 }
-                if ($("#HEquipIDName").val() == "") {
-                    layer.msg("璁惧涓嶈兘涓虹┖");
+                if ($("#HTimes").val() == 0) {
+                    layer.msg("瀹為檯缁翠慨宸ユ椂涓嶈兘涓�0");
                     return false;
                 }
+                //if ($("#HSupIDName").val() == "") {
+                //    layer.msg("渚涘簲鍟嗕笉鑳戒负绌�");
+                //    return false;
+                //}
+                //if ($("#HEquipIDName").val() == "") {
+                //    layer.msg("璁惧涓嶈兘涓虹┖");
+                //    return false;
+                //}
+                var sSubStr = JSON.stringify(table.cache['mainTable'])
+                if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+                    sSubStr = JSON.parse(sSubStr);
+                    for (var i = 0; i < sSubStr.length; i++) {
+                        if (sSubStr[i].HRepairID == 0) {
+                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,缁翠慨椤圭洰淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return Result = false;
+                        }
+                        if (sSubStr[i].HManagerID == 0) {
+                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璐熻矗浜轰俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return Result = false;
+                        }
+
+                    }
+                }
                 return true;
             }
             //鑾峰彇鍙傛暟
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_MouldMaintainBillList.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_MouldMaintainBillList.html"
index adb29b6..a229d0f 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_MouldMaintainBillList.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_MouldMaintainBillList.html"
@@ -630,9 +630,9 @@
                                     buttonArr = [];//娓呯┖鏁扮粍
                                     for (var i = 0; i < BYData.length; i++) {
                                         var checkrow = {
-                                            "HMaintainItemID": BYData[i].HMaintainItemID, "HMaintainItemNumber": BYData[i].HMaintainItemNumber, "HMaintainItem": BYData[i].HMaintainItem,
-                                            "HMaintainPart": BYData[i].HMaintainPart, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerNumber,
-                                            "HManagerName": BYData[i].HManagerName, "HClaim": BYData[i].HClaim, "HRemark": BYData[i].HRemark
+                                            "HMaintainItemID": BYData[i].淇濆吇椤圭洰ID, "HMaintainItemNumber": BYData[i].淇濆吇椤圭洰浠g爜, "HMaintainItem": BYData[i].淇濆吇椤圭洰,
+                                            "HMaintainPart": BYData[i].淇濆吇閮ㄤ綅, "HManagerID": BYData[i].璐熻矗浜篒D, "HManagerNumber": BYData[i].璐熻矗浜轰唬鐮�,
+                                            "HManagerName": BYData[i].璐熻矗浜哄悕绉�, "HClaim": BYData[i].鍏蜂綋瑕佹眰, "HRemark": BYData[i].瀛愬娉�2
                                         };
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
@@ -648,10 +648,10 @@
                                     buttonArr = [];//娓呯┖鏁扮粍
                                     for (var i = 0; i < PJData.length; i++) {
                                         var checkrow = {
-                                            "HMaterID": PJData[i].HMaterID, "HMaterNumber": PJData[i].HMaterNumber, "HMaterName": PJData[i].HMaterName,
-                                            "HMaterSpec": PJData[i].HMaterSpec, "HUnitID": PJData[i].HUnitID, "HUnitNumber": PJData[i].HUnitNumber,
-                                            "HUnitName": PJData[i].HUnitName, "HQty": PJData[i].HQty, "HQtyMust": PJData[i].HQtyMust,
-                                            "HRemark": PJData[i].HRemark
+                                            "HMaterID": PJData[i].閰嶄欢ID, "HMaterNumber": PJData[i].閰嶄欢浠g爜, "HMaterName": PJData[i].閰嶄欢鍚嶇О,
+                                            "HMaterSpec": PJData[i].瑙勬牸鍨嬪彿, "HUnitID": PJData[i].鍗曚綅ID, "HUnitNumber": PJData[i].璁¢噺鍗曚綅浠g爜,
+                                            "HUnitName": PJData[i].璁¢噺鍗曚綅鍚嶇О, "HQty": PJData[i].鐢ㄩ噺, "HQtyMust": PJData[i].鏍囧噯鐢ㄩ噺,
+                                            "HRemark": PJData[i].瀛愬娉�1
                                         };
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html"
index 611a0ba..02f3b60 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html"
@@ -190,6 +190,8 @@
                 //鍒濆鍩烘湰淇℃伅璧嬪��
             }
             else if (OperationType == 3) {//缂栬緫
+                document.getElementById("IsHide").style.display = "none";//闅愯棌瑙嗛
+                document.getElementById("HideVideo").innerHTML = "鏄剧ず瑙嗛";
                 set_EditFromGrid(linterid);
             }
             else if (OperationType == 5) {//鏌ョ湅
@@ -197,6 +199,10 @@
                 HSourceNo = params[params[2]]; //宸ュ崟鍙�
                 HSourceEntryID = params[params[3]]; //婧愬崟瀛愬唴鐮�
                 HProcID = params[params[4]]; //宸ュ簭ID
+
+                document.getElementById("IsHide").style.display = "none";//闅愯棌瑙嗛
+                document.getElementById("HideVideo").innerHTML = "鏄剧ず瑙嗛";
+
                 //get_SopFile(HMaterID, HSourceNo);// 鐗╂枡
                 get_SopFile2(HMaterID, HProcID); //鐗╂枡+宸ュ簭
                 return;
@@ -250,7 +256,7 @@
                     document.getElementById("IsHide").style.display = "none";//闅愯棌瑙嗛
                     document.getElementById("HideVideo").innerHTML = "鏄剧ず瑙嗛";
                 } else {
-                    document.getElementById("IsHide").style.display = "inherit";//闅愯棌瑙嗛
+                    document.getElementById("IsHide").style.display = "inherit";//鏄剧ず瑙嗛
                     document.getElementById("HideVideo").innerHTML = "闅愯棌瑙嗛";
                 }
             });
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_SwipeCardStart.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_SwipeCardStart.html"
index e7da65b..284afab 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_SwipeCardStart.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_SwipeCardStart.html"
@@ -150,7 +150,7 @@
 </html>
 <script>
     layui.config({
-        base: '../../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
     }).extend({
         index: 'lib/index' //涓诲叆鍙fā鍧�
     }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_ProductionReturnEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_ProductionReturnEdit.html"
index baef45f..d8ce939 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_ProductionReturnEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_ProductionReturnEdit.html"
@@ -262,6 +262,8 @@
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Inventory" id="get_Inventory"><i class="layui-icon layui-icon-form"></i>搴撳瓨鏌ヨ</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="get_InOutSum" id="get_InOutSum"><i class="layui-icon layui-icon-form"></i>鍑哄叆搴撹褰曟煡璇�</button>
                         </div>
                     </script>
                     <script type="text/html" id="xuhao">
@@ -414,6 +416,12 @@
                 "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0
                 };
                 switch (obj.event) {
+                    //搴撳瓨鏌ヨ
+                    case 'get_Inventory': get_Inventory();
+                        break;
+                    //鍑哄叆搴撹褰曟煡璇�
+                    case 'get_InOutSum': get_InOutSum();
+                        break;
                     case 'btn-AddLine':
                         table.cache["mainTable"].push(NewRow);
                         option.data = table.cache["mainTable"];
@@ -1167,7 +1175,55 @@
             }
             //#endregion
 
-
+            //#region 搴撳瓨鏌ヨ
+            function get_Inventory() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    //寮圭獥鏂规硶
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '搴撳瓨鏌ヨ鍒楄〃'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_ICinventoryQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
+                }
+            }
+            //#endregion
+            //#region 鍑哄叆搴撹褰曟煡璇�
+            function get_InOutSum() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '鍑哄叆搴撹褰曞垪琛�'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_StockInOutSumQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
+                }
+            }
+            //#endregion
             function get_checkSecManager() {
                 layer.open({
                     type: 2//寮圭獥绫诲瀷
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBill_PDA.html"
index 0fa1f7d..69dc8c4 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBill_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBill_PDA.html"
@@ -489,7 +489,6 @@
                             }
                         },
                         error: function (err) {
-                            layer.close(index);
                             layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         }
                     });
@@ -499,34 +498,37 @@
 
             //鏂板
             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");//鏉″舰鐮佹竻闄よ儗鏅壊
+                layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    $('#Saver').addClass("buttom_box_little");
+                    $('#Saver').addClass("layui-btn-disabled").attr("disabled", false);
+                    $("#HBarCode").removeAttr("readonly");//鏉″舰鐮佹竻闄ゅ彧璇�
+                    $("#HBarCode").removeAttr("background-color");//鏉″舰鐮佹竻闄よ儗鏅壊
 
-                // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
-                $("#formData")[0].reset();
-                layui.form.render();
-                option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": $("#HManagerID").val(), "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": $("#HRemark").val(), "HEmpID": 0, "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
-                table.render(option);
+                    // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
+                    $("#formData")[0].reset();
+                    layui.form.render();
+                    option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": $("#HManagerID").val(), "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": $("#HRemark").val(), "HEmpID": 0, "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
+                    table.render(option);
 
-                $("#HBarCode").focus();
-                //鑾峰彇鏈�澶у崟鎹彿
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetMAXNum",
-                    type: "GET",
-                    data: { "HBillType": '3910' },
-                    success: function (d) {
-                        //console.log(d.data);
-                        $("#HInterID").val("0");
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                    }
-                });
-                $("#HRepairBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //缁翠慨寮�濮嬫椂闂�
-                $("#HRepairEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));    //缁翠慨缁撴潫鏃堕棿
-                $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
-                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒涘缓鏃ユ湡
-                $("#HMaker").val(sessionStorage["HUserName"]);     //鍒涘缓浜�
+                    $("#HBarCode").focus();
+                    //鑾峰彇鏈�澶у崟鎹彿
+                    $.ajax({
+                        url: GetWEBURL() + "/Web/GetMAXNum",
+                        type: "GET",
+                        data: { "HBillType": '3910' },
+                        success: function (d) {
+                            //console.log(d.data);
+                            $("#HInterID").val("0");
+                            $("#HBillNo").val(d.data[0].HBillNo);
+                        }
+                    });
+                    $("#HRepairBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //缁翠慨寮�濮嬫椂闂�
+                    $("#HRepairEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));    //缁翠慨缁撴潫鏃堕棿
+                    $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
+                    $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒涘缓鏃ユ湡
+                    $("#HMaker").val(sessionStorage["HUserName"]);     //鍒涘缓浜�
+                    layer.close(index);
+                });    
             })
 
             //#region 閫�鍑烘寜閽�
@@ -909,11 +911,13 @@
                             layer.close(index);
                         }
                         else {
+                            $("#HBarCode").val("");
                             layer.close(index);
                             layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         }
                     },
                     error: function (err) {
+                        $("#HBarCode").val("");
                         layer.close(index);
                         layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     }
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipConkBookBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipConkBookBill_PDA.html"
index 5bbad4f..bf7d3e1 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipConkBookBill_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipConkBookBill_PDA.html"
@@ -414,7 +414,6 @@
                             }
                         },
                         error: function (err) {
-                            layer.close(index);
                             layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         }
                     });
@@ -424,34 +423,37 @@
 
             //鏂板
             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");//鏉″舰鐮佹竻闄よ儗鏅壊
+                layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    $('#Saver').addClass("buttom_box_little");
+                    $('#Saver').addClass("layui-btn-disabled").attr("disabled", false);
+                    $("#HBarCode").removeAttr("readonly");//鏉″舰鐮佹竻闄ゅ彧璇�
+                    $("#HBarCode").removeAttr("background-color");//鏉″舰鐮佹竻闄よ儗鏅壊
 
-                // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
-                $("#formData")[0].reset();
-                layui.form.render();
-                option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "" }];
-                table.render(option);
+                    // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
+                    $("#formData")[0].reset();
+                    layui.form.render();
+                    option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "" }];
+                    table.render(option);
 
-                $("#HBarCode").focus();
-                //鑾峰彇鏈�澶у崟鎹彿
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetMAXNum",
-                    type: "GET",
-                    data: { "HBillType": '3907' },
-                    success: function (d) {
-                        //console.log(d.data);
-                        $("#HInterID").val("0");
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                    }
-                });
-                $("#HConkBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //缁翠慨寮�濮嬫椂闂�
-                $("#HRepairEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));    //缁翠慨缁撴潫鏃堕棿
-                $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
-                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒涘缓鏃ユ湡
-                $("#HMaker").val(sessionStorage["HUserName"]);     //鍒涘缓浜�
+                    $("#HBarCode").focus();
+                    //鑾峰彇鏈�澶у崟鎹彿
+                    $.ajax({
+                        url: GetWEBURL() + "/Web/GetMAXNum",
+                        type: "GET",
+                        data: { "HBillType": '3907' },
+                        success: function (d) {
+                            //console.log(d.data);
+                            $("#HInterID").val("0");
+                            $("#HBillNo").val(d.data[0].HBillNo);
+                        }
+                    });
+                    $("#HConkBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //缁翠慨寮�濮嬫椂闂�
+                    $("#HRepairEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));    //缁翠慨缁撴潫鏃堕棿
+                    $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
+                    $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒涘缓鏃ユ湡
+                    $("#HMaker").val(sessionStorage["HUserName"]);     //鍒涘缓浜�
+                    layer.close(index);
+                });       
             })
 
             //#region 閫�鍑烘寜閽�
@@ -906,11 +908,13 @@
                             layer.close(index);
                         }
                         else {
+                            $("#HBarCode").val("");
                             layer.close(index);
                             layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         }
                     },
                     error: function (err) {
+                        $("#HBarCode").val("");
                         layer.close(index);
                         layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     }
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 a786870..eb517d5 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"
@@ -202,8 +202,8 @@
                                             <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>
+                                                <input type="hidden" name="HPlanInterID" class="layui-input LineHeight" id="HPlanInterID" style="border-radius: 50px;background-color:#EDEDED;" value="0" readonly>
+                                                <input type="hidden" name="HPlanEntryID" class="layui-input LineHeight" id="HPlanEntryID" style="border-radius: 50px;background-color:#EDEDED;" value="0" readonly>
                                             </td>
                                         </tr>
                                     </tbody>
@@ -214,8 +214,8 @@
                                     <label class="layui-form-label" style="width:100px;">璁惧鐐规瑙勭▼</label>
                                     <div class="layui-input-inline">
                                         <input type="hidden" name="HEquipDotCheckRuleInterID" id="HEquipDotCheckRuleInterID" class="layui-input" value="0" style="float:left;width:150px;">
-                                        <input type="text" name="HEquipDotCheckRuleInterNo" id="HEquipDotCheckRuleInterNo" 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;">
+                                        <input type="text" name="HEquipDotCheckRuleInterNo" id="HEquipDotCheckRuleInterNo" class="layui-input" value="" style="float:left;width:180px;" readonly="readonly">
+                                        <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEquipDotCheckRuleInterist" style="width:40px;">
                                             <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                         </button>
                                     </div>
@@ -498,7 +498,6 @@
                             }
                         },
                         error: function (err) {
-                            layer.close(index);
                             layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         }
                     });
@@ -508,34 +507,38 @@
 
             //鏂板
             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");//鏉″舰鐮佹竻闄よ儗鏅壊
+                layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    $('#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);
+                    // 娓呯┖琛ㄥ崟 锛堚�渇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();
-                //鑾峰彇鏈�澶у崟鎹彿
-                $.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"]);     //鍒涘缓浜�
+                    $("#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"]);     //鍒涘缓浜�
+
+                    layer.close(index);
+                });       
             })
 
             //#region 閫�鍑烘寜閽�
@@ -661,21 +664,19 @@
                     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)  //琛ㄤ綋鏁版嵁涓虹┖鏃�
+                                if (data.length != 0)  //琛ㄤ綋鏁版嵁涓虹┖鏃�
                                 {
                                     buttonArr = [];//娓呯┖鏁扮粍
 
-                                    for (var i = 0; i < BYData.data.length; i++) {
+                                    for (var i = 0; i < 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
+                                            "HDotCheckItemID": data[i].HDotCheckItemID, "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 == null ? 0 : data[i].鐐规璁″垝ID, "HSourceEntryID": data[i].鐐规璁″垝瀛怚D == null ? 0 : data[i].鐐规璁″垝瀛怚D, "HSourceBillNo": data[i].鐐规璁″垝鍗�, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": data[i].榛樿缁撹
                                         };
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
@@ -821,16 +822,16 @@
                 }
                 var index = layer.load();
                 $.ajax({
-                    url: GetWEBURL() + "/Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown",
+                    url: GetWEBURL() + "/Gy_EquipFileBill/txtHBarCode_KeyDown",
                     type: "GET",
-                    data: { "HBarCode": HBarCode },
+                    data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
                     success: function (result) {
                         if (result.data.length == 1) {
                             var data = result.data[0];
                             $("#HEquipID").val(data.HInterID);
-                            $("#HBarName").val(data.HName);
-                            $("#HBarSpec").val(data.HModel);
-                            $("#HBarModel").val(data.HModel2);
+                            $("#HBarName").val(data.璁惧鍚嶇О);
+                            $("#HBarSpec").val(data.璁惧瑙勬牸);
+                            $("#HBarModel").val(data.璁惧鍨嬪彿);
                             $("#HQty").val(1);
                             $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
                             $("#HBarCode").css("background-color", "#efefef4d");
@@ -839,13 +840,15 @@
                             layer.close(index);
                         }
                         else {
+                            $("#HBarCode").val("");
                             layer.close(index);
-                            layer.msg("鏈煡鎵惧埌鏁版嵁", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         }
                     },
                     error: function (err) {
+                        $("#HBarCode").val("");
                         layer.close(index);
-                        layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     }
                 });
             }
@@ -860,8 +863,8 @@
                             $("#HEquipDotCheckRuleInterID").val(data[0].鐐规瑙勭▼ID);
                             $("#HEquipDotCheckRuleInterNo").val(data[0].鐐规瑙勭▼鍗曞彿);
                             $("#HPlanNo").val(data[0].鐐规璁″垝鍗�);
-                            $("#HPlanInterID").val(data[0].鐐规璁″垝ID);
-                            $("#HPlanEntryID").val(data[0].鐐规璁″垝瀛怚D);
+                            $("#HPlanInterID").val((data[0].鐐规璁″垝ID == null ? 0 : data[0].鐐规璁″垝ID) == "" ? 0 : data[0].鐐规璁″垝ID);
+                            $("#HPlanEntryID").val((data[0].鐐规璁″垝瀛怚D == null ? 0 : data[0].鐐规璁″垝瀛怚D) == "" ? 0 : data[0].鐐规璁″垝瀛怚D);
                             var rowdata = [];
                             for (let i = 0; i < data.length; i++) {
                                 rowdata.push(
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
index 85264a9..b759266 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
@@ -487,9 +487,9 @@
                                     buttonArr = [];//娓呯┖鏁扮粍
                                     for (var i = 0; i < BYData.length; i++) {
                                         var checkrow = {
-                                            "HMaintainItemID": BYData[i].HMaintainItemID, "HMaintainItemNumber": BYData[i].HMaintainItemNumber, "HMaintainItem": BYData[i].HMaintainItem,
-                                            "HMaintainPart": BYData[i].HMaintainPart, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerNumber,
-                                            "HManagerName": BYData[i].HManagerName, "HClaim": BYData[i].HClaim, "HRemark": BYData[i].HRemark
+                                            "HMaintainItemID": BYData[i].HMaintainItemID, "HMaintainItemNumber": BYData[i].淇濆吇椤圭洰浠g爜, "HMaintainItem": BYData[i].淇濆吇椤圭洰鍚嶇О,
+                                            "HMaintainPart": BYData[i].淇濆吇閮ㄤ綅, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].璐熻矗浜轰唬鐮�,
+                                            "HManagerName": BYData[i].璐熻矗浜哄悕绉�, "HClaim": BYData[i].鍏蜂綋瑕佹眰, "HRemark": BYData[i].琛ㄤ綋澶囨敞
                                         };
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
@@ -505,10 +505,10 @@
                                     buttonArr = [];//娓呯┖鏁扮粍
                                     for (var i = 0; i < PJData.length; i++) {
                                         var checkrow = {
-                                            "HMaterID": PJData[i].HMaterID, "HMaterNumber": PJData[i].HMaterNumber, "HMaterName": PJData[i].HMaterName,
-                                            "HUnitID": PJData[i].HUnitID, "HUnitNumber": PJData[i].HUnitNumber,
-                                            "HUnitName": PJData[i].HUnitName, "HQty": PJData[i].HQty,
-                                            "HRemark": PJData[i].HRemark
+                                            "HMaterID": PJData[i].閰嶄欢ID, "HMaterNumber": PJData[i].閰嶄欢浠g爜, "HMaterName": PJData[i].閰嶄欢鍚嶇О,
+                                            "HUnitID": PJData[i].鍗曚綅ID, "HUnitNumber": PJData[i].璁¢噺鍗曚綅浠g爜,
+                                            "HUnitName": PJData[i].璁¢噺鍗曚綅鍚嶇О, "HQty": PJData[i].鐢ㄩ噺,
+                                            "HRemark": PJData[i].瀛愬娉�1
                                         };
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_Mul.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_Mul.html"
index 88d761a..ce16f65 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_Mul.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_Mul.html"
@@ -562,10 +562,11 @@
                                     buttonArr = [];//娓呯┖鏁扮粍
                                     for (var i = 0; i < BYData.length; i++) {
                                         var checkrow = {
-                                            "HMaintainItemID": BYData[i].HMaintainItemID, "HMaintainItemNumber": BYData[i].HMaintainItemNumber, "HMaintainItem": BYData[i].HMaintainItem,
-                                            "HMaintainPart": BYData[i].HMaintainPart, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerNumber,
-                                            "HManagerName": BYData[i].HManagerName, "HClaim": rowdate1[i].HClaim, "HRemark": rowdate1[i].HRemark
+                                            "HMaintainItemID": BYData[i].HMaintainItemID, "HMaintainItemNumber": BYData[i].淇濆吇椤圭洰浠g爜, "HMaintainItem": BYData[i].淇濆吇椤圭洰鍚嶇О,
+                                            "HMaintainPart": BYData[i].淇濆吇閮ㄤ綅, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].璐熻矗浜轰唬鐮�,
+                                            "HManagerName": BYData[i].璐熻矗浜哄悕绉�, "HClaim": rowdate1[i].鍏蜂綋瑕佹眰, "HRemark": rowdate1[i].琛ㄤ綋澶囨敞
                                         };
+
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
                                     table.reload("mainTable", {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBill_PDA.html"
index 58f1146..fd87c35 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBill_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBill_PDA.html"
@@ -169,8 +169,8 @@
                                             <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="HEquipMaintainPlanInterID" class="layui-input LineHeight" id="HEquipMaintainPlanInterID" style="border-radius: 50px;background-color:#EDEDED;" readonly>
-                                                <input type="hidden" name="HEquipMaintainPlanEntryID" class="layui-input LineHeight" id="HEquipMaintainPlanEntryID" style="border-radius: 50px;background-color:#EDEDED;" readonly>
+                                                <input type="hidden" name="HEquipMaintainPlanInterID" class="layui-input LineHeight" id="HEquipMaintainPlanInterID" style="border-radius: 50px;background-color:#EDEDED;" value="0" readonly>
+                                                <input type="hidden" name="HEquipMaintainPlanEntryID" class="layui-input LineHeight" id="HEquipMaintainPlanEntryID" style="border-radius: 50px;background-color:#EDEDED;" value="0" readonly>
                                             </td>
                                         </tr>
                                     </tbody>
@@ -181,8 +181,8 @@
                                     <label class="layui-form-label" style="width:100px;">璁惧淇濆吇瑙勭▼</label>
                                     <div class="layui-input-inline">
                                         <input type="hidden" name="HEquipMaintainRuleInterID" id="HEquipMaintainRuleInterID" class="layui-input" value="0" style="float:left;width:150px;">
-                                        <input type="text" name="HEquipMaintainRuleInterNo" id="HEquipMaintainRuleInterNo" class="layui-input" value="" style="float:left;width:150px;" readonly="readonly">
-                                        <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEquipDotCheckRuleInterList" style="width:40px;display:none;">
+                                        <input type="text" name="HEquipMaintainRuleInterNo" id="HEquipMaintainRuleInterNo" class="layui-input" value="" style="float:left;width:180px;" readonly="readonly">
+                                        <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEquipDotCheckRuleInterList" style="width:40px;">
                                             <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                         </button>
                                     </div>
@@ -450,7 +450,6 @@
                             }
                         },
                         error: function (err) {
-                            layer.close(index);
                             layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         }
                     });
@@ -460,34 +459,38 @@
 
             //鏂板
             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");//鏉″舰鐮佹竻闄よ儗鏅壊
+                layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    $('#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 = [{ "HMaintainResult": false, "HMaintainItemID": 0, "HMaintainNumber": "", "HMaintainItem": "", "HMaintainPart": "", "HClaim": "", "HManagerID": 0, "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
-                table.render(option);
+                    // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
+                    $("#formData")[0].reset();
+                    layui.form.render();
+                    option.data = [{ "HMaintainResult": false, "HMaintainItemID": 0, "HMaintainNumber": "", "HMaintainItem": "", "HMaintainPart": "", "HClaim": "", "HManagerID": 0, "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
+                    table.render(option);
 
-                $("#HBarCode").focus();
-                //鑾峰彇鏈�澶у崟鎹彿
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetMAXNum",
-                    type: "GET",
-                    data: { "HBillType": '3901' },
-                    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"]);     //鍒涘缓浜�
+                    $("#HBarCode").focus();
+                    //鑾峰彇鏈�澶у崟鎹彿
+                    $.ajax({
+                        url: GetWEBURL() + "/Web/GetMAXNum",
+                        type: "GET",
+                        data: { "HBillType": '3901' },
+                        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"]);     //鍒涘缓浜�
+
+                    layer.close(index);
+                });    
             })
 
             //#region 閫�鍑烘寜閽�
@@ -572,27 +575,22 @@
             });
             function get_DocCheckItem2() {
                 $.ajax({
-                    url: GetWEBURL() + "/Web/GetDotCheckRuleItemByDotCheckRuleID",
+                    url: GetWEBURL() + "/Web/GetMaintainItemByMaintainRuleID",
                     type: "GET",
-                    data: { "HDotCheckRuleInterID": $("#HEquipMaintainRuleInterID").val() },
+                    data: { "HEquipMaintainRuleInterID": $("#HEquipMaintainRuleInterID").val() },
                     success: function (result) {
                         if (result != null) {
-                            if (result.count == 1) {
-                                var BYData = result;//
-                                var rowdate1 = layui.table.cache["mainTable"];
+                            if (result.count == 1) {                               
+                               
                                 var data = result.data;
-                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "" }];
+                                option.data = [{ "HMaintainResult": false, "HMaintainItemID": 0, "HMaintainNumber": "", "HMaintainItem": "", "HMaintainPart": "", "HClaim": "", "HManagerID": 0, "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
                                 table.render(option);
 
-                                if (BYData.data.length != 0)  //琛ㄤ綋鏁版嵁涓虹┖鏃�
+                                if (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
-                                        };
+                                    for (var i = 0; i < data.length; i++) {
+                                        var checkrow = { "HMaintainResult": data[i].榛樿缁撹, "HMaintainItemID": data[i].HMaintainItemID, "HMaintainNumber": data[i].淇濆吇椤圭洰浠g爜, "HMaintainItem": data[i].淇濆吇椤圭洰, "HMaintainPart": data[i].淇濆吇閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerNumber": data[i].璐熻矗浜轰唬鐮�, "HManagerName": data[i].璐熻矗浜哄悕绉�, "HRemark": data[i].琛ㄤ綋澶囨敞, "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" };
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
                                     table.reload("mainTable", {
@@ -601,7 +599,7 @@
                                 }
                             }
                             else {
-                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "" }];
+                                option.data = [{ "HMaintainResult": false, "HMaintainItemID": 0, "HMaintainNumber": "", "HMaintainItem": "", "HMaintainPart": "", "HClaim": "", "HManagerID": 0, "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
                                 table.render(option);
                                 layer.alert("璇ヨ澶囨殏鏃犻粯璁や繚鍏昏褰�", { icon: 5 });
                             }
@@ -707,7 +705,7 @@
                 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 == "") {
+                        if (sSubStr[i].HMaintainNumber == "" || sSubStr[i].HMaintainItemID == "") {
                             layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,淇濆吇椤圭洰浠g爜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             return false;
                         }
@@ -733,16 +731,16 @@
                 }
                 var index = layer.load();
                 $.ajax({
-                    url: GetWEBURL() + "/Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown",
+                    url: GetWEBURL() + "/Gy_EquipFileBill/txtHBarCode_KeyDown",
                     type: "GET",
-                    data: { "HBarCode": HBarCode },
+                    data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
                     success: function (result) {
                         if (result.data.length == 1) {
                             var data = result.data[0];
                             $("#HEquipID").val(data.HInterID);
-                            $("#HBarName").val(data.HName);
-                            $("#HBarSpec").val(data.HModel);
-                            $("#HBarModel").val(data.HModel2);
+                            $("#HBarName").val(data.璁惧鍚嶇О);
+                            $("#HBarSpec").val(data.璁惧瑙勬牸);
+                            $("#HBarModel").val(data.璁惧鍨嬪彿);
                             $("#HQty").val(1);
                             $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
                             $("#HBarCode").css("background-color", "#efefef4d");
@@ -751,13 +749,15 @@
                             layer.close(index);
                         }
                         else {
+                            $("#HBarCode").val("");
                             layer.close(index);
-                            layer.msg("鏈煡鎵惧埌鏁版嵁", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         }
                     },
                     error: function (err) {
+                        $("#HBarCode").val("");
                         layer.close(index);
-                        layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     }
                 });
             }
@@ -772,8 +772,8 @@
                             $("#HEquipMaintainRuleInterID").val(data[0].淇濆吇瑙勭▼ID);
                             $("#HEquipMaintainRuleInterNo").val(data[0].淇濆吇瑙勭▼鍗曞彿);
                             $("#HPlanNo").val(data[0].淇濆吇璁″垝鍗�);
-                            $("#HEquipMaintainPlanInterID").val(data[0].淇濆吇璁″垝ID);
-                            $("#HEquipMaintainPlanEntryID").val(data[0].淇濆吇璁″垝瀛怚D);
+                            $("#HEquipMaintainPlanInterID").val((data[0].淇濆吇璁″垝ID == null ? 0 : data[0].淇濆吇璁″垝ID) == "" ? 0 : data[0].淇濆吇璁″垝ID);
+                            $("#HEquipMaintainPlanEntryID").val((data[0].淇濆吇璁″垝瀛怚D == null ? 0 : data[0].淇濆吇璁″垝瀛怚D) == "" ? 0 : data[0].淇濆吇璁″垝瀛怚D);
                             var rowdata = [];
                             for (let i = 0; i < data.length; i++) {
                                 rowdata.push(
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipRepairCheckBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipRepairCheckBill_PDA.html"
index 2716a40..07d37c3 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipRepairCheckBill_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipRepairCheckBill_PDA.html"
@@ -335,7 +335,7 @@
             $("#HDeptName").val(sessionStorage["HDept"]);               //閮ㄩ棬
             $("#HEmpID").val(sessionStorage["HKeeperID"]);              //楠屾敹浜篒D
             $("#HEmpName").val(sessionStorage["HKeeper"]);            //楠屾敹浜�
-            $("#HManagerID").val(sessionStorage["HManagerID"]);         //璐d换浜篒D
+            $("#HManagerID").val(sessionStorage["HManagerID"] == null ? 0 : sessionStorage["HManagerID"]);         //璐d换浜篒D
             $("#HManagerName").val(sessionStorage["HManagerName"]);     //璐d换浜�
             $("#HMaker").val(sessionStorage["HUserName"]);     //鍒涘缓浜�
             //妯℃不鍏锋潯鐮佹槸鍚︽壂鎻忔爣璁�
@@ -353,50 +353,7 @@
             form.on('submit(QueDin)', function (data) {
                 GetMeesageByBarCode();
             });
-
-            //鏉″舰鐮佸洖杞︽柟娉�
-            $('#HBarCode').on('keydown', function (event) {
-                var HBarCode = $('#HBarCode').val();
-                if (event.keyCode == 13) {
-                    if (!HBarCode) {
-                        layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
-                        return;
-                    }
-                    var index = layer.load();
-                    $.ajax({
-                        url: GetWEBURL() + "/Sb_PDA_EqpRepairWorkBill/txtHBarCode_KeyDown",
-                        type: "GET",
-                        data: { "HBarCode": HBarCode },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                var data = result.data[0];
-                                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "HEquipID": data.HInterID,
-                                    "HBarName": data.HName,
-                                    "HBarSpec": data.HModel,
-                                    "HBarModel": data.HModel2,
-                                    "HQty": "1"
-                                });
-                                $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
-                                $("#HBarCode").css("background-color", "#efefef4d");
-
-                                HProcExchBillNoFlag = true;
-                                layer.close(index);
-                            }
-                            else {
-                                layer.close(index);
-                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        },
-                        error: function (err) {
-                            layer.close(index);
-                            layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    });
-                }
-            });
-
-
+            
             //閫�鍑�-鍏抽棴椤甸潰鏂规硶
             $('#Cancel').on('click', function () {
                 layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
@@ -425,12 +382,11 @@
                                 $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
                             }
                             else {
-                                layer.close(index);
+                                $('#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("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         }
                     });
@@ -440,34 +396,37 @@
 
             //鏂板
             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");//鏉″舰鐮佹竻闄よ儗鏅壊
+                layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    $('#Saver').addClass("buttom_box_little");
+                    $('#Saver').addClass("layui-btn-disabled").attr("disabled", false);
+                    $("#HBarCode").removeAttr("readonly");//鏉″舰鐮佹竻闄ゅ彧璇�
+                    $("#HBarCode").removeAttr("background-color");//鏉″舰鐮佹竻闄よ儗鏅壊
 
-                // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
-                $("#formData")[0].reset();
-                layui.form.render();
-                option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "" }];
-                table.render(option);
+                    // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
+                    $("#formData")[0].reset();
+                    layui.form.render();
+                    option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "" }];
+                    table.render(option);
 
-                $("#HBarCode").focus();
-                //鑾峰彇鏈�澶у崟鎹彿
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetMAXNum",
-                    type: "GET",
-                    data: { "HBillType": '3911' },
-                    success: function (d) {
-                        //console.log(d.data);
-                        $("#HInterID").val("0");
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                    }
-                });
-                $("#HConkBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //缁翠慨寮�濮嬫椂闂�
-                $("#HRepairEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));    //缁翠慨缁撴潫鏃堕棿
-                $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
-                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒涘缓鏃ユ湡
-                $("#HMaker").val(sessionStorage["HUserName"]);     //鍒涘缓浜�
+                    $("#HBarCode").focus();
+                    //鑾峰彇鏈�澶у崟鎹彿
+                    $.ajax({
+                        url: GetWEBURL() + "/Web/GetMAXNum",
+                        type: "GET",
+                        data: { "HBillType": '3911' },
+                        success: function (d) {
+                            //console.log(d.data);
+                            $("#HInterID").val("0");
+                            $("#HBillNo").val(d.data[0].HBillNo);
+                        }
+                    });
+                    $("#HConkBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //缁翠慨寮�濮嬫椂闂�
+                    $("#HRepairEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));    //缁翠慨缁撴潫鏃堕棿
+                    $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
+                    $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒涘缓鏃ユ湡
+                    $("#HMaker").val(sessionStorage["HUserName"]);     //鍒涘缓浜�
+                    layer.close(index);
+                });  
             })
 
              //#region 閫�鍑烘寜閽�
@@ -891,16 +850,16 @@
                 }
                 var index = layer.load();
                 $.ajax({
-                    url: GetWEBURL() + "/Sb_PDA_EqpRepairWorkBill/txtHBarCode_KeyDown",
+                    url: GetWEBURL() + "/Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown_List",
                     type: "GET",
                     data: { "HBarCode": HBarCode },
                     success: function (result) {
                         if (result.count == 1) {
                             var data = result.data[0];
-                            $("#HEquipID").val(data.HInterID);
-                            $("#HBarName").val(data.HName);
-                            $("#HBarSpec").val(data.HModel);
-                            $("#HBarModel").val(data.HModel2);
+                            $("#HEquipID").val(data.hmainid);
+                            $("#HBarName").val(data.璁惧鍚嶇О);
+                            $("#HBarSpec").val(data.璁惧瑙勬牸);
+                            $("#HBarModel").val(data.璁惧鍨嬪彿);
                             $("#HQty").val(1);
                             $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
                             $("#HBarCode").css("background-color", "#efefef4d");
@@ -909,11 +868,13 @@
                             layer.close(index);
                         }
                         else {
+                            $("#HBarCode").val("");
                             layer.close(index);
                             layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         }
                     },
                     error: function (err) {
+                        $("#HBarCode").val("");
                         layer.close(index);
                         layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     }
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_PDA.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_PDA.html"
index 195580e..4e56f58 100644
--- "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_PDA.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_PDA.html"
@@ -68,7 +68,7 @@
                             <div class="layui-tab-item layui-show">
                                 <table style="width:80%;">
                                     <tbody>
-                                        <tr style="display:none;">
+                                        <tr>
                                             <th>鏉″舰鐮�</th>
                                             <td class="bz_td">
                                                 <input type="text" name="HBarCode" class="layui-input" id="HBarCode" placeholder="璇锋壂鎻忔潯鐮�" style="border-radius: 50px;">
@@ -94,6 +94,12 @@
                                                 <input type="text" name="HEquipName" class="layui-input" id="HEquipName" placeholder="閫夋嫨璁惧" style="background-color:#EDEDED;" readonly>
                                                 <input type="hidden" name="HEquipID" id="HEquipID" value="0" autocomplete="off" class="layui-input">
                                                 <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="btnEquip" id="btnEquip" style="font-weight:bolder">...</button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>璁惧瑙勬牸</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HEquipModel" class="layui-input" id="HEquipModel" placeholder="" style="background-color:#EDEDED;" readonly>
                                             </td>
                                         </tr>
                                         <tr>
@@ -319,41 +325,7 @@
             form.on('submit(QueDin)', function (data) {
                 GetMeesageByBarCode();
             });
-
-            //鏉″舰鐮佸洖杞︽柟娉�
-            $('#HBarCode').on('keydown', function (event) {
-                var HBarCode = $('#HBarCode').val();
-                if (event.keyCode == 13) {
-                    if (!HBarCode) {
-                        layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
-                        return;
-                    }
-                    var index = layer.load();
-                    $.ajax({
-                        url: GetWEBURL() + "/Gy_PDA_FixCardChangeBill/txtHBarCode_KeyDown",
-                        type: "GET",
-                        data: { "HBarCode": HBarCode },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                var data = result.data[0];
-                                
-                                HProcExchBillNoFlag = true;
-                                layer.close(index);
-                            }
-                            else {
-                                layer.close(index);
-                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        },
-                        error: function (err) {
-                            layer.close(index);
-                            layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    });
-                }
-            });
-
-
+           
             //閫�鍑�-鍏抽棴椤甸潰鏂规硶
             $('#Cancel').on('click', function () {
                 layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
@@ -396,35 +368,39 @@
 
             //鏂板
             form.on('submit(Add)', function (data) {
-                $('#Saver').addClass("buttom_box_little");
-                $('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);//淇濆瓨鎸夐挳鍚敤
-                $("#HBarCode").removeAttr("readonly");//鏉″舰鐮佹竻闄ゅ彧璇�
-                $("#HBarCode").removeAttr("background-color");//鏉″舰鐮佹竻闄よ儗鏅壊
+                layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    $('#Saver').addClass("buttom_box_little");
+                    $('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);//淇濆瓨鎸夐挳鍚敤
+                    $("#HBarCode").removeAttr("readonly");//鏉″舰鐮佹竻闄ゅ彧璇�
+                    $("#HBarCode").removeAttr("background-color");//鏉″舰鐮佹竻闄よ儗鏅壊
 
-                // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
-                $("#formData")[0].reset();
-                layui.form.render();
-                option.data = [];
-                table.render(option);
+                    // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
+                    $("#formData")[0].reset();
+                    layui.form.render();
+                    option.data = [];
+                    table.render(option);
 
-                $("#HBarCode").focus();
-                //鑾峰彇鏈�澶у崟鎹彿
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetMAXNum",
-                    type: "GET",
-                    data: { "HBillType": '3918' },
-                    success: function (d) {
-                        //console.log(d.data);
-                        $("#HInterID").val(d.data[0].HInterID);
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                    }
-                });              
-                $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
-                $("#HStopTime").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"]);     //鍒涘缓浜�
-                $("#HStopEmpID").val(sessionStorage["HEmpID"]);     //寮�鏈轰汉ID
-                $("#HStopEmpName").val(sessionStorage["HEmpName"]);     //寮�鏈轰汉
+                    $("#HBarCode").focus();
+                    //鑾峰彇鏈�澶у崟鎹彿
+                    $.ajax({
+                        url: GetWEBURL() + "/Web/GetMAXNum",
+                        type: "GET",
+                        data: { "HBillType": '3918' },
+                        success: function (d) {
+                            //console.log(d.data);
+                            $("#HInterID").val(d.data[0].HInterID);
+                            $("#HBillNo").val(d.data[0].HBillNo);
+                        }
+                    });
+                    $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
+                    $("#HStopTime").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"]);     //鍒涘缓浜�
+                    $("#HStopEmpID").val(sessionStorage["HEmpID"]);     //寮�鏈轰汉ID
+                    $("#HStopEmpName").val(sessionStorage["HEmpName"]);     //寮�鏈轰汉
+
+                    layer.close(index);
+                });                   
             })
 
             //#region 閫�鍑烘寜閽�
@@ -648,7 +624,7 @@
                 }
 
                 if ($("#HStopEmpID").val() == 0) {
-                    layer.msg("寮�鏈轰汉娌℃湁閫夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    layer.msg("鍋滄満浜烘病鏈夐�夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
                 }
               
@@ -663,22 +639,16 @@
                 }
                 var index = layer.load();
                 $.ajax({
-                    url: GetWEBURL() + "/Gy_PDA_FixCardChangeBill/txtHBarCode_KeyDown",
+                    url: GetWEBURL() + "/Gy_EquipFileBill/txtHBarCode_KeyDown",
                     type: "GET",
-                    data: { "HBarCode": HBarCode },
+                    data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
                     success: function (result) {
                         if (result.count == 1) {
                             var data = result.data[0];
-                            $("#HCardID").val(data.hmainid);
-                            $("#HCardNumber").val(data.鍗$墖缂栫爜);
-                            $("#HCardName").val(data.璧勪骇鍚嶇О);
-                            $("#HCardStatusID_OLD").val(data.HCardStatusID);
-                            $("#HCardStatusName_OLD").val(data.璧勪骇鐘舵��);
-                            $("#HCardAddr_OLD").val(data.HCardAddr);
-                            $("#HCardAddrName_OLD").val(data.璧勪骇浣嶇疆);
-                            $("#HOrgID").val(data.HOrgID);
-                            $("#HOrgName").val(data.璧勪骇缁勭粐);
-                            $("#HQty").val(1);
+                            $("#HEquipID").val(data.HInterID);
+                            $("#HEquipName").val(data.璁惧鍚嶇О);
+                            $("#HEquipModel").val(data.璁惧瑙勬牸);
+
                             $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
                             $("#HBarCode").css("background-color", "#efefef4d");
 
@@ -686,11 +656,13 @@
                             layer.close(index);
                         }
                         else {
+                            $("#HBarCode").val("");
                             layer.close(index);
                             layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         }
                     },
                     error: function (err) {
+                        $("#HBarCode").val("");
                         layer.close(index);
                         layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     }
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_PDA.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_PDA.html"
index 52b3113..af7161c 100644
--- "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_PDA.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_PDA.html"
@@ -68,8 +68,8 @@
                             <div class="layui-tab-item layui-show">
                                 <table style="width:80%;">
                                     <tbody>
-                                        <tr style="display:none;">
-                                            <th>鏉″舰鐮�</th>
+                                        <tr>
+                                            <th>璁惧鏉$爜</th>
                                             <td class="bz_td">
                                                 <input type="text" name="HBarCode" class="layui-input" id="HBarCode" placeholder="璇锋壂鎻忔潯鐮�" style="border-radius: 50px;">
                                                 <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius" lay-filter="QueDin" style="line-height: 30px;">纭畾</button>
@@ -97,6 +97,12 @@
                                             </td>
                                         </tr>
                                         <tr>
+                                            <th>璁惧瑙勬牸</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HEquipModel" class="layui-input" id="HEquipModel" placeholder="" style="background-color:#EDEDED;" readonly>
+                                            </td>
+                                        </tr>
+                                        <tr>
                                             <th>鍏宠仈涓昏澶�</th>
                                             <td class="bz_td" style="margin-top: 8px;">
                                                 <input type="text" name="HEquipRelationName" class="layui-input" id="HEquipRelationName" placeholder="閫夋嫨鍏宠仈涓昏澶�" style="background-color:#EDEDED;" readonly>
@@ -121,7 +127,7 @@
                                         <tr>
                                             <th>澶�&ensp;&ensp;&ensp;&ensp;娉�</th>
                                             <td class="bz_td">
-                                                <input type="text" name="HRemark" class="layui-input" id="HRemark" placeholder="璇疯緭鍏ュ娉�" >
+                                                <input type="text" name="HRemark" class="layui-input" id="HRemark" placeholder="璇疯緭鍏ュ娉�">
                                             </td>
                                         </tr>
                                     </tbody>
@@ -312,41 +318,7 @@
             //纭畾
             form.on('submit(QueDin)', function (data) {
                 GetMeesageByBarCode();
-            });
-
-            //鏉″舰鐮佸洖杞︽柟娉�
-            $('#HBarCode').on('keydown', function (event) {
-                var HBarCode = $('#HBarCode').val();
-                if (event.keyCode == 13) {
-                    if (!HBarCode) {
-                        layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
-                        return;
-                    }
-                    var index = layer.load();
-                    $.ajax({
-                        url: GetWEBURL() + "/Gy_PDA_FixCardChangeBill/txtHBarCode_KeyDown",
-                        type: "GET",
-                        data: { "HBarCode": HBarCode },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                var data = result.data[0];
-                                
-                                HProcExchBillNoFlag = true;
-                                layer.close(index);
-                            }
-                            else {
-                                layer.close(index);
-                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        },
-                        error: function (err) {
-                            layer.close(index);
-                            layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    });
-                }
-            });
-
+            });            
 
             //閫�鍑�-鍏抽棴椤甸潰鏂规硶
             $('#Cancel').on('click', function () {
@@ -387,38 +359,41 @@
                 }
             });
 
-
             //鏂板
             form.on('submit(Add)', function (data) {
-                $('#Saver').addClass("buttom_box_little");
-                $('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);//淇濆瓨鎸夐挳鍚敤
-                $("#HBarCode").removeAttr("readonly");//鏉″舰鐮佹竻闄ゅ彧璇�
-                $("#HBarCode").removeAttr("background-color");//鏉″舰鐮佹竻闄よ儗鏅壊
+                layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    $('#Saver').addClass("buttom_box_little");
+                    $('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);//淇濆瓨鎸夐挳鍚敤
+                    $("#HBarCode").removeAttr("readonly");//鏉″舰鐮佹竻闄ゅ彧璇�
+                    $("#HBarCode").removeAttr("background-color");//鏉″舰鐮佹竻闄よ儗鏅壊
 
-                // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
-                $("#formData")[0].reset();
-                layui.form.render();
-                option.data = [];
-                table.render(option);
+                    // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
+                    $("#formData")[0].reset();
+                    layui.form.render();
+                    option.data = [];
+                    table.render(option);
 
-                $("#HBarCode").focus();
-                //鑾峰彇鏈�澶у崟鎹彿
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetMAXNum",
-                    type: "GET",
-                    data: { "HBillType": '3917' },
-                    success: function (d) {
-                        //console.log(d.data);
-                        $("#HInterID").val(d.data[0].HInterID);
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                    }
-                });              
-                $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
-                $("#HBeginTime").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"]);     //鍒涘缓浜�
-                $("#HBeginEmpID").val(sessionStorage["HEmpID"]);     //寮�鏈轰汉ID
-                $("#HBeginEmpName").val(sessionStorage["HEmpName"]);     //寮�鏈轰汉
+                    $("#HBarCode").focus();
+                    //鑾峰彇鏈�澶у崟鎹彿
+                    $.ajax({
+                        url: GetWEBURL() + "/Web/GetMAXNum",
+                        type: "GET",
+                        data: { "HBillType": '3917' },
+                        success: function (d) {
+                            //console.log(d.data);
+                            $("#HInterID").val(d.data[0].HInterID);
+                            $("#HBillNo").val(d.data[0].HBillNo);
+                        }
+                    });
+                    $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
+                    $("#HBeginTime").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"]);     //鍒涘缓浜�
+                    $("#HBeginEmpID").val(sessionStorage["HEmpID"]);     //寮�鏈轰汉ID
+                    $("#HBeginEmpName").val(sessionStorage["HEmpName"]);     //寮�鏈轰汉
+
+                    layer.close(index);
+                });                
             })
 
             //#region 閫�鍑烘寜閽�
@@ -657,22 +632,16 @@
                 }
                 var index = layer.load();
                 $.ajax({
-                    url: GetWEBURL() + "/Gy_PDA_FixCardChangeBill/txtHBarCode_KeyDown",
+                    url: GetWEBURL() + "/Gy_EquipFileBill/txtHBarCode_KeyDown",
                     type: "GET",
-                    data: { "HBarCode": HBarCode },
+                    data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
                     success: function (result) {
                         if (result.count == 1) {
                             var data = result.data[0];
-                            $("#HCardID").val(data.hmainid);
-                            $("#HCardNumber").val(data.鍗$墖缂栫爜);
-                            $("#HCardName").val(data.璧勪骇鍚嶇О);
-                            $("#HCardStatusID_OLD").val(data.HCardStatusID);
-                            $("#HCardStatusName_OLD").val(data.璧勪骇鐘舵��);
-                            $("#HCardAddr_OLD").val(data.HCardAddr);
-                            $("#HCardAddrName_OLD").val(data.璧勪骇浣嶇疆);
-                            $("#HOrgID").val(data.HOrgID);
-                            $("#HOrgName").val(data.璧勪骇缁勭粐);
-                            $("#HQty").val(1);
+                            $("#HEquipID").val(data.HInterID);
+                            $("#HEquipName").val(data.璁惧鍚嶇О);
+                            $("#HEquipModel").val(data.璁惧瑙勬牸);
+                            
                             $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
                             $("#HBarCode").css("background-color", "#efefef4d");
 
@@ -680,11 +649,13 @@
                             layer.close(index);
                         }
                         else {
+                            $("#HBarCode").val("");
                             layer.close(index);
                             layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         }
                     },
                     error: function (err) {
+                        $("#HBarCode").val("");
                         layer.close(index);
                         layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     }
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_EquipMaintainRuleList_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleList_PDA.html"
index a87a7af..d22dd0a 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_EquipMaintainRuleList_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleList_PDA.html"
@@ -278,7 +278,7 @@
                 //鏌ヨ
                 get_Display(sWhere);
                 //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
-                get_DefaultModule();
+                //get_DefaultModule();
             }
             //鍒濆鍖栦富琛ㄦ牸
             function set_InitGrid() {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\344\275\234\350\201\224\347\263\273\345\215\225/OA_Add_Edit_WorkLinkBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\344\275\234\350\201\224\347\263\273\345\215\225/OA_Add_Edit_WorkLinkBill.html"
new file mode 100644
index 0000000..d6c29ce
--- /dev/null
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\344\275\234\350\201\224\347\263\273\345\215\225/OA_Add_Edit_WorkLinkBill.html"
@@ -0,0 +1,982 @@
+锘�<!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">
+    <!--寮曠敤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/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <style type="text/css">
+        .layui-form-label {
+            width: 85px;
+        }
+
+        .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 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="Saver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="VerIfySaver">瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+                            </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 layui-tab-card">
+                                        <ul class="layui-tab-title">
+                                            <li class="layui-this">鍩烘湰淇℃伅</li>
+                                            <li>鍒跺崟淇℃伅</li>
+                                        </ul>
+                                        <div class="layui-tab-content" style="height: 700px;">
+                                            <div class="layui-tab-item layui-show">
+                                                <div class="layui-form-item">
+                                                    <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" disabled autocomplete="off">
+                                                            <input id="HInterID" name="HInterID" type="hidden" />
+                                                            <input id="HEntryID" name="HEntryID" type="hidden" />
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">鍗曟嵁鏃ユ湡:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input class="layui-input" name="HDate" id="HDate" disabled autocomplete="off" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">涓婚:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input class="layui-input" name="HContext" lay-verify="HContext" id="HContext" autocomplete="off" style="width:485px">
+                                                        </div>
+                                                    </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="HSendMan" id="HSendMan" class="layui-input" value="" style="float:left;width:150px;" disabled>
+                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSendManList" id="HSendManList" style="width:40px;">
+                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                            </button>
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">鎺ユ敹浜�:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="text" name="HReceiveMan" id="HReceiveMan" class="layui-input" value="" style="float:left;width:150px;" disabled>
+                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HReceiveManList" id="HReceiveManList" 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">
+                                                        <div class="layui-inline">
+                                                            <label class="layui-form-label">绱ф�ョ▼搴�:</label>
+                                                            <div class="layui-input-inline">
+                                                                <select name="HLevel" lay-filter="HLevel" id="HLevel">
+                                                                    <option value="鏅��" selected="selected">鏅��</option>
+                                                                    <option value="绱ф��">绱ф��</option>
+                                                                </select>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">鍙戦�佺被鍨�:</label>
+                                                        <div class="layui-input-inline">
+                                                            <select name="HSendType" lay-filter="HSendType" id="HSendType">
+                                                                <option value="鍏叡" selected="selected">鍏叡</option>
+                                                                <option value="涓汉">涓汉</option>
+                                                            </select>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-form-item">
+
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">鎶勯��:</label>
+                                                        <div >
+                                                            <input type="text" name="HCopyMan" id="HCopyMan" class="layui-input" value="" style="float:left;width:1035px;" disabled>
+                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HCopyManList" id="HCopyManList" style="width:40px;">
+                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                            </button>
+                                                        </div>
+                                                    </div>
+                                                    <!--<div class="layui-inline">
+                                                        <label class="layui-form-label">杞彂鑷�:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="text" name="HReTransmitMan" id="HReTransmitMan" class="layui-input" value="" style="float:left;width:150px;" disabled>
+                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HReTransmitManList" id="HReTransmitManList" 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">
+                                                            <select name="HSendType" lay-filter="HSendType" id="HSendType">
+                                                                <option value="0" selected="selected">鍏叡</option>
+                                                                <option value="1">涓汉</option>
+                                                            </select>
+                                                        </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="HDescription" id="HDescription" style="width:1080px;"></textarea>
+                                                        </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="HRemark" id="HRemark" style="width:1080px;"></textarea>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-form-item">
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">鎺ㄨ崘瀹屾垚鏃ユ湡</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="date" class="layui-input" lay-verify="HCommDate" name="HCommDate" id="HCommDate" style="float:left;width:190px;">
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">楠岃瘉璇勪环:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="text" name="HEvaluateStatusName" id="HEvaluateStatusName" class="layui-input" value="" style="float:left;width:150px;" disabled>
+                                                            <input type="hidden" name="HEvaluateStatusID" id="HEvaluateStatusID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HEvaluateStatusList" id="HEvaluateStatusList" style="width:40px;">
+                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                            </button>
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">鍏宠仈鍗曞彿:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input class="layui-input" name="HRelationBillNo" lay-verify="HMainSourceBillNo" id="HMainSourceBillNo" disabled autocomplete="off">
+                                                            <input id="HMainSourceInterID" name="HRelationInterID" value="0" type="hidden" />
+                                                            <input id="HMainSourceEntryID" name="HRelationEntryID" value="0" type="hidden" />
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">鍏宠仈绫诲瀷:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input class="layui-input" name="HRelationBillType" lay-verify="HMainSourceBillType" id="HMainSourceBillType" disabled autocomplete="off">
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">鍙戦�侀儴闂�:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;" disabled>
+                                                            <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" id="HDeptList" 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" style="display:none;">
+                                                        <label class="layui-form-label">鍌績娆℃暟:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input class="layui-input" name="HHasten" lay-verify="HHasten" id="HHasten" autocomplete="off" value="0">
+                                                        </div>
+                                                    </div>
+                                                </div>
+
+                                            </div>
+                                            <div class="layui-tab-item">
+                                                <div class="layui-form-item">
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">鍒跺崟浜�:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" disabled>
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">淇敼浜�:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" disabled>
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">瀹℃牳浜�:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" disabled>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-form-item">
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">鍒跺崟鏃ユ湡:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">淇敼鏃ユ湡:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">瀹℃牳鏃ユ湡:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+                                                        </div>
+                                                    </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" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" disabled>
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">浣滃簾浜�:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" disabled>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-form-item">
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">鍏抽棴鏃ユ湡:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="datetime" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">浣滃簾鏃ユ湡:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </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
+                , element = layui.element;
+
+            window.HDeptType = 0;
+            //#endregion
+
+            //鍒濆鍖栬〃鍗曟彃浠�
+            /*set_InitFrom();*/
+
+            var params = get_UrlVars();
+            var refSav;
+            var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫
+            var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+            var HEntryID = params[params[2]];
+            if (typeof (params[params[0]]) == "undefined") {
+                OperationType = 1;//鎿嶄綔绫诲瀷
+            }
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗曞垵濮嬪寲
+                set_AddFNew();
+            }
+            else if (OperationType == 2) {
+                //鑱斿崟鍒濆鍖�
+                var HRelationInterID = params[params[1]];
+                var HRelationEntryID = params[params[2]];
+                var HRelationBillNo = params[params[3]];
+                var HRelationBillType = params[params[4]];
+                $("#HRelationInterID").val(HRelationInterID); //鑱旂郴鍗曞崟鍙凤紙鏆傛椂鍙栧�艰鍗曠紪鍙凤級
+                $("#HRelationEntryID").val(HRelationEntryID); //鑱旂郴鍗曚富鍐呯爜(鍙栧�糎InterID)
+                $("#HRelationBillNo").val(HRelationBillNo); //鑱旂郴鍗曞瓙鍐呯爜(婧愬崟琛屽彿)
+                $("#HRelationBillType").val(HRelationBillType); //鑱旂郴鍗曠被鍨�
+                set_AddFNew();
+            }
+            else if (OperationType == 3) {//缂栬緫
+                set_EditFromGrid();
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+
+            //鍒濆鍖栨彃浠�
+            function set_InitFrom() {
+                //鏃ユ湡鏃堕棿閫夋嫨鍣�
+                laydate.render({
+                    elem: '#HDate'
+                    , type: 'datetime'
+                });
+                //laydate.render({
+                //    elem: '#HUpDateDate'
+                //    , type: 'datetime'
+                //});
+                //laydate.render({
+                //    elem: '#HMakeDate'
+                //    , type: 'datetime'
+                //});
+                //laydate.render({
+                //    elem: '#HCommDate'
+                //    , type: 'datetime'
+                //});
+                //laydate.render({
+                //    elem: '#HDeleteDate'
+                //    , type: 'datetime'
+                //});
+                
+            }
+
+            //鏂板
+            function set_AddFNew()
+            {
+                //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
+                refSav = "Add";
+                //鍒濆鍩烘湰淇℃伅璧嬪��
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
+                $("#HCommDate").val(Format(new Date().getTime() + 1000 * 60 * 60 * 24 * 30, "yyyy-MM-dd"));      //棰勮瀹屾垚鏃ユ湡
+                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒跺崟鏃ユ湡
+                $("#HMaker").val(sessionStorage["HUserName"]);     //鍒跺崟浜�
+                $("#HSendMan").val(sessionStorage["HUserName"]);   //鍙戦�佷汉
+                $("#HDeptID").val(sessionStorage["HDeptID"]);  //閮ㄩ棬ID
+                $("#HDeptName").val(sessionStorage["HDept"]);  //閮ㄩ棬
+            }
+
+            //#region 鏈夋簮鍗曟柊澧炴棤鐢�
+     
+            //function set_AddNew() {
+            //    refSav = "Add";
+            //    //鍒濆鍩烘湰淇℃伅璧嬪��
+            //    $("#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"]);     //鍒跺崟浜�
+            //    $("#HSendMan").val(sessionStorage["HUserName"]);   //鍙戦�佷汉
+            //    $("#HDeptID").val(sessionStorage["HDeptID"]);  //閮ㄩ棬ID
+            //    $("#HDeptName").val(sessionStorage["HDept"]);  //閮ㄩ棬
+
+            //    $.ajax(
+            //        {
+            //            type: "GET",
+            //            url: GetWEBURL() + "/Sc_MESBeginWorkBill/GetMESBeginWorkFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+            //            async: true,
+            //            data: {
+            //                "HRelationInterID": HRelationInterID,
+            //                "HSourceEntryID": HMainSourceEntryID,
+            //                "HSourceBillNo": HMainSourceBillNo,
+            //                "HSourceBillType": HBillType
+            //            },
+            //            dataType: "json",
+            //            success: function (data) {
+            //                if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
+            //                {
+            //                    var LoadData = data.data.h_p_JIT_GetInfoByICMOStatusInterID;
+            //                    $("#HMaterName").val(LoadData[0].HMaterName); //浜у搧鍚嶇О
+            //                    $("#HMaterModel").val(LoadData[0].HModel); //浜у搧瑙勬牸
+            //                    $("#HMainSourceBillNo").val(LoadData[0].HICMOBillNo); //婧愬崟鍗曞彿锛堟殏鏃跺彇鍊艰鍗曠紪鍙凤級
+            //                    $("#HMainSourceInterID").val(LoadData[0].HSourceInterID); //婧愬崟涓诲唴鐮�(鍙栧�糎InterID)
+            //                    $("#HMainSourceEntryID").val(LoadData[0].HSourceEntryID); //婧愬崟瀛愬唴鐮�(婧愬崟琛屽彿)
+            //                    $("#HMainSourceBillType").val(LoadData[0].HSourceBillType); //婧愬崟绫诲瀷
+            //                    $("#HQty").val(LoadData[0].HDatePlanQty); //璁″垝鏁伴噺
+            //                    Qty = LoadData[0].HDatePlanQty;
+            //                }
+            //                else {
+            //                    layer.alert(data.Message, { icon: 5 });
+
+            //                }
+            //            },
+            //            error: function (err) {
+            //                layer.alert(err, { icon: 5 });
+            //            }
+            //        });
+            //}
+            //#endregion
+            //缂栬緫
+            function set_EditFromGrid()
+            {
+                refSav = "Update";
+                $.ajax({
+                    url: GetWEBURL() + "/Sc_MESTransFerWorkBill/GetOA_WorkLinkBillListCheckDetai",
+                    type: "GET",
+                    data: { "HID": linterid},
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data[0];
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HInterID": data.HInterID
+                                , "HEntryID": data.HEntryID
+                                , "HBillNo": data.HBillNo
+                                , "HDate": Format(data.HDate, "yyyy-MM-dd hh:mm:ss")
+                                , "HContext": data.HContext
+                                , "HSendMan": data.HSendMan
+                                , "HDeptID": data.HDeptID
+                                , "HDeptName": data.HDeptName
+                                , "HReceiveMan": data.HReceiveMan
+                                , "HCopyMan": data.HCopyMan
+                                , "HHasten": data.HHasten   
+                                , "HDescription": data.HDescription
+                                , "HRemark": data.HRemark
+                                , "HEvaluateStatusID": data.HEvaluateStatusID
+                                , "HEvaluateStatusName": data.HEvaluateStatusName
+                                , "HCommDate": formatDate(data.HCommDate)
+                                , "HRelationInterID": data.HRelationInterID                 //鍏宠仈鍗旾D
+                                , "HRelationEntryID": data.HRelationEntryID                 //鍏宠仈鍗曞瓙ID
+                                , "HRelationBillNo": data.HRelationBillNo                   //鍏宠仈鍗曞崟鍙�
+                                , "HRelationBillType": data.HRelationBillType               //鍏宠仈鍗曠被鍨�
+                                , "HMaker": data.HMaker                            //鍒跺崟浜�
+                                , "HMakeDate": data.HMakeDate                      //鍒跺崟鏃ユ湡
+                                , "HUpDater": sessionStorage["HUserName"]             //淇敼浜�
+                                , "HUpDateDate": Format(new Date(), "yyyy-MM-dd hh:mm:ss")//淇敼鏃ユ湡
+                                , "HChecker": data.HChecker             //瀹℃牳浜�
+                                , "HCheckDate": data.HCheckDate   //瀹℃牳鏃ユ湡
+                                , "HCloseMan": data.HCloseMan               //鍏抽棴浜�
+                                , "HCloseDate": data.HCloseDate             //鍏抽棴鏃ユ湡
+                                , "HDeleteMan": data.HDeleteMan             //浣滃簾浜�
+                                , "HDeleteDate": data.HDeleteDate           //浣滃簾鏃ユ湡
+                            });
+                            $('#HLevel').find("option[value='" + data.HLevel + "']").attr("selected", true);
+                            $('#HSendType').find("option[value='" + data.HSendType + "']").attr("selected", true);
+                            
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+
+
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == 0) {
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("0");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '4501' },
+                    success: function (d) {
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HInterID").val(d.data[0].HInterID);
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+            }
+
+            //淇濆瓨鎻愪氦
+            form.on('submit(Saver)', function (data) {
+
+                var sMainStr = JSON.stringify(data.field);
+                var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
+                if (!AllowLoadData())//鏁版嵁楠岃瘉
+                {
+                    return false;
+                }
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Sc_MESTransFerWorkBill/SaveOA_WorkLinkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: false,
+                    data: { "msg": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            //$("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+                            $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
+                            
+                        }
+                        else {
+                            layer.alert(data.Message, { icon: 5 })
+                        }
+                    },
+                    error: function (err) {
+                        layer.alert(err, { icon: 5 })
+                    }
+                })
+            });
+
+            //瀹℃牳鎸夐挳鎻愪氦
+            form.on('submit(VerIfySaver)', function (data) {
+                SaveVerify();
+            });
+
+            //瀹℃牳鎻愪氦
+            function SaveVerify()
+            {
+                var InterID = $("#HInterID").val();
+                if (!AllowLoadData())//鏁版嵁楠岃瘉
+                {
+                    return false;
+                }
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Sc_MESTransFerWorkBill/AuditOA_WorkLinkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: true,
+                    data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
+                                $('#VerIfySaver').addClass("layui-btn-disabled").attr("disabled", true);
+                                //layer.close(layer.index);
+                                //window.parent.location.reload();
+                            });
+                        }
+                        else {
+                            layer.alert(data.Message, { icon: 5 })
+                        }
+                    },
+                    error: function (err) {
+                        layer.alert(err, { icon: 5 })
+                    }
+                })
+            }
+
+
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
+            });
+
+
+            //鍙戦�佷汉寮圭獥
+            form.on('submit(HSendManList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鍙戦�佷汉鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', '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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSendMan").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(HDeptList)', function () {
+                HDeptType = 1;
+
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '閮ㄩ棬鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+                        $("#HDeptID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+            
+            //楠岃瘉璇勪环
+            form.on('submit(HEvaluateStatusList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '楠岃瘉璇勪环鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EvaluateStatusList.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HEvaluateStatusName").val(checkStatus.data[0].楠岃瘉璇勪环鍚嶇О);
+                        $("#HEvaluateStatusID").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(HReceiveManList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鎺ユ敹浜哄垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/transfer.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.transfer.getData('key123'); //鑾峰彇宸插垎閰嶆暟閲�
+                        if (checkStatus.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        if (checkStatus.length > 1) {
+                            return layer.msg('鎺ユ敹浜哄彧鑳戒竴涓�');
+                        }
+                        var value = "";
+                        var title = "";
+                        for (var i = 0; i < checkStatus.length; i++) {
+                            value += checkStatus[i].value + ",";
+                            title += checkStatus[i].title + ",";
+                        }
+                        //鍘绘帀鏈�鍚庝竴涓�楀彿(濡傛灉涓嶉渶瑕佸幓鎺夛紝灏变笉鐢ㄥ啓)
+                        if (value.length > 0) {
+                            value = value.substr(0, value.length - 1);
+                            title = title.substr(0, title.length - 1);
+                        }
+                        $("#HReceiveMan").val(title);
+                        console.log(checkStatus, value, title);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //鎶勯�佷汉
+            form.on('submit(HCopyManList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鎶勯�佷汉鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/transfer.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.transfer.getData('key123'); //鑾峰彇宸插垎閰嶆暟閲�
+                        if (checkStatus.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        var value = "";
+                        var title = "";
+                        for (var i = 0; i < checkStatus.length; i++) {
+                            value += checkStatus[i].value + ",";
+                            title += checkStatus[i].title + ",";
+                        }
+                        //鍘绘帀鏈�鍚庝竴涓�楀彿(濡傛灉涓嶉渶瑕佸幓鎺夛紝灏变笉鐢ㄥ啓)
+                        if (value.length > 0) {
+                            value = value.substr(0, value.length - 1);
+                            title = title.substr(0, title.length - 1);
+                        }
+                        $("#HCopyMan").val(title);
+                        console.log(checkStatus, value, title);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //杞彂鑷�
+            form.on('submit(HReTransmitManList)', function () {
+                    //椤甸潰灞�-鑷畾涔�
+                  layer.open({
+                        type: 2,
+                        skin: 'layui-layer-rim', //鍔犱笂杈规
+                        title: '鎶勯�佷汉鍒楄〃',
+                        closeBtn: 1,
+                        shift: 2,
+                        area: ['80%', '80%'],
+                        maxmin: true,
+                        content: ['../../PublicPage/transfer.html', 'yes'],
+                        btn: ['纭畾', '鍙栨秷']
+                        , btn1: function (index, layero) {
+
+                            //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                            var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                            var checkStatus = iframeWindow.layui.transfer.getData('key123'); //鑾峰彇宸插垎閰嶆暟閲�
+                            if (checkStatus.length === 0) {
+                                return layer.msg('璇烽�夋嫨鏁版嵁');
+                            }
+                            var value = "";
+                            var title = "";
+                            for (var i = 0; i < checkStatus.length; i++) {
+                                value += checkStatus[i].value + ",";
+                                title += checkStatus[i].title + ",";
+                            }
+                            //鍘绘帀鏈�鍚庝竴涓�楀彿(濡傛灉涓嶉渶瑕佸幓鎺夛紝灏变笉鐢ㄥ啓)
+                            if (value.length > 0) {
+                                value = value.substr(0, value.length - 1);
+                                title = title.substr(0, title.length - 1);
+                            }
+                            $("#HReTransmitMan").val(title);
+                            console.log(checkStatus, value, title);
+                            layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                        }
+                        , btn2: function (index, layero) {
+                            //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                            //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                        },
+                        end: function () {
+
+                        },
+                        success: function (layero, index) {
+
+                        }
+                    });
+             });
+            //浠ヤ笂涓簂ayui妯″潡
+        });
+
+        function AllowLoadData() {  //闈炵┖楠岃瘉
+            var Result = true;
+            if ($("#HBillNo").val() == '' || $("#HBillNo").val() == null) {
+                layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return Result = false;
+            }
+            if ($("#HDate").val() == '' || $("#HDate").val() == null) {
+                layer.msg("鍗曟嵁鏃ユ湡涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return Result = false;
+            }
+            if ($("#HContext").val() == '' || $("#HContext").val() == null) {
+                layer.msg("涓婚涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return Result = false;
+            }
+            if ($("#HSendMan").val() == '' || $("#HSendMan").val() == null) {
+                layer.msg("鍙戦�佷汉涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return Result = false;
+            }
+            if ($("#HReceiveMan").val() == '' || $("#HReceiveMan").val() == null) {
+                layer.msg("鎺ユ敹浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return Result = false;
+            }
+            if ($("#HDeptName").val() == '' || $("#HDeptName").val() == null) {
+                layer.msg("鍙戦�侀儴闂ㄤ笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return Result = false;
+            }
+            //if (OperationType == "2") {
+            //    if ($("#HMainSourceInterID").val() == '' || $("#HMainSourceInterID").val() == null) {
+            //        layer.msg("婧愬崟鍗曞彿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //        return Result = false;
+            //    }
+            //}
+            //if ($("#HQty").val() > Qty) {
+            //    layer.msg("涓嶈兘澶т簬璁″垝鏁伴噺锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //    return Result = false;
+            //}
+            return Result;
+        }
+
+        function formatDate(date) {
+            var d = new Date(date),
+                month = '' + (d.getMonth() + 1),
+                day = '' + d.getDate(),
+                year = d.getFullYear();
+
+            if (month.length < 2) month = '0' + month;
+            if (day.length < 2) day = '0' + day;
+
+            return [year, month, day].join('-');
+        }
+
+        function GetHEmpValue(obj) {  //鍙戦�佷汉
+            $("#HSendMan").val(obj[0].鑱屽憳鍚嶇О);
+        }
+        function GetEvaluateStatusValue(obj) {  //鍙戦�佷汉
+            
+            $("#HEvaluateStatusName").val(obj[0].楠岃瘉璇勪环鍚嶇О);
+            $("#HEvaluateStatusID").val(obj[0].HItemID);
+        }
+        function GetHDeptNameValue(obj) {  //閮ㄩ棬
+            if (HDeptType == 1) {
+                $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+                $("#HDeptID").val(obj[0].HItemID);
+            } else if (HDeptType == 2) {
+                $("#HRecDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+                $("#HRecDeptID").val(obj[0].HItemID);
+            }
+        }
+
+    </script>
+</body>
+</html>
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\344\275\234\350\201\224\347\263\273\345\215\225/OA_Reply_WorkLinkBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\344\275\234\350\201\224\347\263\273\345\215\225/OA_Reply_WorkLinkBill.html"
new file mode 100644
index 0000000..85d9127
--- /dev/null
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\344\275\234\350\201\224\347\263\273\345\215\225/OA_Reply_WorkLinkBill.html"
@@ -0,0 +1,1190 @@
+锘�<!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">
+    <!--寮曠敤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/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <style type="text/css">
+        .layui-form-label {
+            width: 85px;
+        }
+
+        .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 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="Saver" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="Saver" disabled>淇濆瓨</button>
+                                <button type="button" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="VerIfySaver" disabled>瀹℃牳</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 " id="content">
+                                    <div class="layui-tab layui-tab-card ">
+                                        <ul class="layui-tab-title">
+                                            <li class="layui-this">鍩烘湰淇℃伅</li>
+                                            <li>鍒跺崟淇℃伅</li>
+                                        </ul>
+                                        <div class="layui-tab-content " style="height: 700px;">
+                                            <div class="layui-tab-item layui-show">
+                                                <div class="layui-form-item">
+                                                    <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" disabled autocomplete="off" style="background-color: #f7f4f4; ">
+                                                            <input id="HInterID" name="HInterID" type="hidden" />
+                                                            <input id="HEntryID" name="HEntryID" type="hidden" />
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">鍗曟嵁鏃ユ湡:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input class="layui-input" name="HDate" id="HDate" disabled autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd"style="background-color: #f7f4f4; ">
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">涓婚:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input class="layui-input" name="HContext" lay-verify="HContext" id="HContext" autocomplete="off"  disabled style="width: 485px; background-color: #f7f4f4;">
+                                                        </div>
+                                                    </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="HSendMan" id="HSendMan" class="layui-input" value="" style="float: left; width: 150px; background-color: #f7f4f4;" disabled>
+                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSendManList" id="HSendManList" style="width:40px;"  disabled >
+                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                            </button>
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">鎺ユ敹浜�:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="text" name="HReceiveMan" id="HReceiveMan" class="layui-input" value="" style="float: left; width: 150px; background-color: #f7f4f4;" disabled>
+                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HReceiveManList" id="HReceiveManList" style="width:40px;"  disabled >
+                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                            </button>
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <div class="layui-inline">
+                                                            <label class="layui-form-label">绱ф�ョ▼搴�:</label>
+                                                            <div class="layui-input-inline">
+                                                                <select name="HLevel" lay-filter="HLevel" id="HLevel"  disabled >
+                                                                    <option value="鏅��" selected="selected">鏅��</option>
+                                                                    <option value="绱ф��">绱ф��</option>
+                                                                </select>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">鍙戦�佺被鍨�:</label>
+                                                        <div class="layui-input-inline">
+                                                            <select name="HSendType" lay-filter="HSendType" id="HSendType" disabled >
+                                                                <option value="鍏叡" selected="selected">鍏叡</option>
+                                                                <option value="涓汉">涓汉</option>
+                                                            </select>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-form-item">
+
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">鎶勯��:</label>
+                                                        <div>
+                                                            <input type="text" name="HCopyMan" id="HCopyMan" class="layui-input" value="" style="float: left; width: 1035px; background-color: #f7f4f4;" disabled>
+                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HCopyManList" id="HCopyManList" style="width:40px;" disabled >
+                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                            </button>
+                                                        </div>
+                                                    </div>
+                                                    <!--<div class="layui-inline">
+                        <label class="layui-form-label">杞彂鑷�:</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="HReTransmitMan" id="HReTransmitMan" class="layui-input" value="" style="float:left;width:150px;" disabled>
+                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HReTransmitManList" id="HReTransmitManList" 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">
+                            <select name="HSendType" lay-filter="HSendType" id="HSendType">
+                                <option value="0" selected="selected">鍏叡</option>
+                                <option value="1">涓汉</option>
+                            </select>
+                        </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="HDescriptionMain" id="HDescriptionMain" style="width: 1080px; background-color: #f7f4f4;" disabled ></textarea>
+                                                        </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="HRemark" id="HRemark" style="width: 1080px; background-color: #f7f4f4;" disabled ></textarea>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-form-item">
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">鎺ㄨ崘瀹屾垚鏃ユ湡</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="date" class="layui-input" lay-verify="HCommDate" name="HCommDate" id="HCommDate" style="float: left; width: 190px; background-color: #f7f4f4;" disabled>
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">楠岃瘉璇勪环:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="text" name="HEvaluateStatusName" id="HEvaluateStatusName" class="layui-input" value="" style="float: left; width: 150px; background-color: #f7f4f4;" disabled>
+                                                            <input type="hidden" name="HEvaluateStatusID" id="HEvaluateStatusID" class="layui-input" value="0" style="float: left; width: 150px; background-color: #f7f4f4;">
+                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HEvaluateStatusList" id="HEvaluateStatusList" style="width:40px;" disabled>
+                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                            </button>
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">鍏宠仈鍗曞彿:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input class="layui-input" name="HRelationBillNo" lay-verify="HMainSourceBillNo" id="HMainSourceBillNo" disabled autocomplete="off">
+                                                            <input id="HMainSourceInterID" name="HRelationInterID" value="0" type="hidden" />
+                                                            <input id="HMainSourceEntryID" name="HRelationEntryID" value="0" type="hidden" />
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">鍏宠仈绫诲瀷:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input class="layui-input" name="HRelationBillType" lay-verify="HMainSourceBillType" id="HMainSourceBillType" disabled autocomplete="off">
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">鍙戦�侀儴闂�:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float: left; width: 150px; background-color: #f7f4f4;" disabled>
+                                                            <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float: left; width: 150px; background-color: #f7f4f4;">
+                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" id="HDeptList" style="width:40px;" disabled>
+                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                            </button>
+                                                        </div>
+                                                    </div>
+
+                                                    <div class="layui-inline" style="display:none;">
+                                                        <label class="layui-form-label">鍌績娆℃暟:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input class="layui-input" name="HHasten" lay-verify="HHasten" id="HHasten" autocomplete="off" value="0" disabled>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="layui-tab-item">
+                                                <div class="layui-form-item">
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">鍒跺崟浜�:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color: #f7f4f4; " disabled>
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">淇敼浜�:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color: #f7f4f4;" disabled>
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">瀹℃牳浜�:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color: #f7f4f4;" disabled>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-form-item">
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">鍒跺崟鏃ユ湡:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color: #f7f4f4;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">淇敼鏃ユ湡:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color: #f7f4f4;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">瀹℃牳鏃ユ湡:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color: #f7f4f4;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+                                                        </div>
+                                                    </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" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color: #f7f4f4;" disabled>
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">浣滃簾浜�:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color: #f7f4f4;" disabled>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-form-item">
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">鍏抽棴鏃ユ湡:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="datetime" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color: #f7f4f4;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">浣滃簾鏃ユ湡:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color: #f7f4f4;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab layui-tab-card">
+                                        <ul class="layui-tab-title">
+                                            <li class="layui-this">鍥炲鍐呭</li>
+                                        </ul>
+                                        <div class="layui-tab-content" style="height: 700px;">
+                                            <div class="layui-tab-item layui-show">
+                                                <div class="" style="float:left;">
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">鍥炲:</label>
+                                                        <div class="layui-input-inline">
+                                                            <textarea placeholder="璇疯緭鍏ュ洖澶嶅唴瀹�" class="layui-textarea" name="HDescription" id="HDescription" style="width:1080px;"></textarea>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div style="float:left;margin-left:5px;">
+                                                    <div>
+                                                        <button type="button" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit="" lay-filter="Reply" style="width:94px;background-color:#7c7a7a;color:white;">鍥炲</button>
+                                                    </div>
+                                                    <div>
+                                                        <button type="button" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit="" lay-filter="VerPass" style="width:94px;background-color:#7c7a7a;color:white;">楠岃瘉閫氳繃</button>
+                                                    </div>
+                                                    <div>
+                                                        <button type="button" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit="" lay-filter="Closed" style="width:94px;background-color:#7c7a7a;color:white;">缁撴</button>
+                                                    </div>                                                   
+                                                </div>
+                                                <div style="padding-top:125px;">
+                                                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                                                </div>
+                                            </div>
+                                        </div>                                        
+                                    </div>                                   
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </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
+                , element = layui.element;
+            //#endregion
+            //鍒濆鍖栬〃鍗曟彃浠�
+            /*set_InitFrom();*/
+
+            var sWhere = "";
+
+            var params = get_UrlVars();
+            var refSav;
+            var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫
+            var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+            var HEntryID = params[params[2]];
+            
+            var rowdata = [{
+                "HSendMan": "", "HDescription": "", "HDate": "", "HSendStatus": 1
+            }];
+            
+            // 鍒濆鍖栫晫
+            set_InitGrid();
+
+            if (typeof (params[params[0]]) == "undefined") {
+                OperationType = 1;//鎿嶄綔绫诲瀷
+            }
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
+            }
+            else if (OperationType == 2) {//鏈夋簮鍗�
+                /*set_AddNew();*/
+            }
+            else if (OperationType == 3) {//缂栬緫/鍥炲锛岃繖閲屾槸鍥炲
+                set_EditFromGrid();
+                get_Display(sWhere);
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+
+            //鍒濆鍖栨彃浠�
+            function set_InitFrom() {
+                //鏃ユ湡鏃堕棿閫夋嫨鍣�
+                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: '#HCloseDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HDeleteDate'
+                    , type: 'datetime'
+                });
+
+            }
+
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    //, toolbar: '#toolbarDemo'
+                    , limit: 500
+                    , height: 500
+                    , loading: false
+                    , cols: [[ //瀛愯〃
+                        { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                        , { type: 'numbers', title: '搴忓彿', totalRow: true, width: 100, }
+                        , { field: 'HSendMan', title: '鍥炲浜�', }//f7
+                        , { field: 'HDescription', title: '鍥炲鍐呭', }
+                        , { field: 'HDate', title: '鍥炲鏃堕棿' }
+                        , { field: 'HSendStatus', title: '绫诲瀷', width: 150, }
+                        //, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+                    ]]
+                }
+
+                option.data = rowdata;
+                table.render(option);
+            }
+
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
+                refSav = "Add";
+                //鍒濆鍩烘湰淇℃伅璧嬪��
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
+                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒跺崟鏃ユ湡
+                $("#HCommDate").val(Format(new Date().getTime() + 1000 * 60 * 60 * 24 * 30, "yyyy-MM-dd"));      //棰勮瀹屾垚鏃ユ湡
+                $("#HMaker").val(sessionStorage["HUserName"]);     //鍒跺崟浜�
+                $("#HSendMan").val(sessionStorage["HUserName"]);   //鍙戦�佷汉
+                $("#HDeptID").val(sessionStorage["HDeptID"]);  //閮ㄩ棬ID
+                $("#HDeptName").val(sessionStorage["HDept"]);  //閮ㄩ棬
+            }
+
+
+            //#region 鏈夋簮鍗曟柊澧�
+            //function set_AddNew() {
+            //    refSav = "Add";
+            //    //鍒濆鍩烘湰淇℃伅璧嬪��
+            //    $("#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"]);     //鍒跺崟浜�
+            //    $("#HSendMan").val(sessionStorage["HUserName"]);   //鍙戦�佷汉
+            //    $("#HDeptID").val(sessionStorage["HDeptID"]);  //閮ㄩ棬ID
+            //    $("#HDeptName").val(sessionStorage["HDept"]);  //閮ㄩ棬
+
+            //    $.ajax(
+            //        {
+            //            type: "GET",
+            //            url: GetWEBURL() + "/Sc_MESBeginWorkBill/GetMESBeginWorkFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+            //            async: true,
+            //            data: {
+            //                "HSourceInterID": HMainSourceInterID,
+            //                "HSourceEntryID": HMainSourceEntryID,
+            //                "HSourceBillNo": HMainSourceBillNo,
+            //                "HSourceBillType": HBillType
+            //            },
+            //            dataType: "json",
+            //            success: function (data) {
+            //                if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
+            //                {
+            //                    var LoadData = data.data.h_p_JIT_GetInfoByICMOStatusInterID;
+            //                    $("#HMaterName").val(LoadData[0].HMaterName); //浜у搧鍚嶇О
+            //                    $("#HMaterModel").val(LoadData[0].HModel); //浜у搧瑙勬牸
+            //                    $("#HMainSourceBillNo").val(LoadData[0].HICMOBillNo); //婧愬崟鍗曞彿锛堟殏鏃跺彇鍊艰鍗曠紪鍙凤級
+            //                    $("#HMainSourceInterID").val(LoadData[0].HSourceInterID); //婧愬崟涓诲唴鐮�(鍙栧�糎InterID)
+            //                    $("#HMainSourceEntryID").val(LoadData[0].HSourceEntryID); //婧愬崟瀛愬唴鐮�(婧愬崟琛屽彿)
+            //                    $("#HMainSourceBillType").val(LoadData[0].HSourceBillType); //婧愬崟绫诲瀷
+            //                    $("#HQty").val(LoadData[0].HDatePlanQty); //璁″垝鏁伴噺
+            //                    Qty = LoadData[0].HDatePlanQty;
+            //                }
+            //                else {
+            //                    layer.alert(data.Message, { icon: 5 });
+
+            //                }
+            //            },
+            //            error: function (err) {
+            //                layer.alert(err, { icon: 5 });
+            //            }
+            //        });
+            //}
+            //#endregion
+
+            //缂栬緫
+            function set_EditFromGrid() {
+                refSav = "Update";
+                form.render('select');
+                $.ajax({
+                    url: GetWEBURL() + "Sc_MESTransFerWorkBill/GetOA_WorkLinkBillListCheckDetai",
+                    type: "GET",
+                    async: false,
+                    data: {
+                        "HID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data[0];
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HInterID": data.HInterID
+                                , "HEntryID": data.HEntryID
+                                , "HBillNo": data.HBillNo
+                                , "HDate": formatDate(data.HDate)
+                                , "HContext": data.HContext
+                                , "HSendMan": data.HSendMan
+                                , "HDeptID": data.HDeptID
+                                , "HDeptName": data.HDeptName
+                                , "HReceiveMan": data.HReceiveMan
+                                , "HCopyMan": data.HCopyMan
+                                , "HHasten": data.HHasten
+                                , "HDescriptionMain": data.HDescription
+                                , "HRemark": data.HRemark
+                                , "HEvaluateStatusID": data.HEvaluateStatusID
+                                , "HEvaluateStatusName": data.HEvaluateStatusName
+                                , "HCommDate": formatDate(data.HCommDate)
+                                , "HRelationInterID": data.HRelationInterID                 //鍏宠仈鍗旾D
+                                , "HRelationEntryID": data.HRelationEntryID                 //鍏宠仈鍗曞瓙ID
+                                , "HRelationBillNo": data.HRelationBillNo                   //鍏宠仈鍗曞崟鍙�
+                                , "HRelationBillType": data.HRelationBillType               //鍏宠仈鍗曠被鍨�
+                                , "HMaker": data.HMaker                            //鍒跺崟浜�
+                                , "HMakeDate": data.HMakeDate                      //鍒跺崟鏃ユ湡
+                                , "HUpDater": sessionStorage["HUserName"]             //淇敼浜�
+                                , "HUpDateDate": Format(new Date(), "yyyy-MM-dd hh:mm:ss")//淇敼鏃ユ湡
+                                , "HChecker": data.HChecker             //瀹℃牳浜�
+                                , "HCheckDate": data.HCheckDate   //瀹℃牳鏃ユ湡
+                                , "HCloseMan": data.HCloseMan               //鍏抽棴浜�
+                                , "HCloseDate": data.HCloseDate             //鍏抽棴鏃ユ湡
+                                , "HDeleteMan": data.HDeleteMan             //浣滃簾浜�
+                                , "HDeleteDate": data.HDeleteDate           //浣滃簾鏃ユ湡
+                            });
+                            $('#HLevel').find("option[value='" + data.HLevel + "']").attr("selected", true);
+                            $('#HSendType').find("option[value='" + data.HSendType + "']").attr("selected", true);
+
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+
+            //#region 鏌ヨ鍥炲鍒楄〃
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_MESTransFerWorkBill/GetOA_WorkLinkBillSub',
+                    type: "GET",
+                    data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        for (let i = 0; i < data1.data.length; i++) {
+                            switch (data1.data[i].HSendStatus) {
+                                case 1:
+                                    data1.data[i].HSendStatus = '鏅��';
+                                    break;
+                                case 9:
+                                    data1.data[i].HSendStatus = '缁撴';
+                                    break;
+                                case 10:
+                                    data1.data[i].HSendStatus = '楠岃瘉閫氳繃';
+                                    break;
+                            }
+                            data1.data[i].HDate = formatDate(data1.data[i].HDate);
+                        }
+
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            ins = table.render(option);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == 0) {
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("0");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '4501' },
+                    success: function (d) {
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HInterID").val(d.data[0].HInterID);
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+            }
+
+            //淇濆瓨鎻愪氦
+            form.on('submit(Saver)', function (data) {
+
+                var sMainStr = JSON.stringify(data.field);
+                var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
+                if (!AllowLoadData())//鏁版嵁楠岃瘉
+                {
+                    return false;
+                }
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Sc_MESTransFerWorkBill/SaveOA_WorkLinkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: false,
+                    data: { "msg": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                           /* $("#HInterID").val(data.HInterID);*///鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+                            $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
+                            
+                        }
+                        else {
+                            layer.alert(data.Message, { icon: 5 })
+                        }
+                    },
+                    error: function (err) {
+                        layer.alert(err, { icon: 5 })
+                    }
+                })
+            });
+
+            //瀹℃牳鎸夐挳鎻愪氦
+            form.on('submit(VerIfySaver)', function (data) {
+                SaveVerify();
+            });
+
+            //瀹℃牳鎻愪氦
+            function SaveVerify() {
+                var InterID = $("#HInterID").val();
+                if (!AllowLoadData())//鏁版嵁楠岃瘉
+                {
+                    return false;
+                }
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Sc_MESTransFerWorkBill/AuditOA_WorkLinkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: true,
+                    data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
+                                //layer.close(layer.index);
+                                //window.parent.location.reload();
+                            });
+                        }
+                        else {
+                            layer.alert(data.Message, { icon: 5 })
+                        }
+                    },
+                    error: function (err) {
+                        layer.alert(err, { icon: 5 })
+                    }
+                })
+            }
+
+
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
+            });
+
+            //鍥炲
+            form.on('submit(Reply)', function (data) {
+
+                var sMainStr = JSON.stringify(data.field);
+                var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
+                if (!AllowLoadData())//鏁版嵁楠岃瘉
+                {
+                    return false;
+                }
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Sc_MESTransFerWorkBill/ReplyOA_WorkLinkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: false,
+                    data: { "msg": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            $("#HDescription").val('');
+                            get_Display(sWhere);
+                        }
+                        else {
+                            layer.alert(data.Message, { icon: 5 })
+                        }
+                    },
+                    error: function (err) {
+                        layer.alert(err, { icon: 5 })
+                    }
+                })
+            });
+
+            //楠岃瘉閫氳繃
+            form.on('submit(VerPass)', function (data) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length > 0) {
+                    var HInterID = '';
+                    var HEntryID = '';
+
+                    HInterID = data[0].HInterID;
+                    for (let i = 0; i < data.length; i++) {
+                        HEntryID += data[i].HEntryID + ","
+                    }
+                    HEntryID = HEntryID.substring(0, HEntryID.length - 1);
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sc_MESTransFerWorkBill/UpdateOA_WorkLinkBillSubStatus", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: false,
+                        data: { "HInterID": HInterID, "HEntryID": HEntryID, "Type": 10 },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝                              
+                                get_Display(sWhere);
+                            }
+                            else {
+                                layer.alert(data.Message, { icon: 5 })
+                            }
+                        },
+                        error: function (err) {
+                            layer.alert(err, { icon: 5 })
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨鏁版嵁锛�');
+                }
+            });
+
+            //缁撴
+            form.on('submit(Closed)', function (data) {
+
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length > 0) {
+                    var HInterID = '';
+                    var HEntryID = '';
+
+                    HInterID = data[0].HInterID;
+                    for (let i = 0; i < data.length; i++) {
+                        HEntryID += data[i].HEntryID + ","
+                    }                   
+                    HEntryID = HEntryID.substring(0, HEntryID.length - 1);
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sc_MESTransFerWorkBill/UpdateOA_WorkLinkBillSubStatus", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: false,
+                        data: { "HInterID": HInterID, "HEntryID": HEntryID ,"Type": 9},
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝                              
+                                get_Display(sWhere);
+                            }
+                            else {
+                                layer.alert(data.Message, { icon: 5 })
+                            }
+                        },
+                        error: function (err) {
+                            layer.alert(err, { icon: 5 })
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨鏁版嵁锛�');
+                }
+            });
+
+            //鍙戦�佷汉寮圭獥
+            form.on('submit(HSendManList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鍙戦�佷汉鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/UserInformation.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSendMan").val(checkStatus.data[0].HName);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //鍙戦�侀儴闂�
+            form.on('submit(HDeptList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '閮ㄩ棬鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/DeptInformation.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        $("#HDeptID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+
+            //楠岃瘉璇勪环
+            form.on('submit(HEvaluateStatusList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '楠岃瘉璇勪环鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EvaluateStatusList.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HEvaluateStatusName").val(checkStatus.data[0].楠岃瘉璇勪环鍚嶇О);
+                        $("#HEvaluateStatusID").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(HReceiveManList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鎺ユ敹浜哄垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/transfer.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.transfer.getData('key123'); //鑾峰彇宸插垎閰嶆暟閲�
+                        if (checkStatus.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        if (checkStatus.length > 1) {
+                            return layer.msg('鎺ユ敹浜哄彧鑳戒竴涓�');
+                        }
+                        var value = "";
+                        var title = "";
+                        for (var i = 0; i < checkStatus.length; i++) {
+                            value += checkStatus[i].value + ",";
+                            title += checkStatus[i].title + ",";
+                        }
+                        //鍘绘帀鏈�鍚庝竴涓�楀彿(濡傛灉涓嶉渶瑕佸幓鎺夛紝灏变笉鐢ㄥ啓)
+                        if (value.length > 0) {
+                            value = value.substr(0, value.length - 1);
+                            title = title.substr(0, title.length - 1);
+                        }
+                        $("#HReceiveMan").val(title);
+                        console.log(checkStatus, value, title);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //鎶勯�佷汉
+            form.on('submit(HCopyManList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鎶勯�佷汉鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/transfer.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.transfer.getData('key123'); //鑾峰彇宸插垎閰嶆暟閲�
+                        if (checkStatus.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        var value = "";
+                        var title = "";
+                        for (var i = 0; i < checkStatus.length; i++) {
+                            value += checkStatus[i].value + ",";
+                            title += checkStatus[i].title + ",";
+                        }
+                        //鍘绘帀鏈�鍚庝竴涓�楀彿(濡傛灉涓嶉渶瑕佸幓鎺夛紝灏变笉鐢ㄥ啓)
+                        if (value.length > 0) {
+                            value = value.substr(0, value.length - 1);
+                            title = title.substr(0, title.length - 1);
+                        }
+                        $("#HCopyMan").val(title);
+                        console.log(checkStatus, value, title);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //杞彂鑷�
+            form.on('submit(HReTransmitManList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鎶勯�佷汉鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/transfer.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.transfer.getData('key123'); //鑾峰彇宸插垎閰嶆暟閲�
+                        if (checkStatus.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        var value = "";
+                        var title = "";
+                        for (var i = 0; i < checkStatus.length; i++) {
+                            value += checkStatus[i].value + ",";
+                            title += checkStatus[i].title + ",";
+                        }
+                        //鍘绘帀鏈�鍚庝竴涓�楀彿(濡傛灉涓嶉渶瑕佸幓鎺夛紝灏变笉鐢ㄥ啓)
+                        if (value.length > 0) {
+                            value = value.substr(0, value.length - 1);
+                            title = title.substr(0, title.length - 1);
+                        }
+                        $("#HReTransmitMan").val(title);
+                        console.log(checkStatus, value, title);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //浠ヤ笂涓簂ayui妯″潡
+        });
+
+        function AllowLoadData() {  //闈炵┖楠岃瘉
+            var Result = true;
+            if ($("#HBillNo").val() == '' || $("#HBillNo").val() == null) {
+                layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return Result = false;
+            }
+            if ($("#HDate").val() == '' || $("#HDate").val() == null) {
+                layer.msg("鍗曟嵁鏃ユ湡涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return Result = false;
+            }
+            if ($("#HContext").val() == '' || $("#HContext").val() == null) {
+                layer.msg("涓婚涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return Result = false;
+            }
+            if ($("#HSendMan").val() == '' || $("#HSendMan").val() == null) {
+                layer.msg("鍙戦�佷汉涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return Result = false;
+            }
+            if ($("#HReceiveMan").val() == '' || $("#HReceiveMan").val() == null) {
+                layer.msg("鎺ユ敹浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return Result = false;
+            }
+            if ($("#HDescription").val() == '' || $("#HDescription").val() == null) {
+                layer.msg("鍥炲鍐呭涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return Result = false;
+            }
+            
+            //if (OperationType == "2") {
+            //    if ($("#HMainSourceInterID").val() == '' || $("#HMainSourceInterID").val() == null) {
+            //        layer.msg("婧愬崟鍗曞彿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //        return Result = false;
+            //    }
+            //}
+            //if ($("#HQty").val() > Qty) {
+            //    layer.msg("涓嶈兘澶т簬璁″垝鏁伴噺锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //    return Result = false;
+            //}
+            return Result;
+        }
+        function formatDate(date) {
+            var d = new Date(date),
+                month = '' + (d.getMonth() + 1),
+                day = '' + d.getDate(),
+                year = d.getFullYear();
+
+            if (month.length < 2) month = '0' + month;
+            if (day.length < 2) day = '0' + day;
+
+            return [year, month, day].join('-');
+        }
+
+        function GetHEmpValue(obj) {  //鍙戦�佷汉
+            $("#HSendMan").val(obj[0].鑱屽憳鍚嶇О);
+        }
+        function GetEvaluateStatusValue(obj) {  //鍙戦�佷汉
+
+            $("#HEvaluateStatusName").val(obj[0].楠岃瘉璇勪环鍚嶇О);
+            $("#HEvaluateStatusID").val(obj[0].HItemID);
+        }
+        function GetHDeptNameValue(obj) {  //閮ㄩ棬
+            if (HDeptType == 1) {
+                $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+                $("#HDeptID").val(obj[0].HItemID);
+            } else if (HDeptType == 2) {
+                $("#HRecDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+                $("#HRecDeptID").val(obj[0].HItemID);
+            }
+        }
+        function formatDate(date) {
+            var d = new Date(date),
+                month = '' + (d.getMonth() + 1),
+                day = '' + d.getDate(),
+                year = d.getFullYear();
+
+            if (month.length < 2) month = '0' + month;
+            if (day.length < 2) day = '0' + day;
+
+            return [year, month, day].join('-');
+        }
+    </script>
+</body>
+</html>
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\344\275\234\350\201\224\347\263\273\345\215\225/OA_WorkLinkBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\344\275\234\350\201\224\347\263\273\345\215\225/OA_WorkLinkBillList.html"
new file mode 100644
index 0000000..caa2683
--- /dev/null
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\344\275\234\350\201\224\347\263\273\345\215\225/OA_WorkLinkBillList.html"
@@ -0,0 +1,1119 @@
+锘�<!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/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/HideButton.js"></script>
+    <style type="text/css">
+        input.layui-input.layui-unselect {
+            padding-right: 0;
+        }
+
+        .layui-body {
+            overflow-y: scroll;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">闃呰鐘舵��</label>
+                                    <div class="layui-input-block">
+                                        <select id="HReadFlag" name="HReadFlag" lay-filter="HReadFlag" class="ForFilteringSchemes" style="width:190px;">
+                                            <option value="-1" selected="selected">鍏ㄩ儴</option>
+                                            <option value="0">鏈槄</option>
+                                            <option value="1">宸查槄</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
+                                    </div>
+                                </div>
+
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                                <!--鏄剧ず褰撳墠杩囨护鏂规-->
+                                <div class="layui-inline" style="margin-left:5px;">
+                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+                                </div>
+                                <div class="layui-colla-content">
+                                    <div class="layui-inline">
+                                        <div class="layui-inline">
+                                            <span>鍏朵粬鏉′欢></span>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鍙戦�佷汉</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input ForFilteringSchemes" name="HSendMan" id="HSendMan" style="width:190px;">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">绱ф�ョ▼搴�</label>
+                                        <div class="layui-input-block">
+                                            <select id="HLevel" name="HLevel" class="ForFilteringSchemes" lay-filter="HLevel" style="width:190px;">
+                                                <option value="鍏ㄩ儴" selected="selected">鍏ㄩ儴</option>
+                                                <option value="鏅��">鏅��</option>
+                                                <option value="绱ф��">绱ф��</option>
+                                            </select>
+                                        </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"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Reply"><i class="layui-icon layui-icon-survey"></i>鍥炲</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="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_Refresh"><i class="layui-icon layui-icon-refresh-3"></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>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','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
+                , util = layui.util
+                , soulTable = layui.soulTable
+            //鏌ヨ鏉′欢
+            var sWhere = "";
+            var option = [];
+            var titleData = ["hmainid", "HEntryID", "HDeptID", "HBillStatus","HEvaluateStatusID"];//涓嶉渶瑕佹樉绀�
+            //#endregion
+
+            var HModName = "OA_WorkLinkBillList";
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //杩囨护鏉′欢鐨刢lass绫� 
+            var HClassTag = "ForFilteringSchemes";
+            //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+            window.HModuleName = "宸ヤ綔鑱旂郴鍗曠淮鎶�";
+            //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+            window.HDefaultFilter = "";
+            //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+            window.HInterID_Choose = 0;
+
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            //鏌ヨ
+            get_Display(sWhere);
+            //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+            get_DefaultModule();
+            //#endregion
+
+            //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+                //澶村伐鍏锋爮浜嬩欢
+                table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //鏂板鎸夐挳
+                    case 'btn-Add':set_AddNew();
+                        break;
+                    //缂栬緫鎸夐挳
+                    case 'btn-Edit':set_ShowBill();
+                        break;
+                    //鍥炲鎸夐挳
+                    case 'btn_Reply': set_ReplyBill();
+                        break;                        
+                    //鍒犻櫎鎸夐挳
+                    case 'btn-Delete':set_DeleteBill();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit': set_AuditBill();
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit': set_DeAuditBill();
+                        break; 
+                    //鍏抽棴鎸夐挳        锛�0:鍏抽棴銆�1:鍙嶅叧闂級
+                    case 'btn-Close':
+                        set_CloseBills(0);
+                        break;
+                    //鍙嶅叧闂寜閽�
+                    case 'btn-DeClose':
+                        set_CloseBills(1);
+                        break;
+                    //浣滃簾鎸夐挳        锛�0:浣滃簾銆�1:鍙嶄綔搴燂級
+                    case 'btn-Drop':
+                        set_DropBill(0);
+                        break;
+                    //鍙嶄綔搴熸寜閽�
+                    case 'btn-DeDrop':
+                        set_DropBill(1);
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': set_Refresh();
+                        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;
+                };
+            });
+
+                //閲嶇疆鎸夐挳
+                form.on('submit(btnReSearch)', function (data) {
+                    set_ClearQuery();
+                });
+
+                //鏌ヨ鎸夐挳
+                form.on('submit(btnSearch)', function (data) {
+                    get_FastQuery();
+                });
+            //#endregion
+
+           
+
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                $("#HBeginDate").val(Format(new Date(new Date() - 10000 * 60 * 60 * 24 * 30 * 20), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , totalRow: true
+                    , page: true
+                    , cellMinWidth: 120
+                    , height: 'full-50'
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                    , done: function (res, curr, count) {
+                        soulTable.render(this);
+                    }
+                };
+            }
+            //鍔犺浇缃戞牸
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();//閬僵
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_MESTransFerWorkBill/GetOA_WorkLinkBillList',
+                    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', totalRowText: '鍚堣琛�' });
+                            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;
+                                        case 'long':
+                                        case 'Int32':
+                                        case 'Int64':
+                                        case 'double':
+                                        case 'Decimal':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+                                            break;                                                                                    
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+                                    }
+                                }
+                            }
+
+                            option.cols = [col];
+                            option.data = data1.data;
+                            table.render(option);
+
+                            layer.close(ajaxLoad);
+                            //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 });
+                    }
+                });
+                DisPlay_HideColumn();
+            }
+
+
+            //#region 闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+            //#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 = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            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 (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                            var HBillType = "4501";
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+                        } else {
+                            table.render(option);
+                            var HBillType = "4501";
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#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('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);
+            });
+            //#endregion
+
+            //鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板宸ヤ綔鑱旂郴鍗�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: 'OA_Add_Edit_WorkLinkBill.html?OperationType=1&linterid=&HEntryID=&HSouceBillType=',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        get_FastQuery(table, option);
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            }
+
+            //缂栬緫鍗曟嵁
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+                    if (data[0].HEntryID == null || HEntryID == '') {
+                        var HEntryID = '';
+                    } else {
+                        var HEntryID = data[0].HEntryID.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: 'OA_Add_Edit_WorkLinkBill.html?OperationType=3&linterid=' + HInterID + '&HEntryID=' + 15 + '&HSouceBillType='
+                        , resize: false,
+                        end: function () {
+                            get_FastQuery(table, option);
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
+            //鍥炲鍗曟嵁
+            function set_ReplyBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+                    var HEntryID = data[0].HEntryID.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: 'OA_Reply_WorkLinkBill.html?OperationType=3&linterid=' + HInterID + '&HEntryID=' + HEntryID + '&HSouceBillType='
+                        , resize: false,
+                        end: function () {
+                            get_FastQuery(table, option);
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    var HReadFlag = data[0].闃呰鐘舵��.toString();
+                    if (HReadFlag == "鏈槄") {
+                        //閫昏緫鍒犻櫎鏂规硶
+                        layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                            var wait = layer.load();
+                            $.ajax({
+                                type: "GET",
+                                url: GetWEBURL() + "Sc_MESTransFerWorkBill/DeltetOA_WorkLinkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                                data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
+                                success: function (result) {
+                                    if (result.count == 1) {
+                                        layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                            // 寰楀埌frame绱㈠紩
+                                            var index = layer.getFrameIndex(window.name);
+                                            //鍏抽棴褰撳墠frame
+                                            layer.close(index);
+                                            //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                            window.location.reload();
+                                        });
+
+                                    } else {
+                                        layer.alert(result.code + result.Message, { icon: 5 });
+                                    }
+                                    layer.close(wait);
+                                }, error: function () {
+                                    layer.close(wait);
+                                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                }
+                            });
+                        })
+                    }
+                    else {
+                        layer.msg('宸查槄鍏憡涓嶅厑璁稿垹闄わ紒');
+                    }
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+
+            //鍒锋柊
+            function set_Refresh() {
+                $("#btnSearch").click();
+            }
+
+            function get_FastQuery() {
+                var HStatus = $("#HReadFlag").val();//闃呰鐘舵��
+                var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+                var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+                var HSendMan = $("#HSendMan").val();//鍙戦�佷汉
+                var HLevel = $("#HLevel").val();//绱ф�ョ▼搴�
+                if (HStatus) {
+                    switch (HStatus) {
+                        case '-1':   //鍏ㄩ儴
+                            sWhere += "";
+                            break;
+                        case '0':    //鏈槄
+                            sWhere += " and 闃呰鐘舵�� = '鏈槄'";
+                            break;
+                        case '1':    //宸查槄
+                            sWhere += " and 闃呰鐘舵�� = '宸查槄'";
+                            break;
+                        default:
+                    }
+                }
+                if (HBeginDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
+                }
+                if (HEndDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
+                }
+                if (HSendMan) {
+                    sWhere += " and 鍙戦�佷汉 like '%" + HSendMan + "%'";
+                }
+                if (HLevel) {
+                    switch (HLevel) {
+                        case '鍏ㄩ儴':   //鍏ㄩ儴
+                            sWhere += "";
+                            break;
+                        case '鏅��':    //鏅��
+                            sWhere += " and 绱ф�ョ▼搴� ='鏅��'";
+                            break;
+                        case '绱ф��':    //绱ф��
+                            sWhere += " and 绱ф�ョ▼搴� ='绱ф��'";
+                            break;
+                        default:
+                    }
+                }
+                get_Display(sWhere);
+                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+                sWhere = "";
+            }
+
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $('#HReadFlag').val("-1");
+                $("#HBeginDate").val(Format(new Date(new Date() - 10000 * 60 * 60 * 24 * 30 * 20), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HSendMan").val("");
+                $('#HLevel').val("鏅��");
+                sWhere = "";
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //#region 瀹℃牳鍙嶅鏍�
+            function set_AuditBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HBillStatus = data[0].HBillStatus.toString(); //鍗曟嵁鐘舵��
+                    var HInterID = data[0].hmainid.toString();
+                    if (HBillStatus > 1) {
+                        layer.msg('鍗曟嵁涓嶄负鏈鏍哥姸鎬�,涓嶈兘鍐嶆瀹℃牳锛�');
+                        return false;
+                    }
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sc_MESTransFerWorkBill/AuditOA_WorkLinkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    window.location.reload();
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            function set_DeAuditBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HBillStatus = data[0].鍗曟嵁鐘舵��.toString(); //鍗曟嵁鐘舵��
+                    var InterID = data[0].hmainid.toString();
+                    if (HBillStatus==1) {
+                        layer.msg('鍗曟嵁鏈鏍哥姸鎬�,鏃犻渶鍙嶅鏍革紒');
+                        return false;
+                    }
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sc_MESTransFerWorkBill/AuditOA_WorkLinkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    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_CloseBills(nums) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    layer.confirm("纭瑕佸叧闂悧?", function (index) {
+                        var wait = layer.load();
+                        $.ajax({
+                            url: GetWEBURL() + '/Sc_MESTransFerWorkBill/CloseOA_WorkLinkBill',
+                            type: "GET",
+                            data: { "HInterID": InterID, "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                if (result.count == 1) {
+
+                                    layer.msg(result.Message, { icon: 1 });
+                                    layer.close(wait);
+                                    get_FastQuery();
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+                }
+            }
+            //#endregion
+
+            //#region 浣滃簾/鍙嶄綔搴�
+            function set_DropBill(nums) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    layer.confirm("纭瑕佸叧闂悧?", function (index) {
+                        var wait = layer.load();
+                        $.ajax({
+                            url: GetWEBURL() + '/Sc_MESTransFerWorkBill/DropOA_WorkLinkBill',
+                            type: "GET",
+                            data: { "HInterID": InterID, "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                if (result.count == 1) {
+
+                                    layer.msg(result.Message, { icon: 1 });
+                                    layer.close(wait);
+                                    get_FastQuery();
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+                }
+            }
+            //#endregion
+
+            //鐐瑰嚮琛ㄦ牸鏁版嵁闃呰
+            table.on('rowDouble(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+                var datas = obj.data; //鑾峰緱褰撳墠琛屾暟鎹�
+                
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '闃呰鏄庣粏 ',
+                    closeBtn: false,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../../鐢熶骇绠$悊/寮傚父鍙嶉鍗�/EXecptFeedMessage.html',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (dom) {
+                        var a = $(dom[0]).find("iframe").eq(0).contents();
+                        a.find("h1").html(datas.涓婚);
+                        a.find("span").html(datas.鏃ユ湡);
+                        a.find(".layadmin-text").html(datas.鍐呭);
+                        UpdateMessage(datas.hmainid, datas.HEntryID);
+                    },
+                });
+            });
+
+            //#region 鍙屽嚮杩斿洖鏁版嵁
+            //table.on('rowDouble(mainTable)', function (obj) {
+            //    var data = [];
+            //    data.push(obj.data);
+            //    parent.GetWorkLinkBillValue(data);
+            //    var index = parent.layer.getFrameIndex(window.name);
+            //    parent.layer.close(index);
+            //});
+            //#endregion
+
+            //鏇存柊寮傚父鍙嶉鍗曢槄璇荤姸鎬�
+            function UpdateMessage(HInterID, HEntryID) {
+                $.ajax({
+                    url: GetWEBURL() + 'Sc_MESTransFerWorkBill/UpdateOA_WorkLinkBillFlagMessage',
+                    type: "GET",
+                    data: { "HInterID": HInterID, "HEntryID": HEntryID },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+
+                        } else {
+
+                        }
+                    }, error: function () {
+                        layer.close(index);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+
+            //#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";
+                            //鎵ц鏌ヨ鏂规硶
+                            get_FastQuery()
+                            form.render("select");
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //淇濆瓨鏂规
+            function set_SaveScheme() {
+                var index = layer.open()
+                //鍒ゆ柇鐢ㄦ埛鏄惁鐐瑰嚮浜嗗彸涓婅鐨勨�滃弶鍙封�濆叧闂脊绐楅〉闈�
+                var HIsClose_Manual = false;
+                //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                var Filter = document.getElementsByClassName(HClassTag);
+
+                var HFilterIdList = "";//杩囨护鏉′欢
+                var HFilterIdLists = "";//鎷兼帴澶氫釜杩囨护鏉′欢
+                var HValue = "";//杩囨护鍊�
+                var HElement_type = "";//杩囨护鏍囩绫诲瀷
+
+                for (var i = 0; i < Filter.length; i++) {
+                    HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+                    HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�                    
+                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                }
+
+                //鍘婚櫎鏈熬閫楀彿
+                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                HValue = HValue.substring(0, HValue.length - 1);
+                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                //褰撳墠椤甸潰涓婃病鏈夐�夋嫨杩囨护鏂规锛岃繘鍏ユ柊澧炴柟娉�
+                if (HDefaultFilter == "") {
+                    layer.open({
+                        type: 2
+                        , area: ['40%', '80%']
+                        , title: '杩囨护鏂规'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                        , cancel: function () {
+                            // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+                            HIsClose_Manual = true;
+                        }
+                        , end: function () {
+                            if (HIsClose_Manual != true) {
+                                get_FastQuery();
+                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                                document.getElementById("HFilterScheme_Now").style.display = "block";
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                            }
+                        }
+                    })
+                    layer.close(index)
+                } else {
+                    //褰撳墠椤甸潰宸叉湁杩囨护鏂规锛岀敤鎴烽�夋嫨 鏂板鎴栬�呯紪杈�
+                    layer.confirm('褰撳墠宸查�夋嫨杩囨护鏂规锛屾槸鍚︿慨鏀癸紵璇烽�夋嫨瀵瑰簲鎿嶄綔', {
+                        title: "鎿嶄綔鎻愮ず",
+                        icon: 0,
+                        btn: ['鏂板鏂规', '淇濆瓨淇敼褰撳墠鏂规', '鍙栨秷']
+                    }, function (index, layero) {
+                        //鏂板
+                        layer.open({
+                            type: 2
+                            , area: ['40%', '80%']
+                            , title: '杩囨护鏂规'
+                            , shift: 0//寮瑰嚭鍔ㄧ敾
+                            , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                            , end: function () {
+                                get_FastQuery()
+                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                                document.getElementById("HFilterScheme_Now").style.display = "block";
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                            }
+                        })
+                        layer.close(index)
+                    }, function (index) {
+                        //缂栬緫
+                        var Filter_Edit = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                        HFilterIdList = "";
+                        HFilterIdLists = "";
+                        HValue = "";
+                        HElement_type = "";
+                        for (var i = 0; i < Filter_Edit.length; i++) {
+                            HFilterIdList = Filter_Edit[i].id; //杩囨护鏉′欢ID
+                            HFilterIdLists += Filter_Edit[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                            HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                            HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                        }
+                        //鍘婚櫎鏈熬閫楀彿
+                        HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                        HValue = HValue.substring(0, HValue.length - 1);
+                        HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                        var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 3;
+
+                        //淇敼
+                        $.ajax({
+                            type: "POST",
+                            url: GetWEBURL() + "/Xt_FastICScheme/save", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": sMainSub },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
+                                }
+                                else {
+
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+
+                            }
+                        });
+                        layer.close(index)
+                    }, function (index) {
+                        //鍙栨秷
+                        layer.alert('鍙栨秷')
+                        layer.close(index)
+                    });
+                }
+
+            }
+
+            //璇诲彇鏂规
+            function set_ReadScheme() {
+                var HIsClose_Manual = false;
+                var Filter = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+
+                var HFilterIdList = "";
+                var HFilterIdLists = "";
+                var HValue = "";
+                var HElement_type = "";
+                for (var i = 0; i < Filter.length; i++) {
+                    HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+                    HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                }
+                //鍘婚櫎鏈熬閫楀彿
+                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                HValue = HValue.substring(0, HValue.length - 1);
+                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '杩囨护鏂规鍒楄〃'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName
+                    , cancel: function () {
+                        // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+                        HIsClose_Manual = true;
+                    }
+                    , end: function () {
+                        if (HIsClose_Manual != true) {
+                            get_FastQuery()
+                            form.render("select");
+                        }
+                    }
+                })
+            }
+
+            //#endregion
+
+
+        });
+
+        //#endregion
+
+        //浠ヤ笂鏄痩ayui妯″潡
+        //#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>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index 3386097..aac7368 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -116,91 +116,91 @@
                                                 </select>
                                             </div>
                                         </div>
-                                    </div>
-                                </div>
-                                <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
-                                    <div class="layui-inline">
-                                        <label class="layui-form-label">杩囨护</label>
-                                        <div class="layui-input-block">
-                                            <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
-                                            </select>
+                                        <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">杩囨护</label>
+                                                <div class="layui-input-block">
+                                                    <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <select name="Comparator" id="Comparator" lay-filter="Comparator" class="ForFilteringSchemes" 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 class="layui-inline">
-                                        <select name="Comparator" id="Comparator" lay-filter="Comparator" class="ForFilteringSchemes" style="width:190px;">
-                                            <option value="0" selected="selected"></option>
-                                            <option value="=">=</option>
-                                            <option value=">=">>=</option>
-                                            <option value=">">></option>
-                                            <option value="<="><=</option>
-                                            <option value="<"><</option>
-                                            <option value="<>"><></option>
-                                            <option value="7">鍖呭惈</option>
-                                            <option value="8">宸﹀寘鍚�</option>
-                                            <option value="9">鍙冲寘鍚�</option>
-                                            <option value="10">涓嶅寘鍚�</option>
-                                        </select>
-                                    </div>
-                                    <div class="layui-inline">
-                                        <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
-                                    </div>
-                                </div>
 
-                                <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
-                                    <div class="layui-inline">
-                                        <label class="layui-form-label">杩囨护</label>
-                                        <div class="layui-input-block">
-                                            <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
-                                            </select>
+                                        <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">杩囨护</label>
+                                                <div class="layui-input-block">
+                                                    <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" class="ForFilteringSchemes" style="width:190px;">
+                                                    <option value="0" selected="selected"></option>
+                                                    <option value="=">=</option>
+                                                    <option value=">=">>=</option>
+                                                    <option value=">">></option>
+                                                    <option value="<="><=</option>
+                                                    <option value="<"><</option>
+                                                    <option value="<>"><></option>
+                                                    <option value="7">鍖呭惈</option>
+                                                    <option value="8">宸﹀寘鍚�</option>
+                                                    <option value="9">鍙冲寘鍚�</option>
+                                                    <option value="10">涓嶅寘鍚�</option>
+                                                </select>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+                                            </div>
                                         </div>
-                                    </div>
-                                    <div class="layui-inline">
-                                        <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" class="ForFilteringSchemes" style="width:190px;">
-                                            <option value="0" selected="selected"></option>
-                                            <option value="=">=</option>
-                                            <option value=">=">>=</option>
-                                            <option value=">">></option>
-                                            <option value="<="><=</option>
-                                            <option value="<"><</option>
-                                            <option value="<>"><></option>
-                                            <option value="7">鍖呭惈</option>
-                                            <option value="8">宸﹀寘鍚�</option>
-                                            <option value="9">鍙冲寘鍚�</option>
-                                            <option value="10">涓嶅寘鍚�</option>
-                                        </select>
-                                    </div>
-                                    <div class="layui-inline">
-                                        <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
-                                    </div>
-                                </div>
 
-                                <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
-                                    <div class="layui-inline">
-                                        <label class="layui-form-label">杩囨护</label>
-                                        <div class="layui-input-block">
-                                            <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
-                                            </select>
+                                        <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">杩囨护</label>
+                                                <div class="layui-input-block">
+                                                    <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" style="width:190px;">
+                                                    <option value="0" selected="selected"></option>
+                                                    <option value="=">=</option>
+                                                    <option value=">=">>=</option>
+                                                    <option value=">">></option>
+                                                    <option value="<="><=</option>
+                                                    <option value="<"><</option>
+                                                    <option value="<>"><></option>
+                                                    <option value="7">鍖呭惈</option>
+                                                    <option value="8">宸﹀寘鍚�</option>
+                                                    <option value="9">鍙冲寘鍚�</option>
+                                                    <option value="10">涓嶅寘鍚�</option>
+                                                </select>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+                                            </div>
                                         </div>
                                     </div>
-                                    <div class="layui-inline">
-                                        <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" style="width:190px;">
-                                            <option value="0" selected="selected"></option>
-                                            <option value="=">=</option>
-                                            <option value=">=">>=</option>
-                                            <option value=">">></option>
-                                            <option value="<="><=</option>
-                                            <option value="<"><</option>
-                                            <option value="<>"><></option>
-                                            <option value="7">鍖呭惈</option>
-                                            <option value="8">宸﹀寘鍚�</option>
-                                            <option value="9">鍙冲寘鍚�</option>
-                                            <option value="10">涓嶅寘鍚�</option>
-                                        </select>
-                                    </div>
-                                    <div class="layui-inline">
-                                        <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
-                                    </div>
-                                </div>
+                                </div>                                
                             </div>
                         </div>
                         <!--<div class="layui-tab-item layui-show">-->
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Add_Edit_Kf_ICStockBillMainList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Add_Edit_Kf_ICStockBillMainList.html"
index 34f27b1..8171e64 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Add_Edit_Kf_ICStockBillMainList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Add_Edit_Kf_ICStockBillMainList.html"
@@ -211,7 +211,8 @@
 
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
-
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Inventory" id="get_Inventory"><i class="layui-icon layui-icon-form"></i>搴撳瓨鏌ヨ</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="get_InOutSum" id="get_InOutSum"><i class="layui-icon layui-icon-form"></i>鍑哄叆搴撹褰曟煡璇�</button>
                         </div>
                     </script>
                     <script type="text/html" id="xuhao">
@@ -350,6 +351,12 @@
                 var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
                 console.log(NewRow);
                 switch (obj.event) {
+                    //搴撳瓨鏌ヨ
+                    case 'get_Inventory': get_Inventory();
+                        break;
+                    //鍑哄叆搴撹褰曟煡璇�
+                    case 'get_InOutSum': get_InOutSum();
+                        break;
                     //鏂板涓�琛�
                     case 'btn-AddLine': btnAddLine(NewRow);
                         break;
@@ -431,7 +438,55 @@
                 });
             }
 
-
+            //#region 搴撳瓨鏌ヨ
+            function get_Inventory() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    //寮圭獥鏂规硶
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '搴撳瓨鏌ヨ鍒楄〃'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_ICinventoryQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
+                }
+            }
+            //#endregion
+            //#region 鍑哄叆搴撹褰曟煡璇�
+            function get_InOutSum() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '鍑哄叆搴撹褰曞垪琛�'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_StockInOutSumQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
+                }
+            }
+            //#endregion
             //鏃ユ湡鏍煎紡鍖�
             function formatDate(date) {
                 var d = new Date(date),
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_WorkTaskMoneyBOMBillList.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_WorkTaskMoneyBOMBillList.html"
index ed638ef..ac5fa19 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_WorkTaskMoneyBOMBillList.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_WorkTaskMoneyBOMBillList.html"
@@ -794,13 +794,13 @@
                                 }
                             }
                             table.render(option);
-                            var HBillType = "1100";
+                            var HBillType = "3338";
                             //鍒锋柊鎸夐挳鏄剧ず
                             var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
                             Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                         } else {
                             table.render(option);
-                            var HBillType = "1100";
+                            var HBillType = "3338";
                             //鍒锋柊鎸夐挳鏄剧ず
                             var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
                             Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
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_ProjectMoneyBOMBillList.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_ProjectMoneyBOMBillList.html"
index b9cb656..6eeaf26 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_ProjectMoneyBOMBillList.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_ProjectMoneyBOMBillList.html"
@@ -813,13 +813,13 @@
                                 }
                             }
                             table.render(option);
-                            var HBillType = "1100";
+                            var HBillType = "3339";
                             //鍒锋柊鎸夐挳鏄剧ず
                             var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
                             Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                         } else {
                             table.render(option);
-                            var HBillType = "1100";
+                            var HBillType = "3339";
                             //鍒锋柊鎸夐挳鏄剧ず
                             var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
                             Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Add_Edit_Kf_OtherOutBill.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Add_Edit_Kf_OtherOutBill.html"
index d04c83f..403a80c 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Add_Edit_Kf_OtherOutBill.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Add_Edit_Kf_OtherOutBill.html"
@@ -285,7 +285,8 @@
                         <div class="layui-btn-container">
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
-                           
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Inventory" id="get_Inventory"><i class="layui-icon layui-icon-form"></i>搴撳瓨鏌ヨ</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="get_InOutSum" id="get_InOutSum"><i class="layui-icon layui-icon-form"></i>鍑哄叆搴撹褰曟煡璇�</button>
                         </div>
                     </script>
                     <script type="text/html" id="xuhao">
@@ -420,6 +421,13 @@
                     "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
                 };
                 switch (obj.event) {
+                    //搴撳瓨鏌ヨ
+                    case 'get_Inventory': get_Inventory();
+                        break;
+                    //鍑哄叆搴撹褰曟煡璇�
+                    case 'get_InOutSum': get_InOutSum();
+                        break;
+
                     case 'btn-AddLine':
                         table.cache["mainTable"].push(NewRow);
                         option.data = table.cache["mainTable"];
@@ -623,7 +631,55 @@
 
 
             //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
-
+            //#region 搴撳瓨鏌ヨ
+            function get_Inventory() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    //寮圭獥鏂规硶
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '搴撳瓨鏌ヨ鍒楄〃'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_ICinventoryQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
+                }
+            }
+            //#endregion
+            //#region 鍑哄叆搴撹褰曟煡璇�
+            function get_InOutSum() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '鍑哄叆搴撹褰曞垪琛�'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_StockInOutSumQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
+                }
+            }
+            //#endregion
             //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
             function get_LoginIs() {
                 if (sessionStorage.login != "login") {
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 e97faf3..be083f7 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"
@@ -258,6 +258,8 @@
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Inventory" id="get_Inventory"><i class="layui-icon layui-icon-form"></i>搴撳瓨鏌ヨ</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="get_InOutSum" id="get_InOutSum"><i class="layui-icon layui-icon-form"></i>鍑哄叆搴撹褰曟煡璇�</button>
                         </div>
                     </script>
 
@@ -377,6 +379,13 @@
                     "HOrderPrice": "0", "HWHID": "0", "璋冨叆浠撳簱": "", "HSCWHID": "0", "璋冨嚭浠撳簱": "", "HBatchNo": "", "HRemark": ""
                 };
                 switch (obj.event) {
+                    //搴撳瓨鏌ヨ
+                    case 'get_Inventory': get_Inventory();
+                        break;
+                    //鍑哄叆搴撹褰曟煡璇�
+                    case 'get_InOutSum': get_InOutSum();
+                        break;
+
                     case 'btn-AddLine':
                         table.cache["mainTable"].push(NewRow);
                         option.data = table.cache["mainTable"];
@@ -487,7 +496,55 @@
 
 
             //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
-
+            //#region 搴撳瓨鏌ヨ
+            function get_Inventory() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    //寮圭獥鏂规硶
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '搴撳瓨鏌ヨ鍒楄〃'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_ICinventoryQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
+                }
+            }
+            //#endregion
+            //#region 鍑哄叆搴撹褰曟煡璇�
+            function get_InOutSum() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '鍑哄叆搴撹褰曞垪琛�'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_StockInOutSumQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
+                }
+            }
+            //#endregion
             //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
             function get_LoginIs() {
                 if (sessionStorage.login != "login") {
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 9ce0ff4..47b55df 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"
@@ -447,6 +447,8 @@
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Up"><i class="layui-icon layui-icon-form"></i>涓婄Щ</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Under"><i class="layui-icon layui-icon-form"></i>涓嬬Щ</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Inventory" id="get_Inventory"><i class="layui-icon layui-icon-form"></i>搴撳瓨鏌ヨ</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="get_InOutSum" id="get_InOutSum"><i class="layui-icon layui-icon-form"></i>鍑哄叆搴撹褰曟煡璇�</button>
                         </div>
                     </script>
                     <script type="text/html" id="xuhao">
@@ -816,6 +818,12 @@
                 };
 
                 switch (obj.event) {
+                    //搴撳瓨鏌ヨ
+                    case 'get_Inventory': get_Inventory();
+                        break;
+                    //鍑哄叆搴撹褰曟煡璇�
+                    case 'get_InOutSum': get_InOutSum();
+                        break;
                     //鏂板涓�琛�
                     case 'btn-AddLine': btnAddLine(NewRow);
                         break;
@@ -838,7 +846,55 @@
                 }
             });
             //#endregion
-
+            //#region 搴撳瓨鏌ヨ
+            function get_Inventory() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    //寮圭獥鏂规硶
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '搴撳瓨鏌ヨ鍒楄〃'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_ICinventoryQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
+                }
+            }
+            //#endregion
+            //#region 鍑哄叆搴撹褰曟煡璇�
+            function get_InOutSum() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '鍑哄叆搴撹褰曞垪琛�'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_StockInOutSumQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
+                }
+            }
+            //#endregion
             //#region 琛屽唴浜嬩欢
             table.on('tool(mainTable)', function (obj) {
                 set_GridDelete(obj);   //琛屽唴鍒犻櫎
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBackBillEdit.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBackBillEdit.html"
index 505e9e6..ec413b6 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBackBillEdit.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBackBillEdit.html"
@@ -168,7 +168,8 @@
 
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
-
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Inventory" id="get_Inventory"><i class="layui-icon layui-icon-form"></i>搴撳瓨鏌ヨ</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_InOutSum" id="get_InOutSum"><i class="layui-icon layui-icon-form"></i>鍑哄叆搴撹褰曟煡璇�</button>
                             </div>
                         </script>
                         <script type="text/html" id="xuhao">
@@ -249,6 +250,13 @@
                 var AddRow = table.cache['mainTable'];
                 var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "" };
                 switch (obj.event) {
+                    //搴撳瓨鏌ヨ
+                    case 'get_Inventory': get_Inventory();
+                        break;
+                    //鍑哄叆搴撹褰曟煡璇�
+                    case 'get_InOutSum': get_InOutSum();
+                        break;
+
                     //鏂板涓�琛�
                     case 'btn-AddLine': btnAddLine(NewRow);
                         break;
@@ -262,6 +270,55 @@
                 set_GridDelete(obj);   //琛屽唴鍒犻櫎
                 set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
             });
+            //#region 搴撳瓨鏌ヨ
+            function get_Inventory() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    //寮圭獥鏂规硶
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '搴撳瓨鏌ヨ鍒楄〃'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_ICinventoryQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
+                }
+            }
+            //#endregion
+            //#region 鍑哄叆搴撹褰曟煡璇�
+            function get_InOutSum() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '鍑哄叆搴撹褰曞垪琛�'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_StockInOutSumQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
+                }
+            }
+            //#endregion
             //琛ㄥご淇℃伅浠撳簱寮圭獥
             form.on('submit(WareHouse)', function () {
                 //椤甸潰灞�-鑷畾涔�
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillLEdit.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillLEdit.html"
index 33c47b3..f6b85b7 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillLEdit.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillLEdit.html"
@@ -292,6 +292,8 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Up"><i class="layui-icon layui-icon-form"></i>涓婄Щ</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Under"><i class="layui-icon layui-icon-form"></i>涓嬬Щ</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Inventory" id="get_Inventory"><i class="layui-icon layui-icon-form"></i>搴撳瓨鏌ヨ</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_InOutSum" id="get_InOutSum"><i class="layui-icon layui-icon-form"></i>鍑哄叆搴撹褰曟煡璇�</button>
                             </div>
                         </script>
                         <script type="text/html" id="xuhao">
@@ -393,6 +395,12 @@
                 var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HMaterRuleType":"", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HRate": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HWeight": "0" };
                 console.log(NewRow);
                 switch (obj.event) {
+                    //搴撳瓨鏌ヨ
+                    case 'get_Inventory': get_Inventory();
+                        break;
+                    //鍑哄叆搴撹褰曟煡璇�
+                    case 'get_InOutSum': get_InOutSum();
+                        break;
                     //鏂板涓�琛�
                     case 'btn-AddLine': btnAddLine(NewRow);
                         break;
@@ -412,6 +420,55 @@
             });
             //#endregion
 
+            //#region 搴撳瓨鏌ヨ
+            function get_Inventory() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    //寮圭獥鏂规硶
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '搴撳瓨鏌ヨ鍒楄〃'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_ICinventoryQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
+                }
+            }
+            //#endregion
+            //#region 鍑哄叆搴撹褰曟煡璇�
+            function get_InOutSum() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '鍑哄叆搴撹褰曞垪琛�'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_StockInOutSumQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
+                }
+            }
+            //#endregion
             //#region 琛屽唴浜嬩欢
             table.on('tool(mainTable)', function (obj) {
                 set_GridDelete(obj);   //琛屽唴鍒犻櫎
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBillEdit.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBillEdit.html"
index e67ab74..7a831d8 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBillEdit.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBillEdit.html"
@@ -262,6 +262,8 @@
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Inventory" id="get_Inventory"><i class="layui-icon layui-icon-form"></i>搴撳瓨鏌ヨ</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="get_InOutSum" id="get_InOutSum"><i class="layui-icon layui-icon-form"></i>鍑哄叆搴撹褰曟煡璇�</button>
                         </div>
                     </script>
                     <script type="text/html" id="xuhao">
@@ -414,6 +416,12 @@
                 "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0
                 };
                 switch (obj.event) {
+                    //搴撳瓨鏌ヨ
+                    case 'get_Inventory': get_Inventory();
+                        break;
+                    //鍑哄叆搴撹褰曟煡璇�
+                    case 'get_InOutSum': get_InOutSum();
+                        break;
                     case 'btn-AddLine':
                         table.cache["mainTable"].push(NewRow);
                         option.data = table.cache["mainTable"];
@@ -488,7 +496,55 @@
                 set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
             });
             //#endregion
-
+            //#region 搴撳瓨鏌ヨ
+            function get_Inventory() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    //寮圭獥鏂规硶
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '搴撳瓨鏌ヨ鍒楄〃'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_ICinventoryQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
+                }
+            }
+            //#endregion
+            //#region 鍑哄叆搴撹褰曟煡璇�
+            function get_InOutSum() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '鍑哄叆搴撹褰曞垪琛�'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_StockInOutSumQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
+                }
+            }
+            //#endregion
 
              //#region 鐩戝惉鍗曞厓鏍肩紪杈�  鍗曞厓鏍肩紪杈戝悗 鍙樻洿
             table.on('edit(mainTable)', function (obj) {
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Add_Edit_Kf_OtherInBill.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Add_Edit_Kf_OtherInBill.html"
index 7cf0130..d5c6b11 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Add_Edit_Kf_OtherInBill.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Add_Edit_Kf_OtherInBill.html"
@@ -285,7 +285,8 @@
                         <div class="layui-btn-container">
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
-                           
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Inventory" id="get_Inventory"><i class="layui-icon layui-icon-form"></i>搴撳瓨鏌ヨ</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="get_InOutSum" id="get_InOutSum"><i class="layui-icon layui-icon-form"></i>鍑哄叆搴撹褰曟煡璇�</button>
                         </div>
                     </script>
                     <script type="text/html" id="xuhao">
@@ -420,6 +421,12 @@
                     "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
                 };
                 switch (obj.event) {
+                    //搴撳瓨鏌ヨ
+                    case 'get_Inventory': get_Inventory();
+                        break;
+                    //鍑哄叆搴撹褰曟煡璇�
+                    case 'get_InOutSum': get_InOutSum();
+                        break;
                     case 'btn-AddLine':
                         table.cache["mainTable"].push(NewRow);
                         option.data = table.cache["mainTable"];
@@ -521,7 +528,55 @@
 
 
             //#endregion
-
+            //#region 搴撳瓨鏌ヨ
+            function get_Inventory() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    //寮圭獥鏂规硶
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '搴撳瓨鏌ヨ鍒楄〃'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_ICinventoryQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
+                }
+            }
+            //#endregion
+            //#region 鍑哄叆搴撹褰曟煡璇�
+            function get_InOutSum() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '鍑哄叆搴撹褰曞垪琛�'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_StockInOutSumQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
+                }
+            }
+            //#endregion
 
             //#region 鐩戝惉鍗曞厓鏍肩紪杈�  鍗曞厓鏍肩紪杈戝悗 鍙樻洿
             table.on('edit(mainTable)', function (obj) {
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 85cad7c..dc1cde7 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"
@@ -323,6 +323,8 @@
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Inventory" id="get_Inventory"><i class="layui-icon layui-icon-form"></i>搴撳瓨鏌ヨ</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="get_InOutSum" id="get_InOutSum"><i class="layui-icon layui-icon-form"></i>鍑哄叆搴撹褰曟煡璇�</button>
                         </div>
                     </script>
                     <script type="text/html" id="xuhao">
@@ -463,6 +465,12 @@
                     "HTaxRate": 0, "HTaxPrice": 0, "HlineTotal": 0
                 };
                 switch (obj.event) {
+                    //搴撳瓨鏌ヨ
+                    case 'get_Inventory': get_Inventory();
+                        break;
+                    //鍑哄叆搴撹褰曟煡璇�
+                    case 'get_InOutSum': get_InOutSum();
+                        break;
                     case 'btn-AddLine':
                         table.cache["mainTable"].push(NewRow);
                         option.data = table.cache["mainTable"];
@@ -569,6 +577,55 @@
 
             //#endregion
 
+            //#region 搴撳瓨鏌ヨ
+            function get_Inventory() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    //寮圭獥鏂规硶
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '搴撳瓨鏌ヨ鍒楄〃'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_ICinventoryQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
+                }
+            }
+            //#endregion
+            //#region 鍑哄叆搴撹褰曟煡璇�
+            function get_InOutSum() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '鍑哄叆搴撹褰曞垪琛�'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_StockInOutSumQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
+                }
+            }
+            //#endregion
 
             //#region 鐩戝惉鍗曞厓鏍肩紪杈�  鍗曞厓鏍肩紪杈戝悗 鍙樻洿
             table.on('edit(mainTable)', function (obj) {
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 1ea6423..b4cd5b1 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"
@@ -296,6 +296,8 @@
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Inventory" id="get_Inventory"><i class="layui-icon layui-icon-form"></i>搴撳瓨鏌ヨ</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="get_InOutSum" id="get_InOutSum"><i class="layui-icon layui-icon-form"></i>鍑哄叆搴撹褰曟煡璇�</button>
                         </div>
                     </script>
                     <script type="text/html" id="xuhao">
@@ -480,6 +482,12 @@
                     "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
                 };
                 switch (obj.event) {
+                    //搴撳瓨鏌ヨ
+                    case 'get_Inventory': get_Inventory();
+                        break;
+                    //鍑哄叆搴撹褰曟煡璇�
+                    case 'get_InOutSum': get_InOutSum();
+                        break;
                     case 'btn-AddLine':
                         table.cache["mainTable"].push(NewRow);
                         option.data = table.cache["mainTable"];
@@ -691,7 +699,55 @@
 
 
             //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
-
+            //#region 搴撳瓨鏌ヨ
+            function get_Inventory() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    //寮圭獥鏂规硶
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '搴撳瓨鏌ヨ鍒楄〃'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_ICinventoryQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
+                }
+            }
+            //#endregion
+            //#region 鍑哄叆搴撹褰曟煡璇�
+            function get_InOutSum() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '鍑哄叆搴撹褰曞垪琛�'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_StockInOutSumQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
+                }
+            }
+            //#endregion
             //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
             function get_LoginIs() {
                 if (sessionStorage.login != "login") {

--
Gitblit v1.9.1