From 973ea2ad6cddce47ee4cb25293d4efd85f25a008 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期四, 11 九月 2025 10:26:07 +0800
Subject: [PATCH] 1

---
 WebTM/views/采购管理/应付退款单/YF_PayMentBackBillList.html                    |    3 
 WebTM/views/采购管理/付款单/YF_PayMentBillList.html                          |    2 
 WebTM/views/采购管理/其他应付单/YF_PayMentOtherBillMain.html                   |    2 
 WebTM/views/采购管理/采购申请单/Cg_PORequestBillList.html                      |    2 
 WebTM/views/采购管理/其他应付单/YF_PayMentOtherBillMainList.html               |   10 
 WebTM/views/生产管理/报工台工序/停工恢复单/Sc_MESStopRestoreWorkBill.html           | 1390 ++++++++++++++
 WebTM/views/采购管理/收料通知单/Add_Edit_Cg_POInStockBillList.html             |    2 
 WebTM/views/采购管理/应付单/Cg_PayableBillList.html                          |    2 
 WebTM/views/IpadIndex.html                                            |   44 
 WebTM/views/采购管理/询价单/Sup_AskPriceBillList.html                        |    8 
 WebTM/views/采购管理/收料通知单/Cg_POInStockBillQuery.html                     |    2 
 WebTM/views/采购管理/退料通知单/Add_Edit_Cg_POInStockBackBillList.html         |    2 
 WebTM/views/生产管理/报工台工序/停工恢复单/Sc_MESStopRestoreWorkBillList.html       | 1419 +++++++++++++++
 WebTM/views/车间管理/报表分析/Sc_StationOutVarianceReport.html                |  557 +++++
 WebTM/views/采购管理/付款单/YF_PayMentBill.html                              |    2 
 WebTM/views/采购管理/采购订单变更单/Cg_POOrderChangeBillList.html                |    8 
 WebTM/views/采购管理/应付单/Cg_PayableBillQuery.html                         |    2 
 WebTM/views/基础资料/公用基础资料/xmlLBM_HGy_BarCodeBill_XinDa.aspx.cs          |   17 
 WebTM/views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBillList.html           |   20 
 WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html                            |    3 
 WebTM/views/工资管理/工资报表/Pay_PaymentEntryReport.html                     |    1 
 WebTM/WebTM.csproj.user                                               |    2 
 WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html                         |    2 
 WebTM/views/采购管理/付款单/YF_PayMentBillQuery.html                         |    2 
 WebTM/views/验收入库/外购入库/Kf_POStockInBackBillList.html                   |    2 
 WebTM/views/grf/物料条码_兴达.grf                                           |  327 +++
 WebTM/views/验收入库/外购入库/Kf_POStockInBillListQuery.html                  |    2 
 WebTM/views/采购管理/收料通知单/Cg_POInStockBillList.html                      |    2 
 WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList_XinDa.html                 | 1441 +++++++++++++++
 WebTM/views/采购管理/退料通知单/Cg_POInStockBackBillList.html                  |    2 
 WebTM/views/采购管理/采购申请单/Cg_PORequestBill.html                          |    2 
 WebTM/views/采购管理/应付退款单/YF_PayMentBackBill.html                        |    2 
 WebTM/views/采购管理/报价单/Sup_QuotePriceBillEdit.html                      |  135 
 WebTM/views/采购管理/采购订单/Cg_POOrderBillQuery.html                        |    2 
 WebTM/views/验收入库/外购入库/Kf_POStockInBillList.html                       |    2 
 WebTM/views/基础资料/公用基础资料/xmlLBM_HGy_BarCodeBill_XinDa.aspx.designer.cs |   26 
 WebTM/views/采购管理/委外订单/WW_EntrustOrderBillList.html                    |    2 
 WebTM/views/采购管理/应付单/Cg_PayableBill.html                              |    2 
 WebTM/views/生产管理/宝工排产/Cg_PODemandPlanConfigBillReportForLack.html     |    8 
 WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html                         |    2 
 WebTM/views/工资管理/考勤汇报单/Pay_WorkTimesBillEdit.html                     |    4 
 WebTM/views/采购管理/报价单/Sup_QuotePriceBillList.html                      |   10 
 WebTM/views/采购管理/采购调价单/Cg_POStockInChangeBillList.html                |    7 
 WebTM/views/基础资料/公用基础资料/xmlLBM_HGy_BarCodeBill_XinDa.aspx             |   33 
 WebTM/layuiadmin/Scripts/webConfig.js                                 |    8 
 WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html              |    2 
 WebTM/WebTM.csproj                                                    |   13 
 47 files changed, 5,439 insertions(+), 101 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index b6539b8..9ee1356 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -454,6 +454,7 @@
     <Content Include="views\鍝佽川绠$悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBill_KaiBei.html" />
     <Content Include="views\鍝佽川绠$悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBill.html" />
     <Content Include="views\鍝佽川绠$悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBillList.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_XinDa.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_CheckNoteItem.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_EnvironmentTestItem.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_PiPe.html" />
@@ -654,6 +655,7 @@
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldDotCheckBill_PDA.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldDotCheckBill_PDA_OLD.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldMaintainBill_PDA.html" />
+    <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_BarCodeBillList_XinDa.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_BarCodeBillList_JiaNan.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_MouldFile_Excel.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldMaintainRuleBill_Excel.html" />
@@ -662,6 +664,7 @@
     <Content Include="views\鐢熶骇绠$悊\涓夊崌鎺掍骇\JIT_DayPlanPlatForm.html" />
     <Content Include="views\鐢熶骇绠$悊\涓夊崌鎺掍骇\JIT_DayPlanPlatFormImport_SS_Sec.html" />
     <Content Include="views\鐢熶骇绠$悊\涓夊崌鎺掍骇\JIT_DayPlanPlatFormImport_SS.html" />
+    <Content Include="views\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫鍋滃伐鎭㈠鍗昞Sc_MESStopRestoreWorkBill.html" />
     <Content Include="views\鐢熶骇绠$悊\鍑礉鏃ヨ鍒掑鍏JIT_DayPlanPlatForm_KB.html" />
     <Content Include="views\鐢熶骇绠$悊\鍙戣揣璁″垝骞冲彴锛堜笁鍗囷級\Xs_SendGoodsPlanForm.html" />
     <Content Include="views\鐢熶骇绠$悊\鍙戣揣璁″垝骞冲彴锛堜笁鍗囷級\Xs_SendGoodsPlanImport.html" />
@@ -683,6 +686,7 @@
     <Content Include="views\鐢熶骇绠$悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackSignBill_BrushCard.html" />
     <Content Include="views\鐢熶骇绠$悊\寮傚父鍙嶉鍗昞Sc_MESExecptFeedBackBillResumeList.html" />
     <Content Include="views\鐢熶骇绠$悊\寮傚父鍙嶉鍗昞Sc_MESExecptFeedBackBillType.html" />
+    <Content Include="views\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫鍋滃伐鎭㈠鍗昞Sc_MESStopRestoreWorkBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫寮�宸Sc_SwipeCardStart.html" />
     <Content Include="views\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫寰憰鍝佽褰曞崟\Sc_SubtleFlawBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鎶ュ伐骞冲彴_PDA\IpadIndex_PDA.html" />
@@ -917,6 +921,7 @@
     <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Mes_OrderProcFlowAllReport_ICMO.html" />
     <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Qc_PreventErrMouldCheckReport.html" />
     <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Sc_AllowedPrintProcExchangeBillList.html" />
+    <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Sc_StationOutVarianceReport.html" />
     <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Sc_WorkShopXJICInventoryList.html" />
     <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Sc_OrderDelistingList_Query.html" />
     <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Sc_OEEReport_RunLogs.html" />
@@ -1509,6 +1514,7 @@
     <Content Include="views\grf\鍖呮潯鐮乢杩﹀崡1.grf" />
     <Content Include="views\grf\鎵樻潯鐮乢杩﹀崡1.grf" />
     <Content Include="views\grf\绠辨潯鐮乢杩﹀崡1.grf" />
+    <Content Include="views\grf\鐗╂枡鏉$爜_鍏磋揪.grf" />
     <None Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
     </None>
@@ -2619,6 +2625,13 @@
     <Compile Include="App_Data\MssqlReportData.cs" />
     <Compile Include="App_Data\ReportData.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_XinDa.aspx.cs">
+      <DependentUpon>xmlLBM_HGy_BarCodeBill_XinDa.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_XinDa.aspx.designer.cs">
+      <DependentUpon>xmlLBM_HGy_BarCodeBill_XinDa.aspx</DependentUpon>
+    </Compile>
     <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipFileMainBill.aspx.cs">
       <DependentUpon>xmlLBM_EquipFileMainBill.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 89909e4..ac7d73a 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -4,7 +4,7 @@
     <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
     <NameOfLastUsedPublishProfile>D:\宸ヤ綔浠g爜\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
     <ProjectView>ProjectFiles</ProjectView>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 921fc68..cd91cef 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -5,11 +5,10 @@
     //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
     /*var WEBURL = "http://localhost/API/";             //棰滄檽鍐涙湰鍦伴厤缃�*/
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄤ箰鏈湴閰嶇疆
-    //var WEBURL = "http://localhost:8082/API/";    //鏉滆春鏈湴閰嶇疆
-    var WEBURL = "http://localhost:8082/API/";    //寮犵憺骞挎湰鍦伴厤缃�
-/*    var WEBURL = "http://localhost:81/API/"    //缈佹稕娑涙湰鍦伴厤缃�*/
+    // var WEBURL = "http://localhost:8082/API/";    //鏉滆春鏈湴閰嶇疆
+    /*var WEBURL = "http://localhost:8082/API/";    //寮犵憺骞挎湰鍦伴厤缃�*/
+    var WEBURL = "http://localhost:81/API/"    //缈佹稕娑涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄤ箰鏈湴閰嶇疆
-    //var WEBURL = "http://localhost:81/API/";             // 闄堥晲鍝叉湰鍦伴厤缃�
     //var WEBURL = "http://47.96.97.237/API/";          //鏅轰簯鏈嶅姟鍣�
    /* var WEBURL = "http://localhost:8082/LuBaoAPI/";  //浣欐�濇澃鏈湴閰嶇疆*/
    /* var WEBURL = "http://localhost:81/API/";            // 闄堥晲鍝叉湰鍦伴厤缃�*/
@@ -32,7 +31,6 @@
     //var WEBURL = "http://192.168.6.5:8082/API/";    //鑸滄垚
     /*var WEBURL = "http://121.36.199.126:8181/API/";    //涓夊崌*/
     //var WEBURL = "http://36.134.2.30:200/WEBS-API/";  //閲戝竻
-    //var WEBURL = "http://localhost:81/API";
     //var WEBURL = "http://172.16.1.85/API/";           //杩﹀崡
     return WEBURL
 }
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 2705a43..61a81d5 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -1173,6 +1173,47 @@
             });
         }
 
+
+        // 鍋滃伐鎭㈠鍗�
+        function OpenMESStopRestoreWorkBill() {
+            if (wktag == 0) {
+                layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
+                return false;
+            }
+            if (WorkStaus(HSourceID1, workcode, HSourceInterID, "鍋滃伐鎭㈠")) {
+                layer.alert("鍗曟嵁鐘舵�佷笉婊¤冻鍋滃伐鎭㈠鏉′欢!", { icon: 5 });
+                return false;
+            }
+            layer.open({
+                type: 2,
+                skin: 'layui-layer-rim', //鍔犱笂杈规
+                title: '鏂板鍋滃伐鎭㈠鍗�',
+                closeBtn: 1,
+                shift: 2,
+                area: ['100%', '100%'],
+                maxmin: true,
+                content: '鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/鍋滃伐鎭㈠鍗�/Sc_MESStopRestoreWorkBill.html?OperationType=2&linterid=&HSouceBillType=',
+                end: function () {
+
+                },
+                success: function (dom, index) {
+                    var data = [];
+                    data.push({
+                        "HBillType": HBillType,
+                        "HSourceInterID": HSourceInterID,
+                        "HSourceEntryID": HSourceEntryID,
+                        "HSourceBillNo": HSourceBillNo,
+                        "HSourceBillType": HSourceBillType
+                    });
+
+                    //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+                    var iframe = window['layui-layer-iframe' + index];
+                    //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+                    iframe.edit(data);
+                },
+            });
+        }
+
         //棣栨妫�楠�
         function OpenFistCheck(event, obj) {
             if (wktag == 0) {
@@ -1628,6 +1669,9 @@
                 case "寮�宸�":
                     sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('0','2')";   //鏄惁鏈変笉涓哄紑宸ュ紑宸ョ姸鎬併�佸仠宸ョ姸鎬�
                     break;
+                case "鍋滃伐鎭㈠":
+                    sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus in('2')";   //鏄惁涓哄仠宸ユ寕璧风姸鎬�
+                    break;
                 case "瀹屽伐":
                     sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('1','2')";   //鏄惁鏈変笉涓哄紑宸ャ�佸畬宸ョ姸鎬�
                     break;
diff --git "a/WebTM/views/grf/\347\211\251\346\226\231\346\235\241\347\240\201_\345\205\264\350\276\276.grf" "b/WebTM/views/grf/\347\211\251\346\226\231\346\235\241\347\240\201_\345\205\264\350\276\276.grf"
new file mode 100644
index 0000000..40a2b2c
--- /dev/null
+++ "b/WebTM/views/grf/\347\211\251\346\226\231\346\235\241\347\240\201_\345\205\264\350\276\276.grf"
@@ -0,0 +1,327 @@
+锘縶
+	"Version":"6.8.9.2",
+	"Font":{
+		"Name":"瀹嬩綋",
+		"Size":105000,
+		"Weight":400,
+		"Charset":134
+	},
+	"Printer":{
+		"Size":256,
+		"Width":7,
+		"Height":5,
+		"LeftMargin":0,
+		"TopMargin":0,
+		"RightMargin":0,
+		"BottomMargin":0
+	},
+	"DetailGrid":{
+		"ShowColLine":false,
+		"ShowRowLine":false,
+		"Border":{
+			"Styles":"[]"
+		},
+		"Recordset":{
+			"Field":[
+				{
+					"Name":"鏉$爜缂栧彿",
+					"DBFieldName":"鏉$爜缂栫爜"
+				},
+				{
+					"Name":"瀹℃牳鏃ユ湡",
+					"Type":"DateTime",
+					"Format":"yyyy-MM-dd"
+				},
+				{
+					"Name":"鐗╂枡缂栫爜"
+				},
+				{
+					"Name":"鐗╂枡鍚嶇О"
+				},
+				{
+					"Name":"瑙勬牸鍨嬪彿"
+				},
+				{
+					"Name":"鏀舵枡閫氱煡鍗曠墿鏂欐暟閲�",
+					"Type":"Integer",
+					"DBFieldName":"鏀舵枡閫氱煡鍗曡鐗╂枡鏁伴噺"
+				},
+				{
+					"Name":"褰撳墠鏉$爜鐗╂枡鏁伴噺",
+					"Type":"Integer",
+					"DBFieldName":"褰撳墠鏉$爜瀵瑰簲鐗╂枡鏁伴噺"
+				},
+				{
+					"Name":"璁¢噺鍗曚綅"
+				}
+			]
+		},
+		"Column":[
+			{
+				"Name":"Column1",
+				"Width":6.985
+			}
+		],
+		"ColumnContent":{
+			"Height":5.00063,
+			"ColumnContentCell":[
+				{
+					"Column":"Column1",
+					"FreeCell":true,
+					"Control":[
+						{
+							"Type":"Barcode",
+							"Name":"鍏磋揪浜岀淮鐮�",
+							"Left":5.60917,
+							"Top":0.211667,
+							"Width":0.978958,
+							"Height":0.978958,
+							"BarcodeType":"QRCode",
+							"CaptionPosition":"None",
+							"Text":"[#鏉$爜缂栧彿#]"
+						},
+						{
+							"Type":"StaticBox",
+							"Name":"鏉$爜缂栫爜",
+							"Left":0.211667,
+							"Top":0.211667,
+							"Width":1.19063,
+							"Height":0.582083,
+							"Font":{
+								"Name":"瀹嬩綋",
+								"Size":67500,
+								"Weight":400,
+								"Charset":134
+							},
+							"Text":"鏉$爜缂栫爜: "
+						},
+						{
+							"Type":"MemoBox",
+							"Name":"鏉$爜缂栫爜 鍊�",
+							"Left":1.40229,
+							"Top":0.211667,
+							"Width":3.99521,
+							"Height":0.582083,
+							"Font":{
+								"Name":"瀹嬩綋",
+								"Size":67500,
+								"Weight":400,
+								"Charset":134
+							},
+							"Text":"[#鏉$爜缂栧彿#]"
+						},
+						{
+							"Type":"StaticBox",
+							"Name":"瀹℃牳鏃ユ湡",
+							"Left":0.211667,
+							"Top":0.873125,
+							"Width":2.35479,
+							"Height":0.582083,
+							"Font":{
+								"Name":"瀹嬩綋",
+								"Size":67500,
+								"Weight":400,
+								"Charset":134
+							},
+							"Text":"鏀惰揣閫氱煡鍗曞鏍告棩鏈�: "
+						},
+						{
+							"Type":"StaticBox",
+							"Name":"鐗╂枡缂栫爜 鏍囩",
+							"Left":0.211667,
+							"Top":1.53458,
+							"Width":1.19063,
+							"Height":0.582083,
+							"Font":{
+								"Name":"瀹嬩綋",
+								"Size":67500,
+								"Weight":400,
+								"Charset":134
+							},
+							"Text":"鐗╂枡缂栫爜锛� "
+						},
+						{
+							"Type":"StaticBox",
+							"Name":"鐗╂枡鍚嶇О 鏍囩",
+							"Left":0.211667,
+							"Top":2.19604,
+							"Width":1.19063,
+							"Height":0.582083,
+							"Font":{
+								"Name":"瀹嬩綋",
+								"Size":67500,
+								"Weight":400,
+								"Charset":134
+							},
+							"Text":"鐗╂枡鍚嶇О锛�"
+						},
+						{
+							"Type":"StaticBox",
+							"Name":"瑙勬牸鍨嬪彿 鏍囩",
+							"Left":0.211667,
+							"Top":2.8575,
+							"Width":1.19063,
+							"Height":0.582083,
+							"Font":{
+								"Name":"瀹嬩綋",
+								"Size":67500,
+								"Weight":400,
+								"Charset":134
+							},
+							"Text":"瑙勬牸鍨嬪彿锛�"
+						},
+						{
+							"Type":"StaticBox",
+							"Name":"鏀舵枡閫氱煡鍗曡鐗╂枡鏁伴噺 鏍囩",
+							"Left":0.211667,
+							"Top":3.51896,
+							"Width":2.64583,
+							"Height":0.582083,
+							"Font":{
+								"Name":"瀹嬩綋",
+								"Size":67500,
+								"Weight":400,
+								"Charset":134
+							},
+							"Text":"鏀舵枡閫氱煡鍗曡鐗╂枡鏁伴噺:"
+						},
+						{
+							"Type":"StaticBox",
+							"Name":"褰撳墠鏉$爜瀵瑰簲鐗╂枡鏁伴噺 鏍囩",
+							"Left":0.211667,
+							"Top":4.20688,
+							"Width":2.61938,
+							"Height":0.582083,
+							"Font":{
+								"Name":"瀹嬩綋",
+								"Size":67500,
+								"Weight":400,
+								"Charset":134
+							},
+							"Text":"褰撳墠鏉$爜瀵瑰簲鐗╂枡鏁伴噺锛�"
+						},
+						{
+							"Type":"MemoBox",
+							"Name":"鏀惰揣閫氱煡鍗曞鏍告棩鏈�",
+							"Left":2.59292,
+							"Top":0.873125,
+							"Width":1.79917,
+							"Height":0.582083,
+							"Font":{
+								"Name":"瀹嬩綋",
+								"Size":67500,
+								"Weight":400,
+								"Charset":134
+							},
+							"Text":"[#瀹℃牳鏃ユ湡#]"
+						},
+						{
+							"Type":"MemoBox",
+							"Name":"鐗╂枡缂栫爜",
+							"Left":1.42875,
+							"Top":1.53458,
+							"Width":3.06917,
+							"Height":0.582083,
+							"Font":{
+								"Name":"瀹嬩綋",
+								"Size":67500,
+								"Weight":400,
+								"Charset":134
+							},
+							"Text":"[#鐗╂枡缂栫爜#]"
+						},
+						{
+							"Type":"MemoBox",
+							"Name":"鐗╂枡鍚嶇О",
+							"Left":1.42875,
+							"Top":2.19604,
+							"Width":3.06917,
+							"Height":0.582083,
+							"Font":{
+								"Name":"瀹嬩綋",
+								"Size":67500,
+								"Weight":400,
+								"Charset":134
+							},
+							"Text":"[#鐗╂枡鍚嶇О#]"
+						},
+						{
+							"Type":"MemoBox",
+							"Name":"瑙勬牸鍨嬪彿",
+							"Left":1.42875,
+							"Top":2.8575,
+							"Width":3.06917,
+							"Height":0.582083,
+							"Font":{
+								"Name":"瀹嬩綋",
+								"Size":67500,
+								"Weight":400,
+								"Charset":134
+							},
+							"Text":"[#瑙勬牸鍨嬪彿#]"
+						},
+						{
+							"Type":"MemoBox",
+							"Name":"鏀舵枡閫氱煡鍗曡鐗╂枡鏁伴噺",
+							"Left":2.88396,
+							"Top":3.51896,
+							"Width":3.91583,
+							"Height":0.582083,
+							"Font":{
+								"Name":"瀹嬩綋",
+								"Size":67500,
+								"Weight":400,
+								"Charset":134
+							},
+							"Text":"[#鏀舵枡閫氱煡鍗曠墿鏂欐暟閲�#]([#璁¢噺鍗曚綅#])"
+						},
+						{
+							"Type":"MemoBox",
+							"Name":"褰撳墠鏉$爜瀵瑰簲鐗╂枡鏁伴噺",
+							"Left":2.88396,
+							"Top":4.20688,
+							"Width":3.91583,
+							"Height":0.582083,
+							"Font":{
+								"Name":"瀹嬩綋",
+								"Size":67500,
+								"Weight":400,
+								"Charset":134
+							},
+							"Text":"[#褰撳墠鏉$爜鐗╂枡鏁伴噺#]([#璁¢噺鍗曚綅#])"
+						}
+					]
+				}
+			]
+		},
+		"ColumnTitle":{
+			"Height":0,
+			"ColumnTitleCell":[
+				{
+					"GroupTitle":false,
+					"Column":"Column1",
+					"Font":{
+						"Name":"瀹嬩綋",
+						"Size":120000,
+						"Weight":400,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"Column1"
+				}
+			]
+		}
+	},
+	"ReportHeader":[
+		{
+			"Name":"ReportHeader1",
+			"Height":0
+		}
+	],
+	"ReportFooter":[
+		{
+			"Name":"ReportFooter1",
+			"Height":0
+		}
+	]
+}
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html"
index 38130b9..c60161f 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html"
@@ -155,6 +155,9 @@
             case "HGy_BarCodeBill"://鏉$爜鎵撳嵃
                 CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_HGy_BarCodeBill.aspx?linterid=" + value, true, "");
                 break;
+            case "HGy_BarCodeBill_XinDa"://鏉$爜鎵撳嵃_鍏磋揪
+                CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_HGy_BarCodeBill_XinDa.aspx?linterid=" + value, true, "");
+                break;
             case "HGy_BarCodeBill_JiaNan"://鏉$爜鎵撳嵃_杩﹀崡
                 CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_HGy_BarCodeBill.aspx?linterid=" + value, true, "");
                 break;
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HGy_BarCodeBill_XinDa.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HGy_BarCodeBill_XinDa.aspx"
new file mode 100644
index 0000000..c1360af
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HGy_BarCodeBill_XinDa.aspx"
@@ -0,0 +1,33 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_HGy_BarCodeBill_XinDa.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.xmlLBM_HGy_BarCodeBill_XinDa" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+    <script runat="server"> 
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        //鈽呯壒鍒彁绀衡槄锛�
+        //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
+        //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+
+        //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
+        //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
+        SqlXMLReportData.GenOneRecordset(this, 
+            "select b.HItemID hmainid, b.HQty 褰撳墠鏉$爜瀵瑰簲鐗╂枡鏁伴噺, a.鏁伴噺 鏀舵枡閫氱煡鍗曡鐗╂枡鏁伴噺,b.HBarCode 鏉$爜缂栫爜,"  + 
+	    "Convert(date, a.瀹℃牳鏃ユ湡) 瀹℃牳鏃ユ湡, a.鐗╂枡浠g爜 鐗╂枡缂栫爜, a.鐗╂枡鍚嶇О 鐗╂枡鍚嶇О , a.瑙勬牸鍨嬪彿 瑙勬牸鍨嬪彿, a.璁¢噺鍗曚綅 璁¢噺鍗曚綅 " + 
+	    "from Gy_BarCodeBill b inner join  h_v_IF_POInStockBillList a on a.hmainid = b.HSourceInterID and a.hsubid = b.HSourceEntryID where b.HItemID in ("
+            + Request.Params["linterid"]+ 
+            ") order by hmainid desc");
+    }
+    </script>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <div>
+        </div>
+    </form>
+</body>
+</html>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HGy_BarCodeBill_XinDa.aspx.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HGy_BarCodeBill_XinDa.aspx.cs"
new file mode 100644
index 0000000..c2039dc
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HGy_BarCodeBill_XinDa.aspx.cs"
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebTM.views.鍩虹璧勬枡
+{
+    public partial class xmlLBM_HGy_BarCodeBill_XinDa : System.Web.UI.Page
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+}
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HGy_BarCodeBill_XinDa.aspx.designer.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HGy_BarCodeBill_XinDa.aspx.designer.cs"
new file mode 100644
index 0000000..3713be3
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HGy_BarCodeBill_XinDa.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡
+{
+
+
+    public partial class xmlLBM_HGy_BarCodeBill_XinDa
+    {
+
+        /// <summary>
+        /// form1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+    }
+}
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentEntryReport.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentEntryReport.html"
index a259f2b..b4c470e 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentEntryReport.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentEntryReport.html"
@@ -383,6 +383,7 @@
                                     }
                                     if (item[itemobj].length > 0) {  // 鍋囪瀛楁鍚嶄负field
                                         item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+                                        item[itemobj] = item[itemobj].toString().replace(/,/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
                                     }
                                 }
                             });
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit.html"
index 8976472..5b14c3a 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit.html"
@@ -575,7 +575,7 @@
                         , { field: 'HWorkTypeNumber', title: '宸ョ浠g爜', width: 100, edit: 'text', event: "HWorkTypeNumber" }         //F7
                         , { field: 'HWorkTypeName', title: '宸ョ鍚嶇О', width: 100, style: 'background-color:#efefef4d;' }
                         , { field: 'HPayMoney', title: '灏忔椂宸ヨ祫', width: 100, edit: 'text' }
-                        , { field: 'HMoney', title: '宸ヨ祫', width: 100, edit: 'text', totalRow: true }
+                        , { field: 'HMoney', title: '宸ヨ祫', width: 100,totalRow: true }
                         , { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
                         , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
                     ]]
@@ -1291,12 +1291,14 @@
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
                                 , end: function () {
+                                    console.log(obj.data["HBaseTimes"]);
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
                                         "HWorkTypeID": OptionData.HItemID
                                         , "HWorkTypeNumber": OptionData.宸ョ浠g爜
                                         , "HWorkTypeName": OptionData.宸ョ鍚嶇О
                                         , "HPayMoney": OptionData.灏忔椂宸ヨ祫
+                                        , "HMoney": (obj.data["HBaseTimes"] == "" ? 0 : obj.data["HBaseTimes"])* OptionData.灏忔椂宸ヨ祫
                                     })
                                 }
                             })
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList_XinDa.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList_XinDa.html"
new file mode 100644
index 0000000..da1fd95
--- /dev/null
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList_XinDa.html"
@@ -0,0 +1,1441 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鏉$爜妗f</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/HideButton.js"></script>
+    <script src="../../../layuiadmin/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/MESLanguage.js"></script>
+    <style type="text/css">
+        input.layui-input.layui-unselect {
+            padding-right: 0;
+        }
+
+        /*       .layui-table-cell {
+            height: auto;
+            white-space: normal;
+        } */
+    </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 id="BT_GD">鏇村</span>
+                                    </div>
+                                </div>                               
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" id="BT_HInitTimeCycle">鏃ユ湡闂撮殧</label>
+                                    <div class="layui-input-block">
+                                        <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" id="BT_HBeginDate">寮�濮嬫棩鏈�</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" id="BT_HEndDate">缁撴潫鏃ユ湡</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" id="BT_HBarCode">鏉$爜缂栧彿</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBarCode" id="HBarCode">
+                                    </div>
+                                </div>
+                                <div class="layui-row" style="margin-top: 5px; margin-left: 70px;">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" id="BT_HSourceBillNo">婧愬崟鍗曞彿</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input ForFilteringSchemes" name="HSourceBillNo" id="HSourceBillNo">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" id="BT_HMaterName">鐗╂枡鍚嶇О</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input ForFilteringSchemes" name="HMaterName" id="HMaterName">
+                                        </div>
+                                    </div> <div class="layui-inline">
+                                        <label class="layui-form-label" id="BT_HMaterNumber">鐗╂枡浠g爜</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">缁勭粐鍚嶇О</label>
+                                        <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                            <select name="HUSEORGID" id="HUSEORGID" class="ForFilteringSchemes" lay-verify="HUSEORGID">
+                                                <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                            </select>
+                                        </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 style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+                                </div>                               
+
+                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                    <div class="layui-row" style="margin-top:10px;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" id="BT_ColName">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style=" margin-top: 10px;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" id="BT_ColName1">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style=" margin-top: 10px;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" id="BT_ColName2">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+
+                        <div id="page" style="position:relative;bottom:0;"></div>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-reload" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-view" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Drop" id="set_Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeDrop" id="set_DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="" id="set_HideColumn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-exit" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+                            </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 () {
+            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 ins;
+
+            var titleData = ["鍗曟嵁ID", "HMaterID", "HDeptID", "HSupID", "HItemID", "hmainid", "hsubid", "HInterID", "HUnitID", "HAuxPropID","HSTOCKORGID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var page = 1;//鍒嗛〉鏁版嵁
+            var size = 50;
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //杩囨护鏉′欢鐨刢lass绫�
+            var HClassTag = "ForFilteringSchemes";
+            //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+            window.HModuleName = "鏉$爜涓绘。缁存姢";
+            //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+            window.HDefaultFilter = "";
+            //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+            window.HInterID_Choose = 0;
+
+            //#endregion
+
+            var HModName = "Gy_BarCodeBillList";
+            set_ClearBill();
+
+            //#region 澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumn();
+                        break;
+                    case 'btn-Delete':
+                        var checkStatus = table.checkStatus('mainTable')
+                            , data = checkStatus.data;
+                        if (checkStatus.data.length == 0 || checkStatus.data.length > 300) {
+                            layer.msg(get_MessageError('[0000-1-014]璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁,涓旈�変腑琛屾暟涓嶈兘瓒呰繃300琛岋紒', sessionStorage["HTranSlate"]));
+                            return;
+                        }
+                        var mainid = "";
+                        var BarCode = "";
+                        for (i = 0; i < data.length; i++) {
+                            mainid += data[i].hmainid.toString() + ",";
+                            BarCode += data[i].鏉$爜缂栧彿.toString() + ",";
+                        }
+
+                        mainid = mainid.substring(0, mainid.length - 1)
+                        BarCode = BarCode.substring(0, BarCode.length - 1)
+
+                        var oData = JSON.stringify(mainid) + ";" + sessionStorage["HUserName"] + ";" + JSON.stringify(BarCode);
+
+                        //閫昏緫鍒犻櫎鏂规硶
+                        layer.confirm(get_MessageError("[0000-1-003]纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", sessionStorage["HTranSlate"]), { title: get_MessageError("[0000-2-009]鍒犻櫎纭", sessionStorage["HTranSlate"]) }, function (index) {
+                            $.ajax({
+                                type: "POST",
+                                url: GetWEBURL() + "Gy_MaterialController/DeltetBarCodeBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                                async: false,
+                                data: { "oData": oData },
+                                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(get_MessageError(result.code + result.Message, sessionStorage["HTranSlate"]), { icon: 5 });
+                                    }
+                                }, error: function () {
+                                    layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
+                                }
+                            });
+                        })
+                        break;
+                    case 'btn-print':
+                        var checkStatus = table.checkStatus('mainTable')
+                            , data = checkStatus.data;
+                        if (checkStatus.data.length > 0) {
+                            var rows = '';
+                            for (var i = 0; i < data.length; i++) {
+                                rows += data[i].HItemID.toString() + ',';
+                            }
+                            rows = rows.substring(rows.length - 1, 0);
+                            layer.open({
+                                type: 2
+                                , area: ['40%', '80%']
+                                , title: '鎵撳嵃妯$増閫夋嫨'
+                                , shade: 0.6 //閬僵閫忔槑搴�
+                                , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                                , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + rows + '&MyMsg=' + rows + '&Type=HGy_BarCodeBill_XinDa', 'yes']
+                                , resize: false
+                            })
+                        }
+                        else {
+                            layer.msg(get_MessageError('[0000-1-016]璇烽�夋嫨鏁版嵁鎵撳嵃锛�', sessionStorage["HTranSlate"]));
+                        }
+                        break;
+                    //鍒锋柊
+                    case 'btn-reload':
+                        $("#HBarCode").val("");
+                        $("#HMaterName").val("");
+                        $("#HSourceBillNo").val("");
+                        $("#HMaterNumber").val("");
+                        sWhere = "";
+                        get_DisplayPage(sWhere);
+
+                        break;
+                    //浣滃簾鎸夐挳
+                    case 'set_Drop': set_DropBill(0);
+                        break;
+                    //鍙嶄綔搴熸寜閽�
+                    case 'set_DeDrop': set_DropBill(1);
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'btn-exit': Pub_Close(2);
+                        break;
+                    //鎸夐挳璁剧疆
+                    case 'set_HideButton':
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        var HBillType = "鏉$爜涓绘。";
+                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+                        break;
+                    //瀵煎嚭excel
+                    case 'get_export':
+                        get_Export();
+                        break;
+                    //淇濆瓨鏂规
+                    case 'set_SaveScheme': set_SaveScheme();
+                        break;
+                    //璇诲彇鏂规
+                    case 'set_ReadScheme': set_ReadScheme();
+                        break;
+                };
+            });
+
+
+            //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+            form.on('select(HInitTimeCycle)', function (data) {
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                if (HInitTimeCycle != -1) {
+                    $('#HBeginDate').prop('disabled', true);
+                    $('#HEndDate').prop('disabled', true);
+
+                    $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                    $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+                    //鎵ц鏌ヨ鏂规硶
+                    get_FastQuery();
+                } else {
+                    $('#HBeginDate').prop('disabled', false);
+                    $('#HEndDate').prop('disabled', false);
+                }
+            });
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));  //缁撴潫鏃ユ湡
+                $("#HBarCode").val("");
+                $("#HSourceBillNo").val("");
+                $("#HMaterName").val("");
+                $("#HMaterNumber").val("");
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                form.render('select');
+                 if (page != 1) {
+                    $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+                } 
+                sWhere = "";
+                get_DisplayPage(sWhere);
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+                //initFunction(1, HModName, sessionStorage["HTranSlate"]);
+            });
+            //#endregion
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+                setSelect_HInitTimeCycle();
+                //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                if (HInitTimeCycle != -1) {
+                    $('#HBeginDate').prop('disabled', true);
+                    $('#HEndDate').prop('disabled', true);
+                } else {
+                    $('#HBeginDate').prop('disabled', false);
+                    $('#HEndDate').prop('disabled', false);
+                }
+
+                //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖栫粍缁�
+                Organ1();
+                //鏌ヨ
+                get_FastQuery();
+
+                //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+                get_DefaultModule();
+
+                initFunction(1, HModName, sessionStorage["HTranSlate"]);
+
+
+            }
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-150'
+                    , page: false
+                    , limit: 50
+                    , done: function (res, curr, count) {
+                        soulTable.render(this);
+                    }
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: '鍗曟嵁ID', hide: true, sort: true }
+                        , { field: '鏉$爜绫诲瀷', title: '鏉$爜绫诲瀷', width: 160, sort: true }
+                        , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿', width: 160, sort: true }
+                        , { field: 'HMaterID', title: 'HMaterID', width: 160, hide: true, sort: true }
+                        , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 200, sort: true }
+                        , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 250, sort: true }
+                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 250, sort: true }
+                        , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 200, sort: true }
+                        , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 200, sort: true }
+                        , { field: '鐐夊彿', title: '鐐夊彿', width: 200, sort: true }
+                        , { field: '閽㈠嵎鍙�', title: '閽㈠嵎鍙�', width: 200, sort: true }
+                        , { field: '鏉$爜鐘舵��', title: '鏉$爜鐘舵��', width: 200, sort: true }
+                        , { field: '鍘傚晢', title: '鍘傚晢', width: 200, sort: true }
+                        , { field: '鎹嗗寘鍙�', title: '鎹嗗寘鍙�', width: 200, sort: true }
+                        , { field: '鐢熶骇鏃ユ湡', title: '鐢熶骇鏃ユ湡', width: 200, templet: "<div>{{d.鐢熶骇鏃ユ湡 ==null ?'':layui.util.toDateString(d.鐢熶骇鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+                        , { field: '淇濊川鏈熻嚦', title: '淇濊川鏈熻嚦', width: 200, templet: "<div>{{d.淇濊川鏈熻嚦 ==null ?'':layui.util.toDateString(d.淇濊川鏈熻嚦, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+                        , { field: 'HAuxPropID', title: 'HAuxPropID', width: 200, sort: true }
+                        , { field: '杈呭姪灞炴�т唬鐮�', title: '杈呭姪灞炴�т唬鐮�', width: 160, sort: true }
+                        , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 160, sort: true }
+                        , { field: '鎵瑰彿', title: '鎵瑰彿', width: 160, sort: true }
+                        , { field: '鏁伴噺', title: '鏁伴噺', width: 200, sort: true, totalRow: true }
+                        , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', width: 200, sort: true }
+                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200, sort: true }
+                        , { field: 'HSupID', title: 'HSupID', width: 200, hide: true, sort: true }
+                        , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 200, sort: true }
+                        , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 200, sort: true }
+                        , { field: '杩涙枡鏃ユ湡', title: '杩涙枡鏃ユ湡', width: 200, sort: true }
+                        , { field: '杩涙枡鏃ユ湡鍛�', title: '杩涙枡鏃ユ湡鍛�', width: 115, sort: true }
+                        , { field: '瀹㈡埛鍨嬪彿', title: '瀹㈡埛鍨嬪彿', width: 115, sort: true }
+                        , { field: '寰�鏉ュ崟浣�', title: '寰�鏉ュ崟浣�', width: 200, sort: true }
+                        , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true, sort: true }
+                        , { field: '杞﹂棿', title: '杞﹂棿', width: 115, sort: true }
+                        , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡', width: 200, sort: true }
+                        , { field: '鎷栧彿', title: '鎷栧彿', width: 200, sort: true }
+                        , { field: '鎬绘墭鏁�', title: '鎬绘墭鏁�', width: 200, sort: true, totalRow: true }
+                        , { field: '澶囨敞', title: '澶囨敞', width: 200, sort: true }
+                        , { field: '鍒朵綔浜�', title: '鍒朵綔浜�', width: 115, sort: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+                        , { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟', width: 200, sort: true }
+                        , { field: '浣滃簾鏍囪', title: '浣滃簾鏍囪', width: 200, sort: true }
+                        , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 115, sort: true }
+                        , { field: '鐢熶骇鍏ュ簱鏃ユ湡', title: '鐢熶骇鍏ュ簱鏃ユ湡', width: 200, templet: "<div>{{d.鐢熶骇鍏ュ簱鏃ユ湡 ==null ?'':layui.util.toDateString(d.鐢熶骇鍏ュ簱鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+                        , { field: '閿�鍞嚭搴撴棩鏈�', title: '閿�鍞嚭搴撴棩鏈�', width: 200, templet: "<div>{{d.閿�鍞嚭搴撴棩鏈� ==null ?'':layui.util.toDateString(d.閿�鍞嚭搴撴棩鏈�, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+                    ]]
+                };
+                optionPage = {
+                    elem: 'page', //娉ㄦ剰锛岃繖閲岀殑 page 鏄� ID锛屼笉鐢ㄥ姞 # 鍙�
+                    count: 10000, //鏁版嵁鎬绘暟锛屼粠鏈嶅姟绔緱鍒�
+                    limit: 50,
+                    limits: [50, 500, 5000, 50000],
+                    layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+                    jump: function (obj, first) {                      
+                        //棣栨涓嶆墽琛�
+                        if (!first) {
+                            //do something
+                            page = obj.curr;
+                            size = obj.limit;
+                            // 鍋囪鎸夐挳鏈変竴涓狪D涓�"myButton"
+                            $("#btnSearch").trigger("click");
+                        }
+                    }
+                }
+                laypage.render(optionPage);
+            }
+
+
+            function get_FastQuery() {               
+                var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+                var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+                var HBarCode = $("#HBarCode").val();
+                var HSourceBillNo = $("#HSourceBillNo").val();
+                var HMaterName = $("#HMaterName").val();
+                var HMaterNumber = $("#HMaterNumber").val();
+                var ColName = $("#ColName").val();//澶嶉�夋
+                var Comparator = $("#Comparator").val()
+                var ColContent = $("#ColContent").val();
+                var ColName1 = $("#ColName1").val();//澶嶉�夋
+                var Comparator1 = $("#Comparator1").val()
+                var ColContent1 = $("#ColContent1").val();
+                var ColName2 = $("#ColName2").val();//澶嶉�夋
+                var Comparator2 = $("#Comparator2").val()
+                var ColContent2 = $("#ColContent2").val();
+                if (ColName != 0 && Comparator != 0) {
+                    var com = "";
+                    switch (Comparator) {
+                        case "7":
+                            com = "like ''%" + ColContent + "%''";
+                            break;
+                        case "8":
+                            com = "like ''%" + ColContent + "''";
+                            break;
+                        case "9":
+                            com = "like''" + ColContent + "%''";
+                            break;
+                        case "10":
+                            com = "not like ''%" + ColContent + "%''";
+                            break;
+                        default:
+                            com = "" + Comparator + "''" + ColContent + "''";
+                            break;
+                    }
+                    sWhere += " and " + ColName + " " + com;
+                }
+
+                var com1 = "";
+                if (ColName1 != 0 && Comparator1 != 0) {
+                    switch (Comparator1) {
+                        case "7":
+                            com1 = "like ''%" + ColContent1 + "%''";
+                            break;
+                        case "8":
+                            com1 = "like ''%" + ColContent1 + "''";
+                            break;
+                        case "9":
+                            com1 = "like''" + ColContent1 + "%''";
+                            break;
+                        case "10":
+                            com1 = "not like''%" + ColContent1 + "%''";
+                            break;
+                        default:
+                            com1 = "" + Comparator1 + "''" + ColContent1 + "''";
+                            break;
+                    }
+                    sWhere += " and " + ColName1 + " " + com1;
+                }
+
+                var com2 = "";
+                if (ColName2 != 0 && Comparator2 != 0) {
+                    switch (Comparator) {
+                        case "7":
+                            com2 = "like ''%" + ColContent2 + "%''";
+                            break;
+                        case "8":
+                            com2 = "like''%" + ColContent2 + "''";
+                            break;
+                        case "9":
+                            com2 = "like ''" + ColContent2 + "%''";
+                            break;
+                        case "10":
+                            com2 = "not like ''%" + ColContent2 + "%''";
+                            break;
+                        default:
+                            com2 = "" + Comparator2 + "''" + ColContent2 + "''";
+                            break;
+                    }
+                    sWhere += " and " + ColName2 + " " + com2;
+                }
+                if (HBeginDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= ''" + HBeginDate + "''";
+                }
+                if (HEndDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= ''" + HEndDate + "''";
+                }
+                if (HBarCode) {
+                    sWhere += " and 鏉$爜缂栧彿 like ''%" + HBarCode + "%''";
+                }
+                if (HMaterName) {
+                    sWhere += " and 鐗╂枡鍚嶇О like''%" + HMaterName + "%''";
+                }
+                if (HMaterNumber) {
+                    sWhere += " and 鐗╂枡浠g爜 like''%" + HMaterNumber + "%''";
+                }
+                if (HSourceBillNo) {
+                    sWhere += " and 婧愬崟鍗曞彿 like ''%" + HSourceBillNo + "%''";
+                }
+
+                sWhere += getOrgIDByUser();//鐢ㄦ埛鍏宠仈缁勭粐鏌ヨ杩囨护
+
+                get_DisplayPage(sWhere);
+
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+
+            //#region 鍒嗛〉鏌ヨ
+            function get_DisplayPage(sWhere) {
+                var wait = layer.load();//閬僵
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_BarCodeBillList/page',
+                    type: "GET",
+                    async: false,
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
+                    success: function (data1) {
+                        option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+                        if (data1.code == 1) {
+                            optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left' });
+                            for (var i = 0; i < data.length; i++) {
+                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+                                    }
+                                }
+                            }
+
+
+                            option.cols = [col];
+                            option.data = data1.data;
+                            ins = table.render(option);
+                            laypage.render(optionPage);
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+
+                            layer.close(ajaxLoad);
+                            if ($("#ColName option").length < 1) {
+                                ColFilter();
+                            }
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            option.data = [[]]
+                            table.render(option);
+                            layer.close(ajaxLoad);
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                         layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+             //#endregion
+            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            function get_Display(sWhere) {
+                var index = layer.load(0);
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+                    url: GetWEBURL() + '/Gy_BarCodeBillList/GetBarCodeBillList',
+                    type: "GET",
+                    async: false,
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var data = [];//鍒楀瓧娈垫暟鎹�
+                            var col = [];
+
+                            var totalArray = [];
+
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+                            }
+
+                            //鍒ゆ柇鏄惁鏄函鑻辨枃
+                            var patrn = new RegExp("[\u4E00-\u9FA5]+");
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+                            for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                if ($.inArray(data[i].name, titleData) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑  //璁$畻鍒�
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else if (!patrn.test(data[i].name)) {
+                                    col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
+                                }
+                                else if ($.inArray(data[i].name, totalArray) > -1) { //璁$畻鍒�  
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+                                } else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+
+                            option.cols = [col];
+                            option.data = data1.data;
+                            ins = table.render(option);
+                            layer.close(index);
+
+                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
+                                ColFilter();
+                            }
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                            var HBillType = "鏉$爜涓绘。";
+                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+                        } else {
+                            layer.close(index);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(index);
+                         layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
+                    }
+                });
+                DisPlay_HideColumn();
+            }
+
+            //#region 鍙嶄綔搴�/浣滃簾鏁版嵁
+            function set_DropBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_BarCodeBillList/DeleteGy_BarCodeBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+                        async: false,
+                        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);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    if (get_needClose_Bar == 0) {
+                                        $("#btnSearch").trigger('click');
+                                    } else if (get_needClose_Bar == 1) {
+                                        $("#get_needClose").trigger('click');
+                                    }
+                                });
+
+                            } else {
+                                layer.alert(get_MessageError(result.code + result.Message, sessionStorage["HTranSlate"]), { icon: 5 });
+                            }
+                        }, error: function () {
+                             layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg(get_MessageError('[0000-1-021]璇烽�夋嫨涓�琛屾暟鎹綔搴燂紒', sessionStorage["HTranSlate"]));
+                }
+            }
+            //#endregion
+
+
+            //闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    colName += option.cols[0][i]["field"] + ",";
+                }
+
+                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_New.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+
+            //鏄剧ず鍒楁暟鎹�
+            //function DisPlay_HideColumn() {
+            //    $.ajax({
+            //        url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+            //        type: "GET",
+            //        data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+            //        success: function (data1) {
+            //            if (data1.data.length != 0) {
+
+
+            //                var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                         
+                         
+            //                dataCol = data1.data[0].HGridString.split(',');
+
+            //                for (var i = 0; i < option.cols[0].length - 2; i++) {
+            //                    var dataCols = dataCol[i].split('|');
+            //                    //闅愯棌鍒�
+            //                    if (dataCols[1] == 1) {
+            //                        option.cols[0][i + 1]["hide"] = true;
+            //                    }
+            //                    //璁剧疆鍒楀
+            //                    if (dataCols[3] > 0) {
+            //                        option.cols[0][i + 1]["width"] = dataCols[3];
+            //                    }
+            //                    //璁剧疆鍐呭瀛椾綋澶у皬
+            //                    if (data1.data[0].HFontSize != 0) {
+            //                        option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+            //                    } else {
+            //                        option.cols[0][i + 1]["style"] = "font-size:100%";
+            //                    }
+            //                    //璁剧疆鍒楀
+            //                    //if (data1.data[0].HColumnWidth != 0) {
+            //                    //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+            //                    //} else {
+            //                    //    option.cols[0][i + 1]["width"] = "";
+            //                    //}
+            //                    //鏄剧ず鍒�
+            //                    if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+            //                        option.cols[0][i + 1]["hide"] = false;
+            //                    }
+            //                    //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+            //                    switch (dataCols[2]) {
+            //                        case "L":
+            //                            option.cols[0][i + 1]["align"] = "left";
+            //                            break;
+            //                        case "M":
+            //                            option.cols[0][i + 1]["align"] = "center";
+            //                            break;
+            //                        case "R":
+            //                            option.cols[0][i + 1]["align"] = "right";
+            //                            break;
+            //                    }
+            //                }
+
+            //                //鍙栨秷鍐荤粨鍒�
+            //                for (var i = 1; i < option.cols[0].length - 1; i++) {
+            //                    if (option.cols[0][i]["fixed"] != null) {
+            //                        option.cols[0][i]["fixed"] = null;
+            //                    }
+            //                    else {
+            //                        break;
+            //                    }
+            //                }
+            //                //鍐荤粨鍒�
+            //                if (data1.data[0].HFixCols != 0) {
+            //                    for (var i = 0; i < data1.data[0].HFixCols; i++) {
+            //                        if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+            //                            data1.data[0].HFixCols += 1;
+            //                        }
+            //                        option.cols[0][i + 1]["fixed"] = "left";
+            //                    }
+            //                }
+            //                table.render(option);
+            //            } else {
+            //                table.render(option);
+            //            }
+
+            //            //鍒锋柊鎸夐挳鏄剧ず
+            //            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+            //            var HBillType = "鏉$爜涓绘。";
+            //            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+            //        }, error: function () {
+            //            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+            //        }
+            //    })
+            //}
+
+            //#region 鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    async: false,
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+                            newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
+                            dataCol = data1.data[0].HGridString.split(',');
+                            //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+                            if (dataCol.length == option.cols[0].length - 1) {
+                                //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+                                for (var j = 0; j < option.cols[0].length - 1; j++) {
+                                    for (var i = 0; i < option.cols[0].length - 1; i++) {
+                                        var dataCols = dataCol[j].split('|');
+                                        //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+                                        if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+                                            //闅愯棌鍒�
+                                            if (dataCols[1] == 1) {
+                                                option.cols[0][i + 1]["hide"] = true;
+                                            }
+                                            //璁剧疆鍒楀
+                                            if (dataCols[3] > 0) {
+                                                option.cols[0][i + 1]["width"] = dataCols[3];
+                                            }
+                                            //璁剧疆鍐呭瀛椾綋澶у皬
+                                            if (data1.data[0].HFontSize != 0) {
+                                                option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                            } else {
+                                                option.cols[0][i + 1]["style"] = "font-size:100%";
+                                            }
+                                            //鏄剧ず鍒�
+                                            if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                                option.cols[0][i + 1]["hide"] = false;
+                                            }
+                                            //缁熻鍒�
+                                            if (dataCols[6] == 1) {
+                                                option.cols[0][i + 1]["totalRow"] = true;
+                                            }
+                                            //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                            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;
+                                            }
+                                            //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+                                            if (dataCols[4] != null && dataCols[4] != "") {
+                                                option.cols[0][i + 1]["title"] = dataCols[4];
+                                            }
+                                            newCols[0].push(option.cols[0][i + 1]);
+                                        }
+                                    }
+                                }
+                                //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+                                if (dataCol.length == newCols[0].length - 1) {
+                                    option.cols = newCols;
+                                    //鍙栨秷鍐荤粨鍒�
+                                    for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                        if (option.cols[0][i]["fixed"] != null) {
+                                            option.cols[0][i]["fixed"] = null;
+                                        }
+                                        else {
+                                            break;
+                                        }
+                                    }
+                                    //鍐荤粨鍒�
+                                    if (data1.data[0].HFixCols != 0) {
+                                        for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                            if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                                data1.data[0].HFixCols += 1;
+                                            }
+                                            option.cols[0][i + 1]["fixed"] = "left";
+                                        }
+                                    }
+                                }
+                            }
+                            table.render(option);
+                            
+                        } else {
+                            table.render(option);
+                            
+                        }
+                        //鍒锋柊鎸夐挳鏄剧ず
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        var HBillType = "鏉$爜涓绘。";
+                        Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+                    }, error: function () {
+                         layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 瀵煎嚭Execel
+            function get_Export() {
+                var ModRightNameCheck = "Gy_BarCodeBillList_ExportExcel";
+
+                //閫昏緫瀹℃牳鏂规硶
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: false,
+                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            table.exportFile(ins.config.id, option.data, "xls");
+                        } else {
+                            layer.alert(get_MessageError("[0000-1-048]褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", sessionStorage["HTranSlate"]), { icon: 5 });
+                        }
+                    }, error: function () {
+                         layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+            function setSelect_HInitTimeCycle() {
+                var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
+                var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
+
+                var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >浠绘剰闂撮殧</option>';
+                for (var i = 0; i < valueList.length; i++) {
+                    HInitTimeCycle_ArrayList += '<option  style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
+                }
+
+                $("#HInitTimeCycle").empty();
+                $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
+                form.render('select');
+
+                $("#HInitTimeCycle").val("29");
+            }
+            //#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 浠绘剰瀛楁杩囨护锛氬垪鍚嶆樉绀轰笅鎷夋
+            function ColFilter() {
+                var Organization = '<option  value="0" selected="selected" ></option>';
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    if (option.cols[0][i].hide != true) {
+                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].title + '</option>';
+                    }
+                }
+                $("#ColName").empty();
+                $("#ColName").append(Organization);
+                $("#ColName1").empty();
+                $("#ColName1").append(Organization);
+                $("#ColName2").empty();
+                $("#ColName2").append(Organization);
+                form.render('select');
+            }
+            //#endregion
+
+
+            //#region 鏍规嵁鐢ㄦ埛鑾峰彇鐢ㄦ埛鍏宠仈缁勭粐鐨勮繃婊ゆ潯浠�
+            function getOrgIDByUser() {
+                var res = "";
+                $.ajax({
+                    type: "GET",
+                    async: false,
+                    url: GetWEBURL() + "/Xt_User/getOrgIDListByUser", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�       浼犲弬 缁勭粐蹇呴』鏄垪琛ㄥご閮ㄦ煡璇㈢殑缁勭粐  涓嶈兘浣跨敤鐢ㄦ埛榛樿
+                    data: { "UserID": sessionStorage["Czybm"], "UserName": sessionStorage["HUserName"], HOrgID: $("#HUSEORGID").val() },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            if (result.data[0].sWhere == "1") {
+                                res = " and 鐢熸垚缁勭粐 = '" + $("#HUSEORGID").val() + "'";
+                            } else {
+                                res = result.data[0].sWhere;
+                            }
+                        }
+                    }, error: function (err) {
+                        res = " and 1 = 0";
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+                return res;
+            }
+            //#endregion
+
+            //#region 鑾峰彇缁勭粐
+            function Organ1() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "get",
+                    async: false,
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        var Organization = "";
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].Name + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HUSEORGID").append(Organization);
+                            $("#HUSEORGID").val(sessionStorage["Organization"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
+            function get_DefaultModule() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+                    type: "GET",
+                    async: false,
+                    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);
+                                }
+                            }
+
+                            var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                            //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                            if (HInitTimeCycle != -1) {
+                                $('#HBeginDate').prop('disabled', true);
+                                $('#HEndDate').prop('disabled', true);
+
+                                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+
+                                //鎵ц鏌ヨ鏂规硶
+                                get_FastQuery();
+                            } else {
+                                $('#HBeginDate').prop('disabled', false);
+                                $('#HEndDate').prop('disabled', false);
+                            }
+
+                            //鎵ц鏌ヨ鏂规硶
+                            get_FastQuery()
+                            form.render("select");
+                        } else {
+                            //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
+                            //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
+                            document.getElementById("HFilterScheme_Now").style.display = "none";
+                            ////鎵ц鏌ヨ鏂规硶
+                            //get_FastQuery()
+                            //form.render("select");
+                        }
+                    }, error: function () {
+                         layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { 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(get_MessageError('[0000-1-049]褰撳墠宸查�夋嫨杩囨护鏂规锛屾槸鍚︿慨鏀癸紵璇烽�夋嫨瀵瑰簲鎿嶄綔', sessionStorage["HTranSlate"]), {
+                        title: "鎿嶄綔鎻愮ず",
+                        icon: 0,
+                        btn: [get_MessageError('[0000-1-052]鏂板鏂规', sessionStorage["HTranSlate"]), get_MessageError('[0000-1-053]淇濆瓨淇敼褰撳墠鏂规', sessionStorage["HTranSlate"]), get_MessageError('[0000-1-054]鍙栨秷', sessionStorage["HTranSlate"])]
+                    }, 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: false,
+                            data: { "oMain": sMainSub },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(get_MessageError(data.Message, sessionStorage["HTranSlate"]), { 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
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+
+        //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+        function HFilterScheme(obj)  //杩斿洖杩囨护鏂规
+        {
+            var HInterID = obj[0].hmainid;
+            HInterID_Choose = obj[0].hmainid;
+            $.ajax({
+                url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+                type: "GET",
+                async: false,
+                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(get_MessageError(data1.code + data1.Message, sessionStorage["HTranSlate"]), { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                     layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
+                }
+            });
+        }
+        //#endregion
+
+
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/Cg_PODemandPlanConfigBillReportForLack.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/Cg_PODemandPlanConfigBillReportForLack.html"
index 5836dda..ef1dfc9 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/Cg_PODemandPlanConfigBillReportForLack.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/Cg_PODemandPlanConfigBillReportForLack.html"
@@ -319,13 +319,14 @@
                             option.data = data1.data;
                             ins = table.render(option);
 
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
                             //鍒锋柊鎸夐挳鏄剧ず
                             var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
                             var HBillType = "Cg_PODemandPlanConfigBillReportForLack";
                             Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
 
-                            //鍒锋柊琛ㄦ牸鏁版嵁
-                            DisPlay_HideColumn();
+                            
 
                             layer.close(ajaxLoad);
 
@@ -480,7 +481,7 @@
                     data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
                     success: function (result) {
                         if (result.count == 1) {
-                            var addExportStr = ["渚涘簲鍟嗕唬鐮�"];
+                            var addExportStr = ["渚涘簲鍟嗕唬鐮�","缁勭粐缂栫爜"];
                             var data = option.data;
                             for (var i = 0; i < data.length; i++) {
                                 for (var j = 0; j < addExportStr.length; j++) {
@@ -621,6 +622,7 @@
                 $.ajax({
                     url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                     type: "GET",
+                    async: false,
                     data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                     success: function (data1) {
                         if (data1.data.length != 0) {
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\201\234\345\267\245\346\201\242\345\244\215\345\215\225/Sc_MESStopRestoreWorkBill.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\201\234\345\267\245\346\201\242\345\244\215\345\215\225/Sc_MESStopRestoreWorkBill.html"
new file mode 100644
index 0000000..a4d04fa
--- /dev/null
+++ "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\201\234\345\267\245\346\201\242\345\244\215\345\215\225/Sc_MESStopRestoreWorkBill.html"
@@ -0,0 +1,1390 @@
+锘�<!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="HMaker" name="HMaker" 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">
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">褰撳墠宸ュ簭:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input class="layui-input" name="HProcName"
+                                                                lay-verify="HProcName" id="HProcName" disabled
+                                                                autocomplete="off">
+                                                            <input id="HProcID" name="HProcID" value="0"
+                                                                type="hidden" />
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-form-item">
+                                                    <label class="layui-form-label">宸ュ簭娴佽浆鍗�:</label>
+                                                    <div class="layui-input-inline">
+                                                        <input type="text" name="HProcExchBillNo" id="HProcExchBillNo"
+                                                            class="layui-input" value=""
+                                                            style="float:left;width:150px;">
+                                                        <input type="hidden" name="HProcExchInterID"
+                                                            id="HProcExchInterID" class="layui-input" value="0"
+                                                            style="float:left;width:150px;">
+                                                        <input type="hidden" name="HProcExchEntryID"
+                                                            id="HProcExchEntryID" class="layui-input" value="0"
+                                                            style="float:left;width:150px;">
+                                                        <button type="button" lay-submit="" class="layui-btn"
+                                                            lay-filter="HProcExchList" id="HProcExchList"
+                                                            style="width:40px;">
+                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"
+                                                                style="margin-left:-9px;"></i>
+                                                        </button>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-form-item">
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">浜у搧浠g爜</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="text" name="HMaterCode" id="HMaterCode"
+                                                                class="layui-input" value=""
+                                                                style="float:left;width:150px;">
+                                                            <input type="hidden" name="HMaterID" id="HMaterID"
+                                                                class="layui-input" value="0"
+                                                                style="float:left;width:150px;">
+                                                            <button type="button" lay-submit="" class="layui-btn"
+                                                                lay-filter="HMaterList" id="HMaterList"
+                                                                style="width:40px;">
+                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"
+                                                                    style="margin-left:-9px;"></i>
+                                                            </button>
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">浜у搧鍚嶇О:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input class="layui-input" name="HMaterName"
+                                                                lay-verify="HMaterName" id="HMaterName"
+                                                                autocomplete="off">
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">瑙勬牸鍨嬪彿:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input class="layui-input" name="HMaterSpec"
+                                                                lay-verify="HMaterSpec" id="HMaterSpec"
+                                                                autocomplete="off">
+                                                        </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="HSourceName" id="HSourceName"
+                                                                class="layui-input" value=""
+                                                                style="float:left;width:150px;">
+                                                            <input type="hidden" name="HSourceID" id="HSourceID"
+                                                                class="layui-input" value="0"
+                                                                style="float:left;width:150px;">
+                                                            <button type="button" lay-submit="" class="layui-btn"
+                                                                lay-filter="HSourceList" id="HSourceList"
+                                                                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="HICMOBillNo"
+                                                                lay-verify="HICMOBillNo" id="HICMOBillNo"
+                                                                autocomplete="off">
+                                                            <input id="HICMOInterID" name="HICMOInterID" type="hidden"
+                                                                value="0" />
+                                                            <input id="HICMOEntryID" name="HICMOEntryID" type="hidden"
+                                                                value="0" />
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">婧愬崟鍗曞彿</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="text" name="HMainSourceBillNo"
+                                                                id="HMainSourceBillNo" class="layui-input" value=""
+                                                                style="float:left;width:150px;">
+                                                            <input type="hidden" name="HMainSourceInterID"
+                                                                id="HMainSourceInterID" class="layui-input" value="0"
+                                                                style="float:left;width:150px;">
+                                                            <input type="hidden" name="HMainSourceBillType"
+                                                                id="HMainSourceBillType" class="layui-input" value="">
+                                                            <button type="button" lay-submit="" class="layui-btn"
+                                                                lay-filter="XDHList" id="XDHList" 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">
+                                                            <input class="layui-input" name="HBeginWorkTime"
+                                                                id="HBeginWorkTime" autocomplete="off"
+                                                                model="datetime" dateFormat="yyyy-MM-dd"
+                                                                placeholder="yyyy-MM-dd">
+                                                        </div>
+                                                    </div>
+                                                    <!-- <div class="layui-inline">
+                                                        <label class="layui-form-label">棰勮缁撴潫鏃堕棿:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input class="layui-input" name="HStopEndWorkTime"
+                                                                id="HStopEndWorkTime" autocomplete="off"
+                                                                model="datetime" dateFormat="yyyy-MM-dd"
+                                                                placeholder="yyyy-MM-dd">
+                                                        </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="HMainSourceEntryID"
+                                                                lay-verify="HMainSourceEntryID" id="HMainSourceEntryID"
+                                                                value="0" autocomplete="off" disabled>
+                                                        </div>
+                                                    </div>
+                                                    <!-- <div class="layui-inline">
+                                                        <label class="layui-form-label">鐢熶骇鐝:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="text" name="HWorkShiftName" id="HWorkShiftName"
+                                                                class="layui-input" value=""
+                                                                style="float:left;width:150px;">
+                                                            <input type="hidden" name="HWorkShiftID" id="HWorkShiftID"
+                                                                class="layui-input" value="0"
+                                                                style="float:left;width:150px;">
+                                                            <button type="button" lay-submit="" class="layui-btn"
+                                                                lay-filter="HWorkShiftList" id="HWorkShiftLists"
+                                                                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">
+                                                            <input type="text" name="HGroupName" id="HGroupName"
+                                                                class="layui-input" value=""
+                                                                style="float:left;width:150px;">
+                                                            <input type="hidden" name="HGroupID" id="HGroupID"
+                                                                class="layui-input" value="0"
+                                                                style="float:left;width:150px;">
+                                                            <button type="button" lay-submit="" class="layui-btn"
+                                                                lay-filter="HGroupList" id="HGroupList"
+                                                                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="HEmpName" id="HEmpName"
+                                                                class="layui-input" value=""
+                                                                style="float:left;width:150px;">
+                                                            <input type="hidden" name="HEmpID" id="HEmpID"
+                                                                class="layui-input" value="0"
+                                                                style="float:left;width:150px;">
+                                                            <button type="button" lay-submit="" class="layui-btn"
+                                                                lay-filter="HEmpList" id="HEmpList" 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="HDeptName" id="HDeptName"
+                                                                class="layui-input" value=""
+                                                                style="float:left;width:150px;">
+                                                            <input type="hidden" name="HDeptID" id="HDeptID"
+                                                                class="layui-input" value="0"
+                                                                style="float:left;width:150px;">
+                                                            <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>
+                                                <div class="layui-form-item">
+                                                    <div class="layui-inline">
+                                                        <!-- <label class="layui-form-label">鍋滃伐绫诲瀷</label>
+                                                        <div class="layui-input-inline">
+                                                            <div class="layui-form">
+                                                                <div class="layui-form-item">
+                                                                    <select name="HStopType" id="HStopType"
+                                                                        lay-verify="HStopType">
+                                                                        <option value="">璇烽�夋嫨鍋滃伐鍘熷洜</option>
+                                                                        <option value="妯″叿淇濆吇">妯″叿淇濆吇</option>
+                                                                        <option value="鏂枡">鏂枡</option>
+                                                                        <option value="浜哄憳涓嶈冻">浜哄憳涓嶈冻</option>
+                                                                        <option value="鍋滄皵">鍋滄皵</option>
+                                                                        <option value="鍋滄按">鍋滄按</option>
+                                                                        <option value="鍋滅數">鍋滅數</option>
+                                                                        <option value="妯″叿鏁呴殰">妯″叿鏁呴殰</option>
+                                                                        <option value="鐩戞帶鎶ヨ">鐩戞帶鎶ヨ</option>
+                                                                        <option value="鑷姩鍖栨晠闅�">鑷姩鍖栨晠闅�</option>
+                                                                        <option value="娉ㄥ鏈烘晠闅�">娉ㄥ鏈烘晠闅�</option>
+                                                                        <option value="灏哄寮傚父">灏哄寮傚父</option>
+                                                                        <option value="璁″垝鍋滄満">璁″垝鍋滄満</option>
+                                                                        <option value="澶栬涓嶈壇璋冩満">澶栬涓嶈壇璋冩満</option>
+                                                                        <option value="妯″叿娓呮磥">妯″叿娓呮磥</option>
+                                                                        <option value="妯℃俯鏈烘晠闅�">妯℃俯鏈烘晠闅�</option>
+                                                                        <option value="鐑樻枡鏈烘晠闅�">鐑樻枡鏈烘晠闅�</option>
+                                                                    </select>
+                                                                </div>
+                                                            </div>
+                                                        </div> -->
+                                                        <div class="layui-inline">
+                                                            <label class="layui-form-label">鍋滃伐鍘熷洜</label>
+                                                            <div class="layui-input-inline">
+                                                                <textarea placeholder="璇疯緭鍏ュ師鍥�" class="layui-textarea"
+                                                                    name="HStopReason" id="HStopReason"></textarea>
+                                                            </div>
+                                                        </div>
+                                                        <div class="layui-inline">
+                                                            <label class="layui-form-label">澶囨敞</label>
+                                                            <div class="layui-input-inline">
+                                                                <textarea placeholder="璇疯緭鍏ュ娉�" class="layui-textarea"
+                                                                    name="HRemark" id="HRemark"></textarea>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <div class="layui-inline">
+                                                            <label class="layui-form-label">閫�鍥炲師鍥�</label>
+                                                            <div class="layui-input-inline">
+                                                                <textarea disabled placeholder="" class="layui-textarea"
+                                                                    name="HRemark" id="HRemark"></textarea>
+                                                            </div>
+                                                        </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" 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" 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" 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 class="layui-inline">
+                                                        <label class="layui-form-label">閫�鍥炰汉:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="text" class="layui-input" name="HBacker"
+                                                                id="HBacker" 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" 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" 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="HBackDate"
+                                                                id="HBackDate" style="background-color:#efefef4d;"
+                                                                dateFormat="yyyy-MM-dd" disabled>
+                                                        </div>
+                                                    </div>
+
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+        //鑾峰彇鍙傛暟
+        var OptionData = [];
+        var HBillType = "";  //鍗曟嵁绫诲瀷
+        var HSourceInterID = ""; //婧愬崟涓诲唴鐮�
+        var HSourceEntryID = "";  //婧愬崟瀛愬唴鐮�
+        var HSourceBillNo = "";   //婧愬崟鍗曞彿
+        var HSourceBillType = "";  //婧愬崟绫诲瀷
+        var refSav = "";   //鎻愪氦绫诲瀷
+        //鑾峰彇椤甸潰璺宠浆鍙傛暟  //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSBillType = params[params[2]];//婧愬崟绫诲瀷
+        }
+
+
+        var edit = function (data) {
+            HBillType = data[0].HBillType;
+            HSourceInterID = data[0].HSourceInterID;
+            HSourceEntryID = data[0].HSourceEntryID;
+            HSourceBillNo = data[0].HSourceBillNo;
+            HSourceBillType = data[0].HSourceBillType;
+
+        }
+
+
+        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;
+            var HCenterID = "0";
+            //#endregion
+
+            // #region 椤甸潰鍒濆鍖�
+            //鍒濆鍖栬〃鍗曟彃浠�
+            set_InitFrom();
+
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                $("#HEmpID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛業D
+                $("#HEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛�
+                $("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
+                $("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
+                HCenterID = sessionStorage["HWorkCenterID"]; //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭宸ヤ綔涓績ID
+                set_AddFNew();
+                //鑾峰彇褰撳墠鐝
+                get_HWorkShift();
+            }
+            else if (OperationType == 2) {//鏈夋簮鍗�
+                $("#HEmpID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛業D
+                $("#HEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛�
+                $("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
+                $("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
+                HCenterID = sessionStorage["HWorkCenterID"]; //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭宸ヤ綔涓績ID
+                set_AddNew();
+                //鑾峰彇褰撳墠鐝
+                get_HWorkShift();
+            }
+            else if (OperationType == 3) {//缂栬緫
+
+                set_EditFromGrid();
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+
+            //#endregion
+
+            // #region 椤甸潰鍔犺浇鎵�鏈夋柟娉�
+            //鍒濆鍖栨彃浠�
+            function set_InitFrom() {
+                //鏃ユ湡鏃堕棿閫夋嫨鍣�
+                laydate.render({
+                    elem: '#HStopBeginWorkTime'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HBeginWorkTime'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HStopEndWorkTime'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HMakeDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HUpDateDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HCheckDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HCloseDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HDeleteDate'
+                    , type: 'datetime'
+                });
+            }
+
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
+
+            }
+
+            //鏈夋簮鍗曟柊澧�
+            function set_AddNew() {
+                refSav = "Add";
+                //鍒濆鍩烘湰淇℃伅璧嬪��
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
+                $("#HStopBeginWorkTime").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //寮�濮嬫椂闂�
+                $("#HStopEndWorkTime").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //鏈夐璁$粨鏉熸椂闂�
+                $("#HBeginWorkTime").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"]);     //鍒跺崟浜�
+
+
+                //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
+                $('#HProcName').attr("disabled", true);
+                $('#HMaterCode').attr("disabled", true);
+                $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#HMaterName').attr("disabled", true);
+                $('#HMaterSpec').attr("disabled", true);
+                $('#HStopBeginWorkTime').attr("disabled", true);
+                $('#HSourceName').attr("disabled", true);
+                $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#HMainSourceBillNo').attr("disabled", true);
+                $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#HICMOBillNo').attr("disabled", true);
+                $('#HDeptName').attr("disabled", true);
+                $('#HDeptList').addClass("layui-btn-disabled").attr("disabled", true);
+
+                $.ajax(
+                    {
+                        type: "GET",
+                        url: GetWEBURL() + "/Sc_MESBeginWorkBill/GetMESBeginWorkFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: false,
+                        data: {
+                            "HSourceInterID": HSourceInterID,
+                            "HSourceEntryID": HSourceEntryID,
+                            "HSourceBillNo": HSourceBillNo,
+                            "HSourceBillType": HBillType
+                        },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            {
+                                var LoadData = data.data.h_p_JIT_GetInfoByICMOStatusInterID;
+
+                                $("#HProcID").val(LoadData[0].HProcID); //褰撳墠宸ュ簭ID
+                                $("#HProcName").val(LoadData[0].HProcName); //褰撳墠宸ュ簭
+                                $("#HMaterID").val(LoadData[0].HMaterID); //浜у搧ID
+                                $("#HMaterCode").val(LoadData[0].HMaterNumber); //浜у搧浠g爜
+                                $("#HMaterName").val(LoadData[0].HMaterName); //浜у搧鍚嶇О
+                                $("#HMaterSpec").val(LoadData[0].HModel); //浜у搧瑙勬牸
+                                $("#HSourceID").val(LoadData[0].HSourceID); //鐢熶骇璧勬簮ID
+                                $("#HSourceName").val(LoadData[0].HSourceName); //鐢熶骇璧勬簮
+                                $("#HMainSourceBillNo").val(LoadData[0].HICMOBillNo); //婧愬崟鍗曞彿锛堟殏鏃跺彇鍊艰鍗曠紪鍙凤級
+                                $("#HMainSourceInterID").val(LoadData[0].HSourceInterID); //婧愬崟涓诲唴鐮�(鍙栧�糎InterID)
+                                $("#HMainSourceEntryID").val(LoadData[0].HSourceEntryID); //婧愬崟瀛愬唴鐮�(婧愬崟琛屽彿)
+                                $("#HMainSourceBillType").val(HSourceBillType); //婧愬崟绫诲瀷
+                                $("#HDeptID").val(LoadData[0].HDeptID); //杞﹂棿ID
+                                $("#HDeptName").val(LoadData[0].HDeptName); //杞﹂棿
+                                $("#HICMOInterID").val(LoadData[0].HICMOInterID); //鐢熶骇璁㈠崟ID
+                                $("#HICMOEntryID").val(LoadData[0].HICMOEntryID); //鐢熶骇璁㈠崟瀛怚D
+                                $("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //鐢熶骇璁㈠崟
+                                HCenterID = LoadData[0].HCenterID == null ? sessionStorage["HWorkCenterID"] : LoadData[0].HCenterID;//宸ヤ綔涓績id
+                            }
+                            else {
+                                layer.alert(data.Message, { icon: 5 });
+
+                            }
+                        },
+                        error: function (err) {
+                            layer.alert(err, { icon: 5 });
+                        }
+                    });
+            }
+
+            //缂栬緫
+            function set_EditFromGrid() {
+                refSav = "Update";
+                //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
+                $('#HProcName').attr("disabled", true);
+                $('#HMaterCode').attr("disabled", true);
+                $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#HMaterName').attr("disabled", true);
+                $('#HMaterSpec').attr("disabled", true);
+                $('#HStopBeginWorkTime').attr("disabled", true);
+                $('#HSourceName').attr("disabled", true);
+                $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#HMainSourceBillNo').attr("disabled", true);
+                $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#HICMOBillNo').attr("disabled", true);
+                $('#HDeptName').attr("disabled", true);
+                $('#HDeptList').addClass("layui-btn-disabled").attr("disabled", true);
+
+                $.ajax({
+                    url: GetWEBURL() + "/Sc_MESStopRestoreWorkBill/GetProcessReportList",
+                    type: "GET",
+                    data: {
+                        sWhere: ' and hmainid = ' + 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.hmainid
+                                , "HBillNo": data.鍗曟嵁鍙�
+                                , "HDate": formatDate(data.鏃ユ湡)
+                                , "HProcID": data.HProcID
+                                , "HProcName": data.鐢熶骇璧勬簮
+                                , "HMaterID": data.HMaterID
+                                , "HMaterCode": data.浜у搧浠g爜
+                                , "HMaterName": data.浜у搧鍚嶇О
+                                , "HMaterSpec": data.瑙勬牸鍨嬪彿
+                                , "HBeginWorkTime": Format(data.鍋滃伐鎭㈠鏃堕棿, "yyyy-MM-dd hh:mm:ss")
+                                , "HSourceID": data.HSourceID              //璧勬簮ID
+                                , "HSourceName": data.鐢熶骇璧勬簮             //璧勬簮鍚嶇О
+                                , "HEmpID": data.HEmpID                   //鎿嶄綔鍛業D
+                                , "HEmpName": data.鐢宠澶嶅伐浜哄憳           //鎿嶄綔鍛�
+                                , "HMainSourceInterID": data.HMainSourceInterID                 //婧愬崟ID
+                                , "HMainSourceEntryID": data.HMainSourceEntryID                 //婧愬崟瀛怚D(琛屽彿)
+                                , "HMainSourceBillNo": data.HMainSourceBillNo                 //婧愬崟鍗曞彿
+                                , "HMainSourceBillType": data.HMainSourceBillType               //婧愬崟绫诲瀷
+                                , "HGroupID": data.HGroupID                //鐝粍ID
+                                , "HGroupName": data.鐢熶骇鐝粍              //鐝粍鍚嶇О
+                                , "HDeptID": data.HDeptID                  //閮ㄩ棬ID
+                                , "HDeptName": data.閮ㄩ棬鍚嶇О               //閮ㄩ棬鍚嶇О
+                                , "HICMOInterID": data.HICMOInterID                       //鐢熶骇璁㈠崟涓籌D
+                                , "HICMOEntryID": data.HICMOEntryID                        //鐢熶骇璁㈠崟瀛怚D
+                                , "HICMOBillNo": data.HICMOBillNo                        //鐢熶骇璁㈠崟
+                                , "HStopType": data.鍋滃伐鍘熷洜                         //鍋滃伐鍘熷洜
+                                , "HStopReason": data.鍋滃伐鍘熷洜鎻忚堪                         //鍋滃伐鍘熷洜
+                                , "HRemark": data.澶囨敞                            //澶囨敞
+                                , "HMaker": data.鍒跺崟浜�                            //鍒跺崟浜�
+                                , "HMakeDate": data.鍒跺崟鏃ユ湡                          //鍒跺崟鏃ユ湡
+                                , "HUpDater": sessionStorage["HUserName"]             //淇敼浜�
+                                , "HUpDateDate": Format(new Date(), "yyyy-MM-dd hh:mm:ss")//淇敼鏃ユ湡
+                                , "HChecker": data.瀹℃牳浜�             //瀹℃牳浜�
+                                , "HCheckDate": data.瀹℃牳鏃ユ湡   //瀹℃牳鏃ユ湡
+                                , "HCloseMan": data.鍏抽棴浜�                //鍏抽棴浜�
+                                , "HCloseDate": data.鍏抽棴鏃ユ湡             //鍏抽棴鏃ユ湡
+                                , "HDeleteMan": data.浣滃簾浜�               //浣滃簾浜�
+                                , "HDeleteDate": data.浣滃簾鏃ユ湡       //浣滃簾鏃ユ湡
+                                , "HProcExchBillNo": data.宸ュ簭娴佽浆鍗″彿 
+                                , "HProcExchEntryID" : data.HProcExchEntryID // 宸ュ簭娴佽浆鍗″瓙鍐呯爜
+                                , "HProcExchInterID": data.HProcExchInterID // 宸ュ簭娴佽浆鍗′富鍐呯爜
+                                , "HBacker": data.閫�鍥炰汉
+                                , "HBackDate": data.閫�鍥炴棩鏈�
+                                , "HBackRemark": data.閫�鍥炲師鍥�
+                                , "HDeptName": data.鐢熶骇杞﹂棿
+                                , "HDeptID": data.HDeptID
+                                , "HInterID": linterid
+                            });
+                            form.render('select');
+                        } 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": '3799' },
+                    success: function (d) {
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HInterID").val(0);
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+            }
+
+
+            //淇濆瓨鎻愪氦
+            form.on('submit(Saver)', function (data) {
+                if (AllowLoadData(data)) {
+                    //绂佺敤淇濆瓨鎸夐挳
+                    $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
+                    //鍒ゆ柇绯荤粺鍙傛暟鏄惁鍕鹃��
+                    Xt_AllowLoadData(data);
+                }
+            });
+
+            //鍒ゆ柇绯荤粺鍙傛暟鏄惁閫変腑
+            function Xt_AllowLoadData(data2) {
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Sc_MESBeginWorkBill/Xt_AllowLoadData", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: false,
+                    data: { "HKey": "Sc_MESBeginWorkBill_SwipeCardStart" },
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            if (data.Verify == "Y") //鍒峰崱楠岃瘉
+                            {
+                                layer.msg("闇�瑕佽繘琛屽埛鍗¢獙璇�!", { time: 1 * 1000, icon: 1 }, function (index) {
+                                    layer.open({
+                                        type: 2,
+                                        skin: 'layui-layer-rim', //鍔犱笂杈规
+                                        title: 'IC鍒峰崱',
+                                        closeBtn: 1,
+                                        shift: 2,
+                                        area: ['50%', '80%'],
+                                        maxmin: true,
+                                        content: '../../鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_SwipeCardStart.html?HSourceInterID=' + HSourceInterID,
+                                        end: function () {
+                                            if (OptionData.length > 0) {
+                                                if (OptionData[0]["data"] == "1") {
+                                                    save(data2);
+                                                } else if (OptionData[0]["data"] == "0") {
+                                                    layer.msg("鍥犱负鎶�鑳戒笉鍖归厤,鏃犳硶淇濆瓨!")
+                                                }
+                                                OptionData = [];
+                                            } else {
+                                                $('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);
+                                            }
+                                        }
+                                    });
+                                });
+                            }
+                            else {
+                                save(data2);
+                            }
+                        }
+                        else {
+                            layer.alert(data.Message, { icon: 5 })
+                        }
+                    },
+                    error: function (err) {
+                        layer.alert(err, { icon: 5 })
+                    }
+                })
+            }
+
+            function save(data) {
+
+                var index = layer.load();
+                var sMainStr = JSON.stringify(data.field);
+                var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Sc_MESStopRestoreWorkBill/SaveMESStopRestoreWorkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: false,
+                    data: { "msg": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
+                                //layer.close(layer.index);
+                                //window.parent.location.reload();
+                            });
+                            if (data.Verify == "Y") //鑷姩瀹℃牳
+                            {
+                                layer.close(index);
+                                SaveVerify(); //瀹℃牳
+                            }
+                            else {
+                                layer.close(index);
+                            }
+                            //layer.confirm(data.Message, {
+                            //    btn: ['纭']
+                            //}, function (index) {
+                            //    if (data.Verify == "Y") //鑷姩瀹℃牳
+                            //    {
+                            //        layer.close(index);
+                            //        SaveVerify(); //瀹℃牳
+                            //    }
+                            //    else {
+                            //        layer.close(index);
+                            //    }
+                            //});
+                        }
+                        else {
+                            layer.close(index);
+                            layer.alert(data.Message, { icon: 5 })
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        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_MESStopRestoreWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    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) {
+                Pub_Close(1);
+                window.parent.location.reload();
+            });
+
+
+            //琛ㄥご淇℃伅浜у搧寮圭獥
+            form.on('submit(HMaterList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '浜у搧鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+                        $("#HMaterCode").val(checkStatus.data[0].鐗╂枡浠g爜);
+                        $("#HMaterID").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(HSourceList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '璧勬簮鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
+                        $("#HSourceID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //鎿嶄綔鍛�
+            form.on('submit(HEmpList)', 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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+                        $("#HEmpID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //婧愬崟鍗曞彿 XDHList
+
+            //琛ㄥご淇℃伅鐝粍寮圭獥
+            form.on('submit(HGroupList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鐝粍鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?type=HGroup', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
+                        $("#HGroupID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            // 琛ㄥご淇℃伅 宸ュ簭娴佽浆鍗�
+            form.on('submit(HProcExchList)', function() {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '宸ュ簭娴佽浆鍗″垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../../杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.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('璇烽�夋嫨鏁版嵁');
+                        }
+
+                        debugger
+
+                        $("#HProcExchBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+                        $("#HProcExchEntryID").val(checkStatus.data[0].HEntryID);
+                        $("#HProcExchInterID").val(checkStatus.data[0].hmainid);
+                        
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            })
+
+            //琛ㄥご淇℃伅杞﹂棿寮圭獥
+            form.on('submit(HDeptList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                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(HWorkShiftList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鐝鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_WorkShiftList.html?type=HWorkShifts&OperationType=2', '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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HWorkShiftName").val(checkStatus.data[0].鐝鍚嶇О);
+                        $("#HWorkShiftID").val(checkStatus.data[0].HInterID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+
+
+            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 ($("#HMaterID").val() == '' || $("#HMaterID").val() == null) {
+                    layer.msg("浜у搧缂栫爜涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                // if ($("#HStopBeginWorkTime").val() == '' || $("#HStopBeginWorkTime").val() == null) {
+                //     layer.msg("瀹屽伐鏃堕棿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //     return Result = false;
+                // }
+                // if ($("#HStopEndWorkTime").val() == '' || $("#HStopBeginWorkTime").val() == null) {
+                //     layer.msg("棰勮缁撴潫鏃堕棿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //     return Result = false;
+                // }
+                if ($("#HBeginWorkTime").val() == '' || $("#HBeginWorkTime").val() == null) {
+                    layer.msg("鍋滃伐鎭㈠鏃堕棿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HSourceID").val() == '' || $("#HSourceID").val() == null) {
+                    layer.msg("鐢熶骇璧勬簮涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HMainSourceInterID").val() == '' || $("#HMainSourceInterID").val() == null) {
+                    layer.msg("婧愬崟鍗曞彿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HEmpID").val() == '' || $("#HEmpID").val() == null) {
+                    layer.msg("鎿嶄綔鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HGroupID").val() == '' || $("#HGroupID").val() == null) {
+                    layer.msg("鐝粍涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
+                    layer.msg("杞﹂棿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HICMOInterID").val() == '' || $("#HICMOInterID").val() == null) {
+                    layer.msg("鐢熶骇璁㈠崟涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                // if ($("#HStopType").val() == '' || $("#HStopType").val() == null) {
+                //     layer.msg("鍋滃伐绫诲瀷涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //     return Result = false;
+                // }
+                //if ($("#HStopReason").val() == '' || $("#HStopReason").val() == null) {
+                //    layer.msg("鍋滃伐鎻忚堪涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return Result = false;
+                //}
+                return Result;
+            }
+
+            //#endregion
+
+            //鑾峰彇鐝
+            function get_HWorkShift() {
+                var HDeptID = $("#HDeptID").val();
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Gy_ShiftsController/Get_HWorkShift", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    data: {
+                        "HDeptID": HDeptID,
+                        "HCenterID": HCenterID
+                    },
+                    success: function (data) {
+                        if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        {
+                            var LoadData = data.data;
+                            $("#HWorkShiftID").val(LoadData[0].HInterID); //褰撳墠宸ュ簭ID
+                            $("#HWorkShiftName").val(LoadData[0].鐝); //褰撳墠宸ュ簭
+                        }
+                        //else {
+                        //    layer.alert(data.Message, { icon: 5 });
+                        //}
+                    },
+                    error: function (err) {
+                        layer.alert(err, { icon: 5 });
+                    }
+                });
+            }
+
+            //浠ヤ笂涓簂ayui妯″潡
+        });
+
+        //鐢熶骇鐝
+        function GetHWorkShiftsValue(obj) {
+            $("#HWorkShiftID").val(obj[0].HInterID); //褰撳墠宸ュ簭ID
+            $("#HWorkShiftName").val(obj[0].鐝鍚嶇О); //褰撳墠宸ュ簭
+        }
+
+        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) {
+            $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
+            $("#HEmpID").val(obj[0].HItemID);
+        }
+        //鐢熶骇鐝粍
+        function GetHGroupValue(obj) {
+            $("#HGroupName").val(obj[0].鐝粍鍚嶇О);
+            $("#HGroupID").val(obj[0].HItemID);
+        }
+        function GetSwipeCardStart(obj) {
+            OptionData[0] = obj;
+        }
+    </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245\346\201\242\345\244\215\345\215\225/Sc_MESStopRestoreWorkBillList.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\201\234\345\267\245\346\201\242\345\244\215\345\215\225/Sc_MESStopRestoreWorkBillList.html"
new file mode 100644
index 0000000..2dfc690
--- /dev/null
+++ "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\201\234\345\267\245\346\201\242\345\244\215\345\215\225/Sc_MESStopRestoreWorkBillList.html"
@@ -0,0 +1,1419 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鍋滃伐鎭㈠鍗曞垪琛�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../../layuiadmin/HideButton_New.js"></script>
+    <script src="../../../../layuiadmin/SetColumn.js"></script>
+    <script src="../../../../layuiadmin/PageTitle.js"></script>
+
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鏃ユ湡闂撮殧</label>
+                                    <div class="layui-input-block">
+                                        <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input ForFilteringSchemes" id="HDate">
+                                    </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="HDate1">
+                                    </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="HBillNo" id="HBillNo">
+                                    </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="HSource" id="HSource">
+                                    </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-row" style=" margin-top: 10px; margin-left: 70px;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName1" id="ColName1"  class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <div id="page" style="position: relative; bottom: 0;"></div>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" style="display:none;" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" 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" style="display:none;" lay-event="set_AbandonCheck" id="set_AbandonCheck"><i class="layui-icon layui-icon-radio"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Close" id="btn-Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeClose" id="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Drop" id="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeDrop" id="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="btn-get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        //鑾峰彇椤甸潰璺宠浆鍙傛暟  //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        }
+        layui.config({
+            base: '../../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+             //#region 鍙傛暟
+            var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , element = layui.element
+            , laypage = layui.laypage
+            , laydate = layui.laydate
+            , soulTable = layui.soulTable
+
+            var page = 1;//鍒嗛〉鏁版嵁
+            var size = 50;
+            var sWhere = "";
+            var option = [];
+            var HModName = "Sc_MESStopRestoreWorkBill"
+            var HBillType = "Sc_MESStopRestoreWorkBill";
+            var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
+            var ins;                        //鐢ㄤ簬瀵煎嚭excel;
+            //#endregion
+            var titleData = ["hmainid", "HProcID", "HMaterID", "HSourceID", "HGroupID", "HDeptID", "HEmpID","HBillStatus","鍗曟嵁绫诲瀷"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            var HModuleType = "3799";
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HModuleType) || document.title;
+            //#endregion
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //杩囨护鏉′欢鐨刢lass绫�
+            var HClassTag = "ForFilteringSchemes";
+            //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+            window.HModuleName = "鍋滃伐鎭㈠鍗曠淮鎶�";
+            //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+            window.HDefaultFilter = "";
+            //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+            window.HInterID_Choose = 0;
+
+            //#endregion
+
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                //鎶ュ伐骞冲彴鎶ユ鐢宠鏌ョ湅鍒楄〃
+                set_ClearBill();
+            }
+
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
+
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus(obj.config.id);
+                switch (obj.event) {
+                    case 'get_export': get_Export();
+                        break;
+                    case 'btn-Add': //set_AddNew();
+                        break;
+                    case 'btn-Edit': set_ShowBill();
+                        break;
+                    case 'btn-Delete': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit': set_CheckBill();
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'set_AbandonCheck': set_AbandonCheck();
+                        break;
+                    //鍏抽棴鎸夐挳        锛�0:鍏抽棴銆�1:鍙嶅叧闂級
+                    case 'btn-Close':
+                        set_CloseBill(0);
+                        break;
+                    //鍙嶅叧闂寜閽�
+                    case 'btn-DeClose':
+                        set_CloseBill(1);
+                        break;
+                    //浣滃簾鎸夐挳        锛�0:浣滃簾銆�1:鍙嶄綔搴燂級
+                    case 'btn-Drop':
+                        set_DropBill(0);
+                        break;
+                    //鍙嶄綔搴熸寜閽�
+                    case 'btn-DeDrop':
+                        set_DropBill(1);
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumn(HModName, sessionStorage["HUserName"], option, optionPage, get_FastQuery);
+                        break;
+                    //鎸夐挳璁剧疆
+                    case 'set_HideButton':
+                        get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+                        break;
+                    //淇濆瓨鏂规
+                    case 'set_SaveScheme': set_SaveScheme();
+                        break;
+                    //璇诲彇鏂规
+                    case 'set_ReadScheme': set_ReadScheme();
+                        break;
+                };
+            });
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                if ($("#HProject").val() == 0) {
+                    if (page != 1) {
+                        $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+                    } else {
+                        get_FastQuery();
+                    }
+                } else {
+                    if (page != 1) {
+                        $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+                    } else {
+                        get_FastQuery(2);
+                    }
+                }
+
+            });
+            //#endregion
+
+            function get_FastQuery() {
+                var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
+                var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
+                var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+                var HSource = $("#HSource").val();//鐢熶骇璧勬簮
+                var ColName = $("#ColName").val();//澶嶉�夋
+                var Comparator = $("#Comparator").val()
+                var ColContent = $("#ColContent").val();
+                var ColName1 = $("#ColName1").val();//澶嶉�夋
+                var Comparator1 = $("#Comparator1").val()
+                var ColContent1 = $("#ColContent1").val();
+                var ColName2 = $("#ColName2").val();//澶嶉�夋
+                var Comparator2 = $("#Comparator2").val()
+                var ColContent2 = $("#ColContent2").val();
+                if (ColName != 0 && Comparator != 0) {
+                    var com = "";
+                    switch (Comparator) {
+                        case "7":
+                            com = "like'%" + ColContent + "%'";
+                            break;
+                        case "8":
+                            com = "like'%" + ColContent + "'";
+                            break;
+                        case "9":
+                            com = "like'" + ColContent + "%'";
+                            break;
+                        case "10":
+                            com = "not like'%" + ColContent + "%'";
+                            break;
+                        default:
+                            com = "" + Comparator + "'" + ColContent + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName + " " + com;
+                }
+                if (ColName1 != 0 && Comparator1 != 0) {
+                    var com1 = "";
+                    switch (Comparator1) {
+                        case "7":
+                            com1 = "like'%" + ColContent1 + "%'";
+                            break;
+                        case "8":
+                            com1 = "like'%" + ColContent1 + "'";
+                            break;
+                        case "9":
+                            com1 = "like'" + ColContent1 + "%'";
+                            break;
+                        case "10":
+                            com1 = "not like'%" + ColContent1 + "%'";
+                            break;
+                        default:
+                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName1 + " " + com1;
+                }
+                if (ColName2 != 0 && Comparator2 != 0) {
+                    var com2 = "";
+                    switch (Comparator2) {
+                        case "7":
+                            com2 = "like'%" + ColContent2 + "%'";
+                            break;
+                        case "8":
+                            com2 = "like'%" + ColContent2 + "'";
+                            break;
+                        case "9":
+                            com2 = "like'" + ColContent2 + "%'";
+                            break;
+                        case "10":
+                            com2 = "not like'%" + ColContent2 + "%'";
+                            break;
+                        default:
+                            com2 = "" + Comparator2 + "'" + ColContent2 + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName2 + " " + com2;
+                }
+                if (HDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+                }
+                if (HDate1) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+                }
+                if (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
+                if (HSource) {
+                    sWhere += " and 璧勬簮浠g爜 like '%" + HSource + "%' or 璧勬簮鍚嶇О like '%" + HSource + "%'";
+                }
+                //get_Display(sWhere);
+                get_DisplayPage(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+
+            //#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
+
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HBillNo").val("");//鍗曟嵁鍙�
+                $("#HSource").val("");//鐢熶骇璧勬簮
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                form.render('select');
+                $("#btnSearch").click();
+            });
+            //#endregion
+
+            //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+            form.on('select(HInitTimeCycle)', function (data) {
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                if (HInitTimeCycle != -1) {
+                    $('#HDate').prop('disabled', true);
+                    $('#HDate1').prop('disabled', true);
+
+                    $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                    $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+
+                    //鎵ц鏌ヨ鏂规硶
+                    get_FastQuery();
+                } else {
+                    $('#HDate').prop('disabled', false);
+                    $('#HDate1').prop('disabled', false);
+                }
+            });
+
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+            
+
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+                setSelect_HInitTimeCycle();
+                //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                if (HInitTimeCycle != -1) {
+                    $('#HDate').prop('disabled', true);
+                    $('#HDate1').prop('disabled', true);
+                } else {
+                    $('#HDate').prop('disabled', false);
+                    $('#HDate1').prop('disabled', false);
+                }
+
+                //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
+                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_FastQuery();
+                
+            }
+
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , totalRow: true
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                    , done: function (res, curr, count) {
+                        soulTable.render(this);
+                    }
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true}
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true}
+                        , {
+                            field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', sort: true, templet: function (d) {
+                                if (d.鍗曟嵁绫诲瀷 == "3789") {
+                                    return "鍋滃伐鍗�";
+                                }
+                            }
+                        }
+                        , {
+                            field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 160, sort: true, templet: function (d) {
+                                switch (d.HBillStatus) {
+                                    case 0:
+                                        return "鍒涘缓"
+                                        break;
+                                    case 1:
+                                        return "鏈"
+                                        break;
+                                    case 2:
+                                        return "宸插"
+                                        break;
+                                    case 3:
+                                        return "鍏抽棴"
+                                        break;
+                                    case 4:
+                                        return "浣滃簾"
+                                        break;
+                                    case 5:
+                                        return "瀹℃牳閫�鍥�"
+                                        break;
+                                    case 6:
+                                        return "瀹℃牳涓�"
+                                        break;
+                                    case 7:
+                                        return "宸查槄"
+                                        break;
+                                    case 8:
+                                        return "宸插洖澶�"
+                                        break;
+                                    case 9:
+                                        return "缁撴"
+                                        break;
+                                    case 10:
+                                        return "楠岃瘉"
+                                        break;
+                                    case 11:
+                                        return "涓嬭揪"
+                                        break;
+                                    case 12:
+                                        return "寮�宸�"
+                                        break;
+                                    case 13:
+                                        return "鐢宠瀹℃壒"
+                                        break;
+                                    case 15:
+                                        return "鐢宠妫�楠�"
+                                        break;
+                                    case 16:
+                                        return "鍒ゅ畾鍚堟牸"
+                                        break;
+                                    case 17:
+                                        return "鍒ゅ畾涓嶅悎鏍�"
+                                        break;
+                                    default:
+                                        return d.HBillStatus
+                                }
+                            }
+                        }
+                        , { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿', sort: true }
+                        , { field: '宸ュ簭璁″垝鍗曞彿', title: '宸ュ簭璁″垝鍗曞彿', sort: true }
+                        , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', sort: true }
+                        , { field: 'HMaterID', title: 'HMaterID', hide: true, sort: true }
+                        , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', sort: true }
+                        , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', sort: true }
+                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', sort: true }
+                        , { field: 'HProcID', title: 'HProcID', hide: true, sort: true }
+                        , { field: '宸ュ簭浠g爜', title: '宸ュ簭浠g爜', sort: true }
+                        , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О', sort: true }
+                        , { field: '浠诲姟鍗曟暟閲�', title: '浠诲姟鍗曟暟閲�', sort: true, totalRow: true }
+                        , { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺', sort: true, totalRow: true}
+                        , { field: '寮�濮嬪仠宸ユ椂闂�', title: '寮�濮嬪仠宸ユ椂闂�', templet: "<div>{{d.寮�濮嬪仠宸ユ椂闂� ==null ?'':layui.util.toDateString(d.寮�濮嬪仠宸ユ椂闂�, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+                        , { field: '缁撴潫鍋滃伐鏃堕棿', title: '缁撴潫鍋滃伐鏃堕棿', templet: "<div>{{d.缁撴潫鍋滃伐鏃堕棿 ==null ?'':layui.util.toDateString(d.缁撴潫鍋滃伐鏃堕棿, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+                        , { field: 'HSourceID', title: 'HSourceID', hide: true, sort: true }
+                        , { field: '鐢熶骇璧勬簮浠g爜', title: '鐢熶骇璧勬簮浠g爜', sort: true }
+                        , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', sort: true }
+                        , { field: 'HGroupID', title: 'HGroupID', hide: true, sort: true }
+                        , { field: '鐢熶骇鐝粍浠g爜', title: '鐢熶骇鐝粍浠g爜', sort: true }
+                        , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍', sort: true }
+                        , { field: 'HDeptID', title: 'HDeptID', hide: true, sort: true }
+                        , { field: '鐢熶骇杞﹂棿浠g爜', title: '鐢熶骇杞﹂棿浠g爜', sort: true }
+                        , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', sort: true }
+                        , { field: 'HEmpID', title: 'HEmpID', hide: true, sort: true }
+                        , { field: '鐢宠鍋滃伐浜哄憳浠g爜', title: '鐢宠鍋滃伐浜哄憳浠g爜', sort: true }
+                        , { field: '鐢宠鍋滃伐浜哄憳', title: '鐢宠鍋滃伐浜哄憳', sort: true }
+                        , { field: '鍋滃伐绫诲瀷', title: '鍋滃伐绫诲瀷', sort: true }
+                        , { field: '鍋滃伐鍘熷洜鎻忚堪', title: '鍋滃伐鍘熷洜鎻忚堪', sort: true }
+                        , { field: '鍋滃伐姹囨姤绫诲瀷', title: '鍋滃伐姹囨姤绫诲瀷', sort: true }
+                        , { field: '鏉″舰鐮�', title: '鏉″舰鐮�', sort: true }
+                        , { field: '鏈哄櫒鍦板潃', title: '鏈哄櫒鍦板潃', sort: true }
+                        , { field: '鎵弿浜�', title: '鎵弿浜�', sort: true }
+                        , { field: '鎵弿鏃ユ湡', title: '鎵弿鏃ユ湡', templet: "<div>{{d.鎵弿鏃ユ湡 ==null ?'':layui.util.toDateString(d.鎵弿鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+                        , { field: '澶囨敞', title: '澶囨敞', sort: true }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200, sort: true }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200, sort: true }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+                        , { field: '淇敼浜�', title: '淇敼浜�', width: 200, sort: true }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200, sort: true }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+                        , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200, sort: true }
+                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+                    ]]
+                };
+                optionPage = {
+                    elem: 'page', //娉ㄦ剰锛岃繖閲岀殑 page 鏄� ID锛屼笉鐢ㄥ姞 # 鍙�
+                    count: 10000, //鏁版嵁鎬绘暟锛屼粠鏈嶅姟绔緱鍒�
+                    limit: 50,
+                    limits: [50, 500, 5000, 50000],
+                    layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+                    jump: function (obj, first) {
+
+                        //棣栨涓嶆墽琛�
+                        if (!first) {
+                            //do something
+                            page = obj.curr;
+                            size = obj.limit;
+                            get_FastQuery();
+                        }
+                    }
+                }
+                laypage.render(optionPage);
+            }
+            //#endregion  鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                var data = obj.data;
+
+                //鍗曟嵁鍙疯秴閾炬帴
+                if (obj.event == '鍗曟嵁鍙�') {                  //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+                    var linterid = data.hmainid.toString();    //澹版槑鍙橀噺linterid 涓� data.hmainid   
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    var HBillStatus = data.鍗曟嵁鐘舵��.toString();
+                    if (HBillStatus != "鍒涘缓") {
+                        layer.msg('鍗曟嵁鐘舵�佷笉涓烘湭瀹℃牳鐘舵��,涓嶅厑璁哥紪杈戯紒');
+                        return false;
+                    }
+                    layer.open({                //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞� 
+                        type: 2                         //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫' + HPageTitle  //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+                        , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲                       
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍋滃伐鎭㈠鍗�/Sc_MESStopRestoreWorkBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='//璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+
+                        , resize: false,  //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
+                        end: function () {  //褰撳叧闂椂璋冪敤
+                            get_FastQuery(table, option);
+                        }
+                        , cancel: function () {  //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+                }
+            });
+             //#endregion
+            //鏌ヨ
+            function get_Display() {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_MESStopRestoreWorkBill/list',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var data = [];//鍒楀瓧娈垫暟鎹�
+                            var col = [];
+                            var totalArray = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            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 if ($.inArray(data[i].name, totalArray) > -1) { //璁$畻鍒�
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+                                } else if (data[i].name == '鍗曟嵁鍙�') {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
+                                } else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            option = {
+                                elem: '#mainTable'
+                                , toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 800
+                                , page: true
+                                , totalRow: true
+                                , cellMinWidth: 90
+                                , limit: 50
+                                , limits: [50, 500, 5000, 20000]
+                                , done: function (res, curr, count) {
+                                    soulTable.render(this);
+                                }
+                            }
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
+                            laypage.render(optionPage);
+                            ins = table.render(option);
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+                            layer.close(ajaxLoad);
+
+                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                                ColFilter();
+                            }
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //#region 鍒嗛〉鏌ヨ
+            function get_DisplayPage(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_MESStopRestoreWorkBill/GetProcessReportListPage',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
+                    success: function (data1) {
+                        option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+                        if (data1.code == 1) {
+                            optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left' });
+                            for (var i = 0; i < data.length; i++) {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                } else if (data[i].name == '鍗曟嵁鍙�') {
+                                    col.push({
+                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', templet: function (d) {
+                                            return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+                                        }, style: 'cursor: pointer;'
+                                    });
+                                }
+                                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;
+                                        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: 200 });
+                                    }
+                                }
+                            }
+                            option.cols = [col];
+                            option.data = data1.data;
+                            option.totalRow = true;
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
+                            ins = table.render(option);
+                            laypage.render(optionPage);
+                          
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+
+                            layer.close(ajaxLoad);
+                            if ($("#ColName option").length < 1) {
+                                ColFilter();
+                                //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+                                get_DefaultModule();
+                            }
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板' + HPageTitle,
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../鍋滃伐/Sc_Add_MESStopStepWorkBillList.html?OperationType=1&linterid=&HSouceBillType=',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            }
+
+            //缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].hmainid.toString();
+                    var HBillStatus = data[0].鍗曟嵁鐘舵��.toString();
+                    if (HBillStatus != "鍒涘缓") {
+                        layer.msg('鍗曟嵁鐘舵�佷笉涓烘湭瀹℃牳鐘舵��,涓嶅厑璁哥紪杈戯紒');
+                        return false;
+                    }
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫' + HPageTitle
+                        , closeBtn: 1
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍋滃伐/Sc_Add_MESStopStepWorkBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    var HBillStatus = data[0].鍗曟嵁鐘舵��.toString();
+                    if (HBillStatus != "鍒涘缓") {
+                        layer.msg('鍗曟嵁鐘舵�佷笉涓哄垱寤虹姸鎬�,涓嶅厑璁稿垹闄わ紒');
+                        return false;
+                    }
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/Sc_MESStopRestoreWorkBill/DeleteMESStopRestoreWorkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": InterID, "UserName": sessionStorage["HUserName"]},
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+
+           
+
+            //瀹℃牳
+            function set_CheckBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sc_MESStopRestoreWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+
+            //鍙嶅鏍�
+            function set_AbandonCheck() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sc_MESStopRestoreWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        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);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�');
+                }
+
+            }
+
+  
+            //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
+            function set_CloseBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sc_MESStopRestoreWorkBill/CloseSc_MESStopRestoreWorkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+                }
+            }
+            //#endregion     
+
+            //#region 鍙嶄綔搴�/浣滃簾鏁版嵁
+            function set_DropBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sc_MESStopRestoreWorkBill/DeleteSc_MESStopRestoreWorkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                sWhere = "";
+                get_FastQuery();
+            }
+            //#endregion
+
+            //#region 瀵煎嚭Execel
+            function get_Export() {
+                option.data.forEach((item) => {
+                    for (let itemobj in item) {
+                        if (item[itemobj] == null) {
+                            item[itemobj] = "";
+                        }
+                        if (item[itemobj].length > 0) {  // 鍋囪瀛楁鍚嶄负field
+                            item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+                        }
+                    }
+                });
+
+                table.exportFile(ins.config.id, option.data, "xls");
+            }
+            //#endregion
+
+
+            //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+            function setSelect_HInitTimeCycle() {
+                var valueList = [0, 1, 2, 3, 4, 5, 6, 29]; //valuelist鏁扮粍鍖呭惈涓庢椂闂寸浉鍏崇殑鏁存暟鍊�
+                var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];  //itilelist涓巚aluelist鍊肩浉瀵逛簬鐨勮〃锛屼笖浣滀负涓嬫媺妗嗘枃鏈樉绀�
+
+                var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >浠绘剰闂撮殧</option>';//瀹氫箟瀛楃涓睭InitTimeCycle_ArrayList 浣滅敤浜庝笅鎷夊垪鐨刪tml鍐呭 鍖呭惈option鍏冪礌锛屽�间负鈥�1锛屼笖鍦ㄤ笅鎷夋鏄剧ず浠绘剰闂撮殧
+                for (var i = 0; i < valueList.length; i++) {                                   // 閬嶅巻valueList  鏁扮粍  浣挎瘡涓�涓�肩敓鎴愪竴涓搴攐ption鍏冪礌
+                    HInitTimeCycle_ArrayList += '<option  style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';// 鎶婄敓鎴愮殑option鍏冪礌娣诲姞鍏InitTimeCycle_ArrayList瀛楃涓蹭腑
+                }
+
+                $("#HInitTimeCycle").empty();           //浣跨敤jquery鐨別mpty鏂规硶娓呯┖HInitTimeCycle_ArrayList <select>鍏冪礌鐨勫��
+                $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);  //浣跨敤append鏂规硶鏋勫缓涔嬪墠HInitTimeCycle_ArrayList瀛楃涓� 鐨勫唴瀹逛紶鍏InitTimeCycle  
+                form.render('select');       //璋冪敤 閲嶆柊娓叉煋select鍏冪礌
+
+                $("#HInitTimeCycle").val("29");   //浣跨敤jQuery鐨剉al()鏂规硶灏嗕笅鎷夊垪琛ㄧ殑閫変腑鍊艰缃负"29   锛屼笖鏄剧ず銆婅繎涓夋檪澶┿��
+            }
+            //#endregion
+
+            //鍒楁槑鏄剧ず涓嬫媺妗�
+            function ColFilter() {
+                var Organization = '<option  value="0" selected="selected" ></option>';
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    if (option.cols[0][i].hide != true) {
+                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+                    }
+                }
+                $("#ColName").empty();
+                $("#ColName").append(Organization);
+                $("#ColName1").empty();
+                $("#ColName1").append(Organization);
+                $("#ColName2").empty();
+                $("#ColName2").append(Organization);
+                form.render('select');
+            }
+
+            //#endregion
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
+            function get_DefaultModule() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+                    type: "GET",
+                    data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            //褰撳墠鐢ㄦ埛璁剧疆鏈夐粯璁ょ殑杩囨护鏂规
+                            var data = data1.data;
+                            //褰撳墠閫夋嫨鐨勮繃婊ゆ柟妗�
+                            HInterID_Choose = data[0].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);
+
+                var contentUrl = "";
+                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+                var urlLen = urlStr.split('/');
+                for (var i = 0; i < urlLen.length - 4; i++) {
+                    contentUrl += "../";
+                }
+                contentUrl += '绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type;
+
+                //褰撳墠椤甸潰涓婃病鏈夐�夋嫨杩囨护鏂规锛岃繘鍏ユ柊澧炴柟娉�
+                if (HDefaultFilter == "") {
+                    layer.open({
+                        type: 2
+                        , area: ['40%', '80%']
+                        , title: '杩囨护鏂规'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: contentUrl
+                        , 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
+
+            //浠ヤ笂鏄痩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/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html"
index f4fb444..1373c16 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html"
@@ -890,7 +890,25 @@
 
         //#region 瀵煎嚭Execel
         function get_Export() {
-            table.exportFile(ins.config.id, option.data, "xls");
+
+            let data = option.data;
+            data.forEach((item) => {
+                for (let itemobj in item) {
+                    if (item[itemobj] == null) {
+                        item[itemobj] = "";
+                    }
+                    if (item[itemobj].length > 0) {  // 鍋囪瀛楁鍚嶄负field
+                        item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+                        item[itemobj] = item[itemobj].toString().replace(/,/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+                    }
+                    if (itemobj === '瑙勬牸鍨嬪彿') {
+                        item[itemobj] = item[itemobj].replace(/,/g, '锛�');  // 鏇挎崲鑻辨枃閫楀彿涓轰腑鏂囬�楀彿
+                    }
+                }
+            });
+
+
+            table.exportFile(ins.config.id, data, "xls");
 
             //var ModRightNameCheck = "Cg_PODemandPlanConfigBillReportForLack_ExportExcel";
 
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutVarianceReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutVarianceReport.html"
new file mode 100644
index 0000000..0db21df
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutVarianceReport.html"
@@ -0,0 +1,557 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鍑烘垬姹囨姤宸紓鎶ヨ〃</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/HideButton.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">鐢熶骇杞﹂棿</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HDeptName" id="HDeptName">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">鐗╂枡浠g爜</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></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
+                , soulTable = layui.soulTable
+            var option = [];
+            var sWhere = "";
+            var HModName = "Sc_StationOutVarianceReport";
+            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+            var HBillType = "Sc_StationOutVarianceReport";
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = [];
+
+            var ins;                        //鐢ㄤ簬瀵煎嚭excel
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //#region 澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //瀵煎嚭excel
+                    case 'get_export':
+                        get_Export();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+                        break;
+                    //鎸夐挳璁剧疆
+                    case 'HideButton':
+                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+                        break;
+                };
+            });
+            //#endregion
+
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(2);
+            });
+            //#endregion
+
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_FastQuery(1);
+                //Organ();
+            }
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , totalRow: true
+                    //, cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                    , title: "宸紓鎶ヨ〃"
+                    , done: function (res, curr, count) {
+                        soulTable.render(this);
+                    }
+                };
+            }
+            //#endregion
+            //#endregion
+
+            //#region 鏌ヨ
+            function get_Display(sql) {
+                var ajaxLoad = layer.load();
+                var ModRightNameCheck = "Sc_ArrangeRiskICMOBillReport";
+                $.ajax({
+                    url: GetWEBURL() + '/CommonModel/searchMethod',
+                    type: "GET",
+                    data: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": ModRightNameCheck},
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var totalArray = [];
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            //col.push({ type: 'checkbox', fixed: 'left' });
+                            for (var i = 0; i < data.length; i++) {
+                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else if ($.inArray(data[i].name, totalArray) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width:120 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+                                    }
+                                }
+                            }
+
+                            option.cols = [col];
+                            option.data = data1.data;
+                            
+
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+                            //鍒楄缃�
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
+                            ins = table.render(option);
+
+                            layer.close(ajaxLoad);
+
+                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
+                                ColFilter();
+                            }
+
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+
+            }
+            //#endregion
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery(number) {
+                var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠g爜
+                var HMaterName = $("#HMaterName").val();//鐗╂枡鍚嶇О
+                var HDeptName = $("#HDeptName").val();
+
+                //浠绘剰瀛楁杩囨护
+                var ColName = $("#ColName").val();//澶嶉�夋
+                var Comparator = $("#Comparator").val()
+                var ColContent = $("#ColContent").val();
+                var ColName1 = $("#ColName1").val();//澶嶉�夋
+                var Comparator1 = $("#Comparator1").val()
+                var ColContent1 = $("#ColContent1").val();
+                var ColName2 = $("#ColName2").val();//澶嶉�夋
+                var Comparator2 = $("#Comparator2").val()
+                var ColContent2 = $("#ColContent2").val();
+
+                if (ColName != 0 && Comparator != 0) {
+                    var com = "";
+                    switch (Comparator) {
+                        case "7":
+                            com = "like'%" + ColContent + "%'";
+                            break;
+                        case "8":
+                            com = "like'%" + ColContent + "'";
+                            break;
+                        case "9":
+                            com = "like'" + ColContent + "%'";
+                            break;
+                        case "10":
+                            com = "not like'%" + ColContent + "%'";
+                            break;
+                        default:
+                            com = "" + Comparator + "'" + ColContent + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName + " " + com;
+                }
+                if (ColName1 != 0 && Comparator1 != 0) {
+                    var com1 = "";
+                    switch (Comparator1) {
+                        case "7":
+                            com1 = "like'%" + ColContent1 + "%'";
+                            break;
+                        case "8":
+                            com1 = "like'%" + ColContent1 + "'";
+                            break;
+                        case "9":
+                            com1 = "like'" + ColContent1 + "%'";
+                            break;
+                        case "10":
+                            com1 = "not like'%" + ColContent1 + "%'";
+                            break;
+                        default:
+                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName1 + " " + com1;
+                }
+                if (ColName2 != 0 && Comparator2 != 0) {
+                    var com2 = "";
+                    switch (Comparator2) {
+                        case "7":
+                            com2 = "like'%" + ColContent2 + "%'";
+                            break;
+                        case "8":
+                            com2 = "like'%" + ColContent2 + "'";
+                            break;
+                        case "9":
+                            com2 = "like'" + ColContent2 + "%'";
+                            break;
+                        case "10":
+                            com2 = "not like'%" + ColContent2 + "%'";
+                            break;
+                        default:
+                            com2 = "" + Comparator + "'" + ColContent + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName2 + " " + com2;
+                }
+                if (HMaterNumber) {
+                    sWhere += " and 浜у搧浠g爜 like '%" + HMaterNumber + "%'";
+                }
+                if (HMaterName) {
+                    sWhere += " and 浜у搧鍚嶇О like '%" + HMaterName + "%'";
+                }
+                if (HDeptName) {
+                    sWhere += " and 閮ㄩ棬 like '%" + HDeptName + "%'";
+                }
+
+                var sql = "select * from h_v_Sc_StationOutVarianceReport where 1=1 " + sWhere + " order by 鏃ユ湡 desc";
+
+                get_Display(sql);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#HDeptName").val("");
+                $("#HMaterNumber").val("");
+                $("#HMaterName").val("");
+
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                form.render('select');
+
+                sWhere = "";
+            }
+            //#endregion
+
+            //#region 瀵煎嚭Execel
+            function get_Export() {
+                //var ModRightNameCheck = "Sc_ArrangeRiskICMOBillReport_ExportExcel";
+
+                ////閫昏緫瀹℃牳鏂规硶
+                //$.ajax({
+                //    type: "GET",
+                //    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                //    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+                //    success: function (result) {
+                //        if (result.count == 1) {
+                //            table.exportFile(ins.config.id, data, "xls");
+                //        } else {
+                //            layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+                //        }
+                //    }, error: function () {
+                //        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                //    }
+                //});
+                data = option.data;
+                data.forEach((item) => {
+                    for (let itemobj in item) {
+                        if (item[itemobj] == null) {
+                            item[itemobj] = "";
+                        }
+                        if (item[itemobj].length > 0) {  // 鍋囪瀛楁鍚嶄负field
+                            item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+                            item[itemobj] = item[itemobj].toString().replace(/,/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+                            
+                        }
+                    }
+                });
+                table.exportFile('mainTable', data, "xls");
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").trigger('click');
+            }
+            //#endregion
+
+            //#region 浠绘剰瀛楁杩囨护锛氬垪鍚嶆樉绀轰笅鎷夋
+            function ColFilter() {
+                var Organization = '<option  value="0" selected="selected" ></option>';
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    if (option.cols[0][i].hide != true) {
+                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+                    }
+                }
+                $("#ColName").empty();
+                $("#ColName1").empty();
+                $("#ColName2").empty();
+                $("#ColName").append(Organization);
+                $("#ColName1").append(Organization);
+                $("#ColName2").append(Organization);
+                form.render('select');
+            }
+            //#endregion
+
+            //#region 鏉冮檺鍒ゅ畾
+            function set_ModCheck(ModRightNameCheck) {
+                var Permission = false;
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: false,
+                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            Permission = true;
+                        } else {
+                            layer.alert("褰撳墠妯″潡娌℃湁鏌ヨ鏉冮檺!", { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+                return Permission;
+            }
+            //#endregion
+        });
+
+            //#endregion
+
+            //浠ヤ笂鏄痩ayui妯″潡
+    </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
index c246a88..5155eb3 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
@@ -383,7 +383,7 @@
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "2103";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+            var HPageTitle = get_PageTitle(HModuleType) || $("h1").html();
             $("h1").html('<b>' + HPageTitle + '</b>');
             //#endregion
             //#endregion
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillList.html"
index 7d7b64d..83130e4 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillList.html"
@@ -210,7 +210,7 @@
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "2103";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+            var HPageTitle = get_PageTitle(HModuleType) ||  document.title;
             //#endregion
 
             //#region 銆愯繃婊ゆ柟妗堛��
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillQuery.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillQuery.html"
index fd9f8c6..f6adad8 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillQuery.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillQuery.html"
@@ -237,7 +237,7 @@
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "2103";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+            var HPageTitle = get_PageTitle(HModuleType) || document.title;
             //#endregion
 
             ////涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\344\273\230\345\215\225/YF_PayMentOtherBillMain.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\344\273\230\345\215\225/YF_PayMentOtherBillMain.html"
index b5998e6..3b82dcd 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\344\273\230\345\215\225/YF_PayMentOtherBillMain.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\344\273\230\345\215\225/YF_PayMentOtherBillMain.html"
@@ -351,7 +351,7 @@
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "2102";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+            var HPageTitle = get_PageTitle(HModuleType) ||  $("h1").html() ;
             $("h1").html('<b>' + HPageTitle + '</b>');
             //#endregion
 
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\344\273\230\345\215\225/YF_PayMentOtherBillMainList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\344\273\230\345\215\225/YF_PayMentOtherBillMainList.html"
index 25650fb..d4ca387 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\344\273\230\345\215\225/YF_PayMentOtherBillMainList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\344\273\230\345\215\225/YF_PayMentOtherBillMainList.html"
@@ -199,7 +199,7 @@
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "2102";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+            var HPageTitle = get_PageTitle(HModuleType) || document.title;
             //#endregion
 
             //#region 銆愯繃婊ゆ柟妗堛��
@@ -387,7 +387,7 @@
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
                 //鏌ヨ
-                get_FastQuery(1);
+                // get_FastQuery(1);
                 //Organ();
 
                 //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
@@ -1021,7 +1021,7 @@
                                 //$("#HBeginDate").val(HBeginDate);
 
                                 //鎵ц鏌ヨ鏂规硶
-                                get_FastQuery();
+                                // get_FastQuery();
                             } else {
                                 $('#HBeginDate').prop('disabled', false);
                                 $('#HEndDate').prop('disabled', false);
@@ -1036,8 +1036,8 @@
                             //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
                             document.getElementById("HFilterScheme_Now").style.display = "none";
                             //鎵ц鏌ヨ鏂规硶
-                            //get_FastQuery()
-                            //form.render("select");
+                            get_FastQuery()
+                            form.render("select");
                         }
                     }, error: function () {
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
index 776eace..be81292 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
@@ -304,7 +304,7 @@
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "1601";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+            var HPageTitle = get_PageTitle(HModuleType) || document.title;
             //#endregion
             var titleData = ["hmainid", "HBillType", "HSupID", "涓氬姟鐘舵��", "HUnitID", "渚涘簲鍟嗕唬鐮�", "涓氬姟鍛樹唬鐮�", "HPriority", "HPSStyleID", "HSSID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             //#region 銆愯繃婊ゆ柟妗堛��
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
index 941af09..570caa8 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
@@ -419,7 +419,7 @@
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "1114";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+            var HPageTitle = get_PageTitle(HModuleType) || $("h1").html();
             $("h1").html('<b>' + HPageTitle + '</b>');
             //#endregion
 
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
index e87ad11..3bb0256 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
@@ -217,7 +217,7 @@
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "1114";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+            var HPageTitle = get_PageTitle(HModuleType) || document.title;
             //#endregion
             var HBillType = "1114";
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillQuery.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillQuery.html"
index 3a2a487..71b6463 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillQuery.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillQuery.html"
@@ -242,7 +242,7 @@
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "1114";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+            var HPageTitle = get_PageTitle(HModuleType) ||  document.title;
             //#endregion
 
             ////涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\351\200\200\346\254\276\345\215\225/YF_PayMentBackBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\351\200\200\346\254\276\345\215\225/YF_PayMentBackBill.html"
index 4caaa8a..ea1c45a 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\351\200\200\346\254\276\345\215\225/YF_PayMentBackBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\351\200\200\346\254\276\345\215\225/YF_PayMentBackBill.html"
@@ -293,7 +293,7 @@
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "2105";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+            var HPageTitle = get_PageTitle(HModuleType) || $("h1").html();
             $("h1").html('<b>' + HPageTitle + '</b>');
             //#endregion
             //#endregion
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\351\200\200\346\254\276\345\215\225/YF_PayMentBackBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\351\200\200\346\254\276\345\215\225/YF_PayMentBackBillList.html"
index 8f8fa8d..6d17aa0 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\351\200\200\346\254\276\345\215\225/YF_PayMentBackBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\351\200\200\346\254\276\345\215\225/YF_PayMentBackBillList.html"
@@ -197,8 +197,9 @@
 
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "2105";
+            var HBillType = "2105";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+            var HPageTitle = get_PageTitle(HModuleType) || document.title;
             //#endregion
 
             //#region 銆愯繃婊ゆ柟妗堛��
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html"
index 5d55299..56ec641 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html"
@@ -1,5 +1,6 @@
 锘�<!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="utf-8" />
     <title>渚涘簲鍟嗘姤浠峰崟缂栬緫</title>
@@ -13,8 +14,10 @@
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <script src="../../../layuiadmin/PageTitle.js"></script>
     <style>
-        .main-btn { /*澶撮儴涓绘寜閽�*/
-            padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+        .main-btn {
+            /*澶撮儴涓绘寜閽�*/
+            padding: 0 2px;
+            /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
             height: 30px;
             line-height: 30px;
         }
@@ -22,10 +25,12 @@
         .btn-title {
             font-size: 16px;
         }
+
         /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
         .layui-table-cell {
             overflow: visible !important;
         }
+
         /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
         td .layui-form-select {
             margin-top: -10px;
@@ -44,6 +49,7 @@
         }
     </style>
 </head>
+
 <body>
     <div class="layui-fluid" style="padding: 0;">
         <div class="layui-card" style="padding: 15px;">
@@ -51,8 +57,10 @@
                 <form class="layui-form" lay-filter="component-form-group" action="">
                     <div class="layui-card-header">
                         <div class="layui-btn-group">
-                            <button type="button" id="btnSave" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btnSave">淇濆瓨</button>
-                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
+                            <button type="button" id="btnSave" class="layui-btn layui-btn-normal layui-btn-radius"
+                                lay-submit="" lay-filter="btnSave">淇濆瓨</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
+                                lay-filter="Cancel">閫�鍑�</button>
                         </div>
                     </div>
                     <div class="layui-tab" lay-filter="tab-POStockInBill">
@@ -68,17 +76,24 @@
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">鍗曟嵁鍙�</label>
                                             <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo"
+                                                    style="background-color:#efefef4d;" readonly>
                                                 <input type="hidden" name="HInterID" id="HInterID" value="0">
                                             </div>
                                         </div>
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">渚涘簲鍟�</label>
                                             <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HSupName" id="HSupName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="text" class="layui-input" name="HSupName" id="HSupName"
+                                                    onmouseover="this.title=this.value"
+                                                    style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;"
+                                                    readonly>
                                                 <input type="hidden" name="HSupID" id="HSupID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchSup" id="btnSearchSup" style="width: 40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button"
+                                                    lay-submit="" lay-filter="btnSearchSup" id="btnSearchSup"
+                                                    style="width: 40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"
+                                                        style="margin-left:-9px;"></i>
                                                 </button>
                                             </div>
                                         </div>
@@ -93,22 +108,30 @@
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">鎶ヤ环浜�</label>
                                             <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HQuoteEmp" id="HQuoteEmp" style="">
+                                                <input type="text" class="layui-input" name="HQuoteEmp" id="HQuoteEmp"
+                                                    style="">
                                             </div>
                                         </div>
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">鎶ヤ环閮ㄩ棬</label>
                                             <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HQuoteDept" id="HQuoteDept" style="">
+                                                <input type="text" class="layui-input" name="HQuoteDept" id="HQuoteDept"
+                                                    style="">
                                             </div>
-                                        </div>                                       
+                                        </div>
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">甯佸埆</label>
                                             <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HCurName" id="HCurName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="text" class="layui-input" name="HCurName" id="HCurName"
+                                                    onmouseover="this.title=this.value"
+                                                    style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;"
+                                                    readonly>
                                                 <input type="hidden" name="HCurID" id="HCurID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchCur" id="btnSearchCur" style="width: 40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button"
+                                                    lay-submit="" lay-filter="btnSearchCur" id="btnSearchCur"
+                                                    style="width: 40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"
+                                                        style="margin-left:-9px;"></i>
                                                 </button>
                                             </div>
                                         </div>
@@ -117,13 +140,16 @@
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">浠樻鏉′欢</label>
                                             <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HPayConditionID" id="HPayConditionID" style="background-color:#efefef4d;" value="0" readonly>
+                                                <input type="text" class="layui-input" name="HPayConditionID"
+                                                    id="HPayConditionID" style="background-color:#efefef4d;" value="0"
+                                                    readonly>
                                             </div>
                                         </div>
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">鐢熸晥鏃ユ湡</label>
                                             <div class="layui-input-inline">
-                                                <input type="date" class="layui-input" name="HBeginDate" id="HBeginDate">
+                                                <input type="date" class="layui-input" name="HBeginDate"
+                                                    id="HBeginDate">
                                             </div>
                                         </div>
                                         <div class="layui-col-xs4 layui-inline">
@@ -137,22 +163,28 @@
                                         <div class="layui-col-xs6 layui-inline">
                                             <label class="layui-form-label" style="width:12.5%">澶囨敞</label>
                                             <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HRemark" id="HRemark" style="width:500px;">
+                                                <input type="text" class="layui-input" name="HRemark" id="HRemark"
+                                                    style="width:500px;">
                                             </div>
                                         </div>
                                         <div class="layui-col-xs6 layui-inline">
                                             <label class="layui-form-label" style="width:12.5%">鎽樿</label>
                                             <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HExplanation" id="HExplanation" style="width:500px;">
+                                                <input type="text" class="layui-input" name="HExplanation"
+                                                    id="HExplanation" style="width:500px;">
                                             </div>
                                         </div>
                                         <div class="layui-col-xs4 layui-inline" style="display:none">
                                             <label class="layui-form-label">婧愬崟淇℃伅</label>
                                             <div class="layui-input-inline">
-                                                <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" value="0">
-                                                <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" value="0">
-                                                <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" value="0">
-                                                <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" value="">
+                                                <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType"
+                                                    value="0">
+                                                <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID"
+                                                    value="0">
+                                                <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID"
+                                                    value="0">
+                                                <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo"
+                                                    value="">
                                             </div>
                                         </div>
                                     </div>
@@ -165,19 +197,22 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HMaker" id="HMaker"
+                                                    style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HChecker" id="HChecker"
+                                                    style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鍏抽棴浜�</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan"
+                                                    style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                     </div>
@@ -185,19 +220,22 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate"
+                                                    style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate"
+                                                    style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鍏抽棴鏃ユ湡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate"
+                                                    style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                     </div>
@@ -205,13 +243,15 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater"
+                                                    style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">浣滃簾浜�</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan"
+                                                    style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                     </div>
@@ -219,13 +259,15 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HUpDateDate"
+                                                    id="HUpDateDate" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HDeleteDate"
+                                                    id="HDeleteDate" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                     </div>
@@ -248,6 +290,7 @@
         </div>
     </div>
 </body>
+
 </html>
 <script type="text/html" id="barDemo">
     <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
@@ -276,9 +319,9 @@
         //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
         var HModuleType = "1507";
         //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-        var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+        var HPageTitle = get_PageTitle(HModuleType) || $("h1").html();
         $("h1").html('<b>' + HPageTitle + '</b>');
-            //#endregion
+        //#endregion
 
         //鍒濆鍖栫晫闈�
         set_ClearBill();
@@ -606,7 +649,7 @@
                                     })
                                 }
                             });
-                        } else if (typeof (OptionData.HItemID) != "undefined"){
+                        } else if (typeof (OptionData.HItemID) != "undefined") {
                             obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
                                 "HMaterID": OptionData.HItemID             //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
                                 , "鐗╂枡浠g爜": OptionData.HNumber
@@ -798,7 +841,7 @@
                         , HMoney: HMoney                      //鏇存柊HMoney瀛楁锛孒Money
                         , HTaxMoney: HTaxMoney                  //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
                         , HlineTotal: HlineTotal             //鏇存柊HlineTotal瀛楁锛孒lineTotal
-                        , HTaxPrice:HTaxPrice                   //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+                        , HTaxPrice: HTaxPrice                   //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
                     });
                     table.render(option)
                     break;
@@ -926,13 +969,13 @@
                 , { field: 'HUnitNumber', title: '鍗曚綅浠g爜', edit: 'text', event: "HUnitID", width: 165 }
                 , { field: 'HUnitName', title: '鍗曚綅鍚嶇О', width: 165 }
                 , { field: 'HQty', title: '鏁伴噺', edit: 'text', event: 'inputHQty', width: 90, totalRow: true }
-                , { field: 'HPrice', title: '鍗曚环', edit: 'text', event: 'inputHPrice', width:90 }
-                , { field: 'HMoney', title: '閲戦', event: 'inputHMoney', width: 90, totalRow: true  }
-                , { field: 'HTaxPrice', title: '鍚◣鍗曚环', edit: 'text', event: 'inputHTaxPrice', width:90 }
-                , { field: 'HTaxRate', title: '绋庣巼%', edit: 'text', event: 'inputHTaxRate', width:90 }
-                , { field: 'HTaxMoney', title: '绋庨', event: 'inputHTaxMoney', width:90 }
-                , { field: 'HlineTotal', title: '浠风◣鍚堣',  event: 'inputHlineTotal', width:90 }
-                , { field: 'HlineTotalBB', title: '鏈綅甯佷环绋庡悎璁�', edit: 'text', event: 'inputHlineTotalBB', width:125 }
+                , { field: 'HPrice', title: '鍗曚环', edit: 'text', event: 'inputHPrice', width: 90 }
+                , { field: 'HMoney', title: '閲戦', event: 'inputHMoney', width: 90, totalRow: true }
+                , { field: 'HTaxPrice', title: '鍚◣鍗曚环', edit: 'text', event: 'inputHTaxPrice', width: 90 }
+                , { field: 'HTaxRate', title: '绋庣巼%', edit: 'text', event: 'inputHTaxRate', width: 90 }
+                , { field: 'HTaxMoney', title: '绋庨', event: 'inputHTaxMoney', width: 90 }
+                , { field: 'HlineTotal', title: '浠风◣鍚堣', event: 'inputHlineTotal', width: 90 }
+                , { field: 'HlineTotalBB', title: '鏈綅甯佷环绋庡悎璁�', edit: 'text', event: 'inputHlineTotalBB', width: 125 }
                 , { field: 'HDate', title: '棰勮浜よ揣鏃ユ湡', width: 120, templet: "<div>{{d.HDate ==null ?'':layui.util.toDateString(d.HDate, 'yyyy-MM-dd')}}</div>", event: 'HDate' }
                 , { field: 'HBagType', title: '鍖呰鏂瑰紡', edit: 'text', width: 120 }
                 , { field: 'HCarryType', title: '杩愯緭鏂瑰紡', edit: 'text', width: 120 }
@@ -1086,7 +1129,7 @@
                 layer.msg('璇烽�夋嫨涓�琛屾湁鐗╂枡鏁版嵁鏌ヨ锛�');
             }
         }
-            //#endregion
+        //#endregion
 
         //#region 鏍规嵁鐗╂枡ID鑾峰彇绮惧害
         function getDecByMaterID(HMaterID) {
@@ -1112,7 +1155,7 @@
             });
             return resultData;
         }
-            //#endregion
+        //#endregion
 
         //缂栬緫 椤甸潰璧嬪��
         function RoadBillMain(linterid)//鍔犺浇琛ㄥご
@@ -1268,7 +1311,7 @@
                 }
             })
         }
-            //#endregion
+        //#endregion
         //鎵撳嵃
         function get_print(data) {
 
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillList.html"
index 015034a..9da23ab 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillList.html"
@@ -227,7 +227,7 @@
         //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
         var HModuleType = "1507";
         //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-        var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+        var HPageTitle =  get_PageTitle(HModuleType) || document.title
             //#endregion
 
         //#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -350,7 +350,7 @@
             $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
             $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
             //鏌ヨ
-            get_Display("");
+            // get_Display("");
             //鍒濆鍖栬〃鏍�
             //DisPlay_HideColumn();
 
@@ -889,7 +889,7 @@
 
 
                             //鎵ц鏌ヨ鏂规硶
-                            get_FastQuery();
+                            // get_FastQuery();
                         } else {
                             $('#HBeginDate').prop('disabled', false);
                             $('#HEndDate').prop('disabled', false);
@@ -903,8 +903,8 @@
                         //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
                         document.getElementById("HFilterScheme_Now").style.display = "none";
                         ////鎵ц鏌ヨ鏂规硶
-                        //get_FastQuery()
-                        //form.render("select");
+                        get_FastQuery()
+                        form.render("select");
                     }
                 }, error: function () {
                     layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
index 9ff4903..515a2d1 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
@@ -370,7 +370,7 @@
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "1103";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+            var HPageTitle = get_PageTitle(HModuleType) || $("h1").html();
             $("h1").html('<b>' + HPageTitle + '</b>');
             //#endregion
 
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
index 684abda..9a2d8c8 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
@@ -273,7 +273,7 @@
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "1103";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+            var HPageTitle = get_PageTitle(HModuleType) || document.title;
             //#endregion
             var titleData = ["hmainid", "HBillType", "HSupID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID", "HUnitID", "HWHID", "HSPID", "璁¢噺鍗曚綅浠g爜", "鏀舵枡浠撳簱浠g爜", "浠撲綅浠g爜"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             //#region 銆愯繃婊ゆ柟妗堛��
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillQuery.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillQuery.html"
index 29580e2..94e258d 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillQuery.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillQuery.html"
@@ -256,7 +256,7 @@
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "1103";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+            var HPageTitle = get_PageTitle(HModuleType) || document.title;
             //#endregion
 
             ////涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\350\257\242\344\273\267\345\215\225/Sup_AskPriceBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\350\257\242\344\273\267\345\215\225/Sup_AskPriceBillList.html"
index 916eeba..1b411d2 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\350\257\242\344\273\267\345\215\225/Sup_AskPriceBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\350\257\242\344\273\267\345\215\225/Sup_AskPriceBillList.html"
@@ -321,7 +321,7 @@
             $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
             $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
             //鏌ヨ
-            get_Display("");
+            // get_Display("");
             //鍒濆鍖栬〃鏍�
             //DisPlay_HideColumn();
 
@@ -892,7 +892,7 @@
 
 
                             //鎵ц鏌ヨ鏂规硶
-                            get_FastQuery();
+                           // get_FastQuery();
                         } else {
                             $('#HBeginDate').prop('disabled', false);
                             $('#HEndDate').prop('disabled', false);
@@ -906,8 +906,8 @@
                         //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
                         document.getElementById("HFilterScheme_Now").style.display = "none";
                         ////鎵ц鏌ヨ鏂规硶
-                        //get_FastQuery()
-                        //form.render("select");
+                        get_FastQuery()
+                        form.render("select");
                     }
                 }, error: function () {
                     layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html"
index 8a5d91e..60e9080 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html"
@@ -342,7 +342,7 @@
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "1105";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+            var HPageTitle = get_PageTitle(HModuleType) || $("h1").html();
             $("h1").html('<b>' + HPageTitle + '</b>');
             //#endregion
 
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBackBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBackBillList.html"
index e62b6bc..5e741f7 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBackBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBackBillList.html"
@@ -256,7 +256,7 @@
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "1105";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+            var HPageTitle = get_PageTitle(HModuleType) || document.title;
             //#endregion
             var titleData = ["hmainid", "HBillType", "HSupID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID", "HUnitID", "HWHID", "HSPID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
 
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\347\224\263\350\257\267\345\215\225/Cg_PORequestBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\347\224\263\350\257\267\345\215\225/Cg_PORequestBill.html"
index 56d3c42..fa0a936 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\347\224\263\350\257\267\345\215\225/Cg_PORequestBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\347\224\263\350\257\267\345\215\225/Cg_PORequestBill.html"
@@ -304,7 +304,7 @@
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "1101";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+            var HPageTitle = get_PageTitle(HModuleType) || $("h1").html();
             $("h1").html('<b>' + HPageTitle + '</b>');
             //#endregion
 
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\347\224\263\350\257\267\345\215\225/Cg_PORequestBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\347\224\263\350\257\267\345\215\225/Cg_PORequestBillList.html"
index 3983a0a..c59fe5a 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\347\224\263\350\257\267\345\215\225/Cg_PORequestBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\347\224\263\350\257\267\345\215\225/Cg_PORequestBillList.html"
@@ -196,7 +196,7 @@
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "1101";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+            var HPageTitle = get_PageTitle(HModuleType)||document.title;
             //#endregion
 
             //#region 銆愯繃婊ゆ柟妗堛��
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
index 66c441a..ae56746 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
@@ -401,7 +401,7 @@
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "1102";       //瀹氫箟涓�涓瓧绗︿覆璧嬪��  绫诲瀷缁檋moduletype  鍙橀噺
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);  //閫氳繃HModuleType  鍗曟嵁绫诲瀷鑾峰彇骞跺彲鑳藉紩鐢ㄤ簡涓�涓悕涓� PageTitle.js 鐨凧avaScript鏂囦欢鏍规嵁get_PageTitle鍑芥暟鏂规硶鑾峰彇HModuleType 
+            var HPageTitle = get_PageTitle(HModuleType) || $("h1").html();  //閫氳繃HModuleType  鍗曟嵁绫诲瀷鑾峰彇骞跺彲鑳藉紩鐢ㄤ簡涓�涓悕涓� PageTitle.js 鐨凧avaScript鏂囦欢鏍规嵁get_PageTitle鍑芥暟鏂规硶鑾峰彇HModuleType 
             $("h1").html('<b>' + HPageTitle + '</b>'); //鍊兼潵鏄剧ずh1椤甸潰
             //#endregion
 
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
index bb7415f..16bfbd4 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
@@ -376,7 +376,7 @@
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "1102";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+            var HPageTitle = get_PageTitle(HModuleType) || document.title;
             //#endregion 
 
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillQuery.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillQuery.html"
index ff463f8..96221ec 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillQuery.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillQuery.html"
@@ -253,7 +253,7 @@
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "1102";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+            var HPageTitle = get_PageTitle(HModuleType) || document.title;
             //#endregion
 
             ////涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225\345\217\230\346\233\264\345\215\225/Cg_POOrderChangeBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225\345\217\230\346\233\264\345\215\225/Cg_POOrderChangeBillList.html"
index 5543980..d8002f2 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225\345\217\230\346\233\264\345\215\225/Cg_POOrderChangeBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225\345\217\230\346\233\264\345\215\225/Cg_POOrderChangeBillList.html"
@@ -411,7 +411,7 @@
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
                 //鏌ヨ
-                get_FastQuery(1);
+                // get_FastQuery(1);
                 //Organ();
 
                 //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
@@ -1015,7 +1015,7 @@
 
 
                                 //鎵ц鏌ヨ鏂规硶
-                                get_FastQuery();
+                               // get_FastQuery();
                             } else {
                                 $('#HBeginDate').prop('disabled', false);
                                 $('#HEndDate').prop('disabled', false);
@@ -1029,8 +1029,8 @@
                             //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
                             document.getElementById("HFilterScheme_Now").style.display = "none";
                             //鎵ц鏌ヨ鏂规硶
-                            //get_FastQuery()
-                            //form.render("select");
+                            get_FastQuery()
+                            form.render("select");
                         }
                     }, error: function () {
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\260\203\344\273\267\345\215\225/Cg_POStockInChangeBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\260\203\344\273\267\345\215\225/Cg_POStockInChangeBillList.html"
index 57134f6..1654f90 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\260\203\344\273\267\345\215\225/Cg_POStockInChangeBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\260\203\344\273\267\345\215\225/Cg_POStockInChangeBillList.html"
@@ -405,7 +405,7 @@
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
                 //鏌ヨ
-                get_FastQuery(1);
+                // get_FastQuery(1);
                 //Organ();
 
                 //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
@@ -969,11 +969,14 @@
 
 
                                 //鎵ц鏌ヨ鏂规硶
-                                get_FastQuery();
+                                // get_FastQuery();
                             } else {
                                 $('#HBeginDate').prop('disabled', false);
                                 $('#HEndDate').prop('disabled', false);
                             }
+
+                            get_FastQuery()
+                            form.render("select");
                         
                         } else {
                             //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
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 7a7c853..0e6bd5c 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"
@@ -390,7 +390,7 @@
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "1201";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+            var HPageTitle = get_PageTitle(HModuleType) ||  $("h1").html();
             $("h1").html('<b>' + HPageTitle + '</b>');
             //#endregion
 
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_POStockInBackBillList.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_POStockInBackBillList.html"
index 09e4e85..f76f0c7 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_POStockInBackBillList.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_POStockInBackBillList.html"
@@ -265,7 +265,7 @@
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "1239";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+            var HPageTitle = get_PageTitle(HModuleType) || document.title;
             //#endregion
             var titleData = ["hmainid", "HBillType", "HSupID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID", "HUnitID", "HWHID", "HSPID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
 
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_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/Kf_POStockInBillList.html"
index e033b70..0777e79 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_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/Kf_POStockInBillList.html"
@@ -268,7 +268,7 @@
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "1201";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+            var HPageTitle = get_PageTitle(HModuleType) || document.title;
             //#endregion
             var titleData = ["hmainid", "hsupid", "hsecmanagerid", "hkeeperid", "HDeptID", "hsubid", "hmaterid", "hunitid", "hwhid"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
 
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_POStockInBillListQuery.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_POStockInBillListQuery.html"
index 62ccf17..76f7b26 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_POStockInBillListQuery.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_POStockInBillListQuery.html"
@@ -249,7 +249,7 @@
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "1201";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+            var HPageTitle = get_PageTitle(HModuleType) || document.title;
             //#endregion
 
             ////涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�

--
Gitblit v1.9.1